From 0aeb582d4ffb1ffdd94df11f9b95dafce88450c1 Mon Sep 17 00:00:00 2001
From: tianwenbo <tianwenbo@syxysoft.com>
Date: Mon, 6 Mar 2023 09:10:47 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20SysCheckRuleCon?=
 =?UTF-8?q?troller.java=20=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysCheckRuleController.java     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java
index 5bba80d9..49cb9624 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java
@@ -13,6 +13,7 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.system.entity.SysCheckRule;
 import com.jero.modules.system.service.ISysCheckRuleService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -50,7 +51,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
     @AutoLog(value = "编码校验规则-分页列表查询")
     @ApiOperation(value = "编码校验规则-分页列表查询", notes = "编码校验规则-分页列表查询")
     @GetMapping(value = "/page")
-    public Result queryPageList(
+    public Result<IPage<SysCheckRule>> queryPageList(
             SysCheckRule sysCheckRule,
             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@@ -99,7 +100,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
     @AutoLog(value = "编码校验规则-添加")
     @ApiOperation(value = "编码校验规则-添加", notes = "编码校验规则-添加")
     @PostMapping(value = "/add")
-    public Result add(@RequestBody SysCheckRule sysCheckRule) {
+    public Result<T> add(@RequestBody SysCheckRule sysCheckRule) {
         sysCheckRuleService.save(sysCheckRule);
         return Result.OK("操作成功!");
     }
@@ -113,7 +114,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
     @AutoLog(value = "编码校验规则-编辑")
     @ApiOperation(value = "编码校验规则-编辑", notes = "编码校验规则-编辑")
     @PutMapping(value = "/edit")
-    public Result edit(@RequestBody SysCheckRule sysCheckRule) {
+    public Result<T> edit(@RequestBody SysCheckRule sysCheckRule) {
         sysCheckRuleService.updateById(sysCheckRule);
         return Result.OK("操作成功!");
     }
@@ -127,7 +128,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
     @AutoLog(value = "编码校验规则-通过id删除")
     @ApiOperation(value = "编码校验规则-通过id删除", notes = "编码校验规则-通过id删除")
     @DeleteMapping(value = "/delete")
-    public Result delete(@RequestParam(name = "id", required = true) String id) {
+    public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
         sysCheckRuleService.removeById(id);
         return Result.OK("删除成功!");
     }
@@ -141,7 +142,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
     @AutoLog(value = "编码校验规则-批量删除")
     @ApiOperation(value = "编码校验规则-批量删除", notes = "编码校验规则-批量删除")
     @DeleteMapping(value = "/deleteBatch")
-    public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+    public Result<T> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         this.sysCheckRuleService.removeByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功！");
     }
@@ -155,7 +156,7 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
     @AutoLog(value = "编码校验规则-通过id查询")
     @ApiOperation(value = "编码校验规则-通过id查询", notes = "编码校验规则-通过id查询")
     @GetMapping(value = "/queryById")
-    public Result queryById(@RequestParam(name = "id", required = true) String id) {
+    public Result<SysCheckRule> queryById(@RequestParam(name = "id", required = true) String id) {
         SysCheckRule sysCheckRule = sysCheckRuleService.getById(id);
         return Result.OK(sysCheckRule);
     }
@@ -178,8 +179,9 @@ public class SysCheckRuleController extends JeroController<SysCheckRule, ISysChe
      * @param response
      * @return
      */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result importExcel(HttpServletRequest request, HttpServletResponse response) {
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    @PostMapping("/importExcel")
+    public Result<SysCheckRule> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, SysCheckRule.class);
     }