From 83d96a1c4f4bde19626be1e76c56ede8ac7b775e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 9 Mar 2023 09:33:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91JeroOrderTabMainCo?= =?UTF-8?q?ntroller=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JeroOrderTabMainController.java | 65 ++++++++++--------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderTabMainController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderTabMainController.java index ad055e04..5a3afb34 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderTabMainController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderTabMainController.java @@ -5,6 +5,7 @@ import java.util.Arrays; import javax.servlet.http.HttpServletRequest; import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultConstant; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.demo.test.entity.JeroOrderCustomer; import com.jero.modules.demo.test.entity.JeroOrderMain; @@ -58,12 +59,12 @@ public class JeroOrderTabMainController { * @return */ @GetMapping(value = "/orderList") - public Result respondePagedData(JeroOrderMain jeroOrderMain, + public Result respondePagedData(JeroOrderMain jeroOrderMain, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderMain, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); + Page page = new Page<>(pageNo, pageSize); IPage pageList = jeroOrderMainService.page(page, queryWrapper); return Result.OK(pageList); } @@ -75,11 +76,11 @@ public class JeroOrderTabMainController { * @return */ @PostMapping(value = "/add") - public Result add(@RequestBody JeroOrderMainPage jeroOrderMainPage) { + public Result add(@RequestBody JeroOrderMainPage jeroOrderMainPage) { JeroOrderMain jeroOrderMain = new JeroOrderMain(); BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain); jeroOrderMainService.save(jeroOrderMain); - return Result.OK("操作成功!"); + return Result.OK(ResultConstant.OP_OK); } /** @@ -89,11 +90,11 @@ public class JeroOrderTabMainController { * @return */ @PutMapping("/edit") - public Result edit(@RequestBody JeroOrderMainPage jeroOrderMainPage) { + public Result edit(@RequestBody JeroOrderMainPage jeroOrderMainPage) { JeroOrderMain jeroOrderMain = new JeroOrderMain(); BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain); jeroOrderMainService.updateById(jeroOrderMain); - return Result.OK("操作成功!"); + return Result.OK(ResultConstant.OP_OK); } /** @@ -103,9 +104,9 @@ public class JeroOrderTabMainController { * @return */ @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name = "id", required = true) String id) { + public Result delete(@RequestParam(name = "id", required = true) String id) { jeroOrderMainService.delMain(id); - return Result.OK("删除成功!"); + return Result.OK(ResultConstant.DEL_OK); } /** @@ -115,9 +116,9 @@ public class JeroOrderTabMainController { * @return */ @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.jeroOrderMainService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); + return Result.OK(ResultConstant.BATCH_DEL_OK); } /** @@ -127,7 +128,7 @@ public class JeroOrderTabMainController { * @return */ @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id", required = true) String id) { + public Result queryById(@RequestParam(name = "id", required = true) String id) { JeroOrderMain jeroOrderMain = jeroOrderMainService.getById(id); return Result.OK(jeroOrderMain); } @@ -140,12 +141,12 @@ public class JeroOrderTabMainController { * @return */ @GetMapping(value = "/listOrderCustomerByMainId") - public Result queryOrderCustomerListByMainId(JeroOrderCustomer jeroOrderCustomer, + public Result queryOrderCustomerListByMainId(JeroOrderCustomer jeroOrderCustomer, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderCustomer, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); + Page page = new Page<>(pageNo, pageSize); IPage pageList = jeroOrderCustomerService.page(page, queryWrapper); return Result.OK(pageList); } @@ -157,12 +158,12 @@ public class JeroOrderTabMainController { * @return */ @GetMapping(value = "/listOrderTicketByMainId") - public Result queryOrderTicketListByMainId(JeroOrderTicket jeroOrderTicket, + public Result queryOrderTicketListByMainId(JeroOrderTicket jeroOrderTicket, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(jeroOrderTicket, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); + Page page = new Page<>(pageNo, pageSize); IPage pageList = jeroOrderTicketService.page(page, queryWrapper); return Result.OK(pageList); } @@ -174,9 +175,9 @@ public class JeroOrderTabMainController { * @return */ @PostMapping(value = "/addCustomer") - public Result addCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) { + public Result addCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) { jeroOrderCustomerService.save(jeroOrderCustomer); - return Result.OK("操作成功!"); + return Result.OK(ResultConstant.OP_OK); } /** @@ -186,9 +187,9 @@ public class JeroOrderTabMainController { * @return */ @PutMapping("/editCustomer") - public Result editCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) { + public Result editCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) { jeroOrderCustomerService.updateById(jeroOrderCustomer); - return Result.OK("操作成功!"); + return Result.OK(ResultConstant.OP_OK); } /** @@ -198,9 +199,9 @@ public class JeroOrderTabMainController { * @return */ @DeleteMapping(value = "/deleteCustomer") - public Result deleteCustomer(@RequestParam(name = "id", required = true) String id) { + public Result deleteCustomer(@RequestParam(name = "id", required = true) String id) { jeroOrderCustomerService.removeById(id); - return Result.OK("删除成功!"); + return Result.OK(ResultConstant.DEL_OK); } /** @@ -210,9 +211,9 @@ public class JeroOrderTabMainController { * @return */ @DeleteMapping(value = "/deleteBatchCustomer") - public Result deleteBatchCustomer(@RequestParam(name = "ids", required = true) String ids) { + public Result deleteBatchCustomer(@RequestParam(name = "ids", required = true) String ids) { this.jeroOrderCustomerService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); + return Result.OK(ResultConstant.BATCH_DEL_OK); } /** @@ -222,9 +223,9 @@ public class JeroOrderTabMainController { * @return */ @PostMapping(value = "/addTicket") - public Result addTicket(@RequestBody JeroOrderTicket jeroOrderTicket) { + public Result addTicket(@RequestBody JeroOrderTicket jeroOrderTicket) { jeroOrderTicketService.save(jeroOrderTicket); - return Result.OK("操作成功!"); + return Result.OK(ResultConstant.OP_OK); } /** @@ -234,9 +235,9 @@ public class JeroOrderTabMainController { * @return */ @PutMapping("/editTicket") - public Result editTicket(@RequestBody JeroOrderTicket jeroOrderTicket) { + public Result editTicket(@RequestBody JeroOrderTicket jeroOrderTicket) { jeroOrderTicketService.updateById(jeroOrderTicket); - return Result.OK("操作成功!"); + return Result.OK(ResultConstant.OP_OK); } /** @@ -246,9 +247,9 @@ public class JeroOrderTabMainController { * @return */ @DeleteMapping(value = "/deleteTicket") - public Result deleteTicket(@RequestParam(name = "id", required = true) String id) { + public Result deleteTicket(@RequestParam(name = "id", required = true) String id) { jeroOrderTicketService.removeById(id); - return Result.OK("删除成功!"); + return Result.OK(ResultConstant.DEL_OK); } /** @@ -258,9 +259,9 @@ public class JeroOrderTabMainController { * @return */ @DeleteMapping(value = "/deleteBatchTicket") - public Result deleteBatchTicket(@RequestParam(name = "ids", required = true) String ids) { + public Result deleteBatchTicket(@RequestParam(name = "ids", required = true) String ids) { this.jeroOrderTicketService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); + return Result.OK(ResultConstant.BATCH_DEL_OK); } -} \ No newline at end of file +}