Merge branch 'master' of https://gitee.com/oracular-wind/pet-admin

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletCurrentConfigController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("等级配置")
+@Api(description = "等级配置")
 @RestController
 @RequestMapping("/applet/currentConfig")
 public class AppletCurrentConfigController extends BaseController {
@@ -18,8 +18,8 @@ public class AppletCurrentConfigController extends BaseController {
     private ICurrentConfigService currentConfigService;
 
     @ApiOperation("查询等级配置列表")
-    @GetMapping("/list")
-    public TableDataInfo list(){
+    @GetMapping("/getCurrentConfigList")
+    public TableDataInfo getCurrentConfigList(){
         return getDataTable(currentConfigService.getCurrentConfigList());
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletExaminationController.java

@@ -6,6 +6,7 @@ import com.ruoyi.model.service.IExaminationService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.model.service.IAppExaminationInstructionsService;
+import com.ruoyi.model.service.IShortAnswerQuestionsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,8 +34,17 @@ public class AppletExaminationController extends BaseController {
      * @return 查询到的问题列表
      */
     @ApiOperation("查询考核题目及其答案")
-    @GetMapping("/list")
-    public TableDataInfo getExamination(@RequestParam Long examinationTypeId){
+    @GetMapping("/getExaminationType")
+    public TableDataInfo getExaminationType(@RequestParam Long examinationTypeId){
         return getDataTable(examinationService.getExaminationType(examinationTypeId));
     }
+
+    @Autowired
+    private IShortAnswerQuestionsService shortAnswerQuestionsService;
+
+    @ApiOperation("查询简答题列表")
+    @GetMapping("getShortAnswerQuestionsList")
+    public TableDataInfo getShortAnswerQuestionsList(){
+        return getDataTable(shortAnswerQuestionsService.getShortAnswerQuestionsList());
+    }
 }

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletExamineConfigController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("考核页面配置")
+@Api(description = "考核页面配置")
 @RestController
 @RequestMapping("/applet/examinationConfig")
 public class AppletExamineConfigController extends BaseController {
@@ -19,8 +19,8 @@ public class AppletExamineConfigController extends BaseController {
     private IExamineConfigService examineConfigService;
 
     @ApiOperation("查询考核页面配置列表")
-    @GetMapping("/list")
-    public TableDataInfo list(){
+    @GetMapping("/getExamineConfigList")
+    public TableDataInfo getExamineConfigList(){
         return getDataTable(examineConfigService.getExamineConfigList());
     }
 

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletFinalConfigController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("最终准备页面配置")
+@Api(description = "最终准备页面配置")
 @RestController
 @RequestMapping("/applet/finalConfig")
 public class AppletFinalConfigController extends BaseController {
@@ -18,8 +18,8 @@ public class AppletFinalConfigController extends BaseController {
     private IFinalConfigService finalConfigService;
 
     @ApiOperation("查询最终配置页面列表")
-    @GetMapping("/list")
-    public TableDataInfo list(){
+    @GetMapping("/getFinalConfigList")
+    public TableDataInfo getFinalConfigList(){
         return getDataTable(finalConfigService.getFinalConfigList());
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletShortAnswerQuestionsController.java

@@ -1,26 +0,0 @@
-package com.ruoyi.applet.contoller;
-
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.model.service.IShortAnswerQuestionsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Api("简答题考核记录表")
-@RestController
-@RequestMapping("/applet/shortAnswerQuestions")
-public class AppletShortAnswerQuestionsController extends BaseController {
-    @Autowired
-    private IShortAnswerQuestionsService shortAnswerQuestionsService;
-
-    @ApiOperation("查询简答题列表")
-    @GetMapping("list")
-    public TableDataInfo list(){
-        return getDataTable(shortAnswerQuestionsService.getShortAnswerQuestionsList());
-    }
-
-}

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletTrainingController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("培训")
+@Api(description = "培训")
 @RestController
 @RequestMapping("/applet/training")
 public class AppletTrainingController extends BaseController {
@@ -18,8 +18,8 @@ public class AppletTrainingController extends BaseController {
     private ITrainingService trainingService;
 
     @ApiOperation("查询考核培训文档")
-    @GetMapping("/list")
-    public TableDataInfo list(){
+    @GetMapping("/getTrainingList")
+    public TableDataInfo getTrainingList(){
         return getDataTable(trainingService.getTrainingList());
     }
 }

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletTransactionDetailsController.java

@@ -1,25 +0,0 @@
-package com.ruoyi.applet.contoller;
-
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.model.service.ITransactionDetailsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Api("交易明细记录")
-@RestController
-@RequestMapping("/applet/transactionDetails")
-public class AppletTransactionDetailsController extends BaseController {
-    @Autowired
-    private ITransactionDetailsService transactionDetailsService;
-
-    @ApiOperation("交易明细记录列表")
-    @GetMapping("/list")
-    public TableDataInfo list(){
-        return getDataTable(transactionDetailsService.getTransactionDetailsList());
-    }
-}

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletWalletController.java

@@ -2,6 +2,7 @@ package com.ruoyi.applet.contoller;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.model.service.ITransactionDetailsService;
 import com.ruoyi.model.service.IWalletService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -10,7 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("钱包")
+@Api(description = "钱包")
 @RestController
 @RequestMapping("/applet/wallet")
 public class AppletWalletController extends BaseController {
@@ -18,8 +19,16 @@ public class AppletWalletController extends BaseController {
     private IWalletService walletService;
 
     @ApiOperation("钱包列表")
-    @GetMapping("list")
-    public TableDataInfo list(){
+    @GetMapping("/getWalletList")
+    public TableDataInfo getWalletList(){
         return getDataTable(walletService.getWalletList());
     }
+    @Autowired
+    private ITransactionDetailsService transactionDetailsService;
+
+    @ApiOperation("交易明细记录列表")
+    @GetMapping("/getTransactionDetailsList")
+    public TableDataInfo getTransactionDetailsList(){
+        return getDataTable(transactionDetailsService.getTransactionDetailsList());
+    }
 }

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/AppletWithdrawalConfigController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("钱包提现配置")
+@Api(description = "钱包提现配置")
 @RestController
 @RequestMapping("/applet/withdrawalConfig")
 public class AppletWithdrawalConfigController extends BaseController {
@@ -18,8 +18,8 @@ public class AppletWithdrawalConfigController extends BaseController {
     private IWithdrawalConfigService withdrawalConfigService;
 
     @ApiOperation("钱包提现配置列表")
-    @GetMapping("/list")
-    public TableDataInfo list(){
+    @GetMapping("/getWithdrawalConfigList")
+    public TableDataInfo getWithdrawalConfigList(){
         return getDataTable(withdrawalConfigService.getWithdrawalConfigList());
     }
 }