From 34a22b379169fefbb0fcc2057f6e3ae08ad6b78f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 16 Mar 2023 09:55:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91JeroDemoController?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/controller/JeroDemoController.java    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java
index d4b254ce..e93c4dfc 100644
--- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java
+++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java
@@ -56,7 +56,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
     @ApiOperation(value = "获取Demo数据列表", notes = "获取所有Demo数据列表")
     @GetMapping(value = "/list")
     @PermissionData(pageComponent = "jero/JeroDemoList")
-    public Result list(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+    public Result<IPage<JeroDemo>> list(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                           HttpServletRequest req) {
         QueryWrapper<JeroDemo> queryWrapper = QueryGenerator.initQueryWrapper(jeroDemo, req.getParameterMap());
         Page<JeroDemo> page = new Page<>(pageNo, pageSize);
@@ -78,7 +78,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
     @PostMapping(value = "/add")
     @AutoLog(value = "添加测试DEMO")
     @ApiOperation(value = "添加DEMO", notes = "添加DEMO")
-    public Result add(@RequestBody JeroDemo jeroDemo) {
+    public Result<T> add(@RequestBody JeroDemo jeroDemo) {
         JeroDemoService.save(jeroDemo);
         return Result.OK("操作成功!");
     }
@@ -92,7 +92,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
     @PostMapping(value = "/edit")
     @ApiOperation(value = "编辑DEMO", notes = "编辑DEMO")
     @AutoLog(value = "编辑DEMO", operateType = CommonConstant.OPERATE_TYPE_3)
-    public Result edit(@RequestBody JeroDemo jeroDemo) {
+    public Result<T> edit(@RequestBody JeroDemo jeroDemo) {
         JeroDemoService.updateById(jeroDemo);
         return Result.OK("更新成功！");
     }
@@ -106,7 +106,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
     @AutoLog(value = "删除测试DEMO")
     @PostMapping(value = "/delete")
     @ApiOperation(value = "通过ID删除DEMO", notes = "通过ID删除DEMO")
-    public Result delete(@RequestBody Map<String, String> map) {
+    public Result<T> delete(@RequestBody Map<String, String> map) {
         String id = map.get("id");
         JeroDemoService.removeById(id);
         return Result.OK("删除成功!");
@@ -134,7 +134,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
      */
     @GetMapping(value = "/queryById")
     @ApiOperation(value = "通过ID查询DEMO", notes = "通过ID查询DEMO")
-    public Result queryById(@ApiParam(name = "id", value = "示例id", required = true) @RequestParam(name = "id", required = true) String id) {
+    public Result<JeroDemo> queryById(@ApiParam(name = "id", value = "示例id", required = true) @RequestParam(name = "id", required = true) String id) {
         JeroDemo jeroDemo = JeroDemoService.getById(id);
         return Result.OK(jeroDemo);
     }
@@ -161,7 +161,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
      * @return
      */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result importExcel(HttpServletRequest request, HttpServletResponse response) {
+    public Result<JeroDemo> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, JeroDemo.class);
     }
 
@@ -238,7 +238,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
 
     // ==========================================动态表单 JSON接收测试===========================================
     @PostMapping(value = "/testOnlineAdd")
-    public Result testOnlineAdd(@RequestBody JSONObject json) {
+    public Result<T> testOnlineAdd(@RequestBody JSONObject json) {
         log.info(json.toJSONString());
         return Result.OK("操作成功!");
     }
@@ -255,7 +255,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
      */
     @GetMapping(value = "/mpList")
     @PermissionData(pageComponent = "jero/JeroDemoList")
-    public Result loadMpPermissonList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+    public Result<IPage<JeroDemo>> loadMpPermissonList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                          HttpServletRequest req) {
         QueryWrapper<JeroDemo> queryWrapper = new QueryWrapper<JeroDemo>();
         //编程方式，给queryWrapper装载数据权限规则
@@ -276,7 +276,7 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
      */
     @GetMapping(value = "/sqlList")
     @PermissionData(pageComponent = "jero/JeroDemoList")
-    public Result loadSqlPermissonList(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+    public Result<IPage<JeroDemo>> loadSqlPermissonList(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                           HttpServletRequest req) {
         IPage<JeroDemo> pageList = JeroDemoService.queryListWithPermission(pageSize, pageNo);
         return Result.OK(pageList);