【fix sonar】SysFillRuleController.java文件

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java

@@ -15,6 +15,7 @@ import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.util.FillRuleUtil;
 import com.jero.modules.system.entity.SysFillRule;
 import com.jero.modules.system.service.ISysFillRuleService;
+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;
@@ -49,7 +50,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
     @AutoLog(value = "填值规则-分页列表查询")
     @ApiOperation(value = "填值规则-分页列表查询", notes = "填值规则-分页列表查询")
     @GetMapping(value = "/page")
-    public Result<?> queryPageList(SysFillRule sysFillRule,
+    public Result<IPage<SysFillRule>> queryPageList(SysFillRule sysFillRule,
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                    HttpServletRequest req) {
@@ -66,7 +67,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
      * @return
      */
     @GetMapping(value = "/testFillRule")
-    public Result testFillRule(@RequestParam("ruleCode") String ruleCode) {
+    public Result<Object> testFillRule(@RequestParam("ruleCode") String ruleCode) {
         Object result = FillRuleUtil.executeRule(ruleCode, new JSONObject());
         return Result.OK(result);
     }
@@ -80,7 +81,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
     @AutoLog(value = "填值规则-添加")
     @ApiOperation(value = "填值规则-添加", notes = "填值规则-添加")
     @PostMapping(value = "/add")
-    public Result<?> add(@RequestBody SysFillRule sysFillRule) {
+    public Result<T> add(@RequestBody SysFillRule sysFillRule) {
         sysFillRuleService.save(sysFillRule);
         return Result.OK("操作成功!");
     }
@@ -94,7 +95,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
     @AutoLog(value = "填值规则-编辑")
     @ApiOperation(value = "填值规则-编辑", notes = "填值规则-编辑")
     @PutMapping(value = "/edit")
-    public Result<?> edit(@RequestBody SysFillRule sysFillRule) {
+    public Result<T> edit(@RequestBody SysFillRule sysFillRule) {
         sysFillRuleService.updateById(sysFillRule);
         return Result.OK("操作成功!");
     }
@@ -108,7 +109,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
     @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) {
         sysFillRuleService.removeById(id);
         return Result.OK("删除成功!");
     }
@@ -122,7 +123,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
     @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.sysFillRuleService.removeByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功！");
     }
@@ -136,7 +137,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
     @AutoLog(value = "填值规则-通过id查询")
     @ApiOperation(value = "填值规则-通过id查询", notes = "填值规则-通过id查询")
     @GetMapping(value = "/queryById")
-    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+    public Result<SysFillRule> queryById(@RequestParam(name = "id", required = true) String id) {
         SysFillRule sysFillRule = sysFillRuleService.getById(id);
         return Result.OK(sysFillRule);
     }
@@ -159,8 +160,9 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
      * @param response
      * @return
      */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+    @PostMapping("/importExcel")
+    public Result<SysFillRule> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, SysFillRule.class);
     }
 
@@ -172,7 +174,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
      * @return 运行后的结果
      */
     @PutMapping("/executeRuleByCode/{ruleCode}")
-    public Result executeByRuleCode(@PathVariable("ruleCode") String ruleCode, @RequestBody JSONObject formData) {
+    public Result<Object> executeByRuleCode(@PathVariable("ruleCode") String ruleCode, @RequestBody JSONObject formData) {
         Object result = FillRuleUtil.executeRule(ruleCode, formData);
         return Result.OK(result);
     }
@@ -187,7 +189,7 @@ public class SysFillRuleController extends JeroController<SysFillRule, ISysFillR
      *
      */
     @PutMapping("/executeRuleByCodeBatch")
-    public Result executeByRuleCodeBatch(@RequestBody JSONObject ruleData) {
+    public Result<JSONArray> executeByRuleCodeBatch(@RequestBody JSONObject ruleData) {
         JSONObject commonFormData = ruleData.getJSONObject("commonFormData");
         JSONArray rules = ruleData.getJSONArray("rules");
         // 遍历 rules ，批量执行规则