From e04f2681953b2669927eb9ab28b943e2dc295b15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Mar 2023 09:55:08 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91DlMockContro?= =?UTF-8?q?ller=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dlglong/controller/DlMockController.java | 170 ++++++++++-------- 1 file changed, 95 insertions(+), 75 deletions(-) diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/dlglong/controller/DlMockController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/dlglong/controller/DlMockController.java index 27693e4b..bee2bc1e 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/dlglong/controller/DlMockController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/dlglong/controller/DlMockController.java @@ -16,6 +16,8 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.common.constant.VXESocketConst; import com.jero.modules.demo.mock.vxe.websocket.VXESocket; import com.jero.modules.dlglong.entity.MockEntity; +import org.apache.poi.ss.formula.functions.T; +import org.jetbrains.annotations.NotNull; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -38,7 +40,7 @@ public class DlMockController { * @return */ @GetMapping("/change1") - public Result mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) { + public Result mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) { /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */ // 封装行数据 @@ -61,7 +63,7 @@ public class DlMockController { * @return */ @GetMapping("/change2") - public Result mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) { + public Result mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) { /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */ // 封装行数据 @@ -85,7 +87,7 @@ public class DlMockController { * @return */ @GetMapping("/change3") - public Result mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) { + public Result mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) { /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */ // 封装行数据 @@ -120,7 +122,7 @@ public class DlMockController { * @return */ @GetMapping("/change4") - public Result mockChange4(@RequestParam("status") String status) { + public Result mockChange4(@RequestParam("status") String status) { // 封装socket数据 JSONObject socketData = new JSONObject(); // 这里的 key 是前端注册时使用的key，必须保持一致 @@ -142,7 +144,7 @@ public class DlMockController { * @param rowData 行数据，实际使用时可以替换成一个实体类 */ @PostMapping("/immediateSaveRow") - public Result mockImmediateSaveRow(@RequestBody JSONObject rowData) throws Exception { + public Result mockImmediateSaveRow(@RequestBody JSONObject rowData) throws InterruptedException { log.info("即时保存.rowData：" + rowData.toJSONString()); // 延时1.5秒，模拟网慢堵塞真实感 Thread.sleep(500); @@ -155,7 +157,7 @@ public class DlMockController { * @param tableData 表格数据（实际使用时可以替换成一个List实体类） */ @PostMapping("/immediateSaveAll") - public Result mockImmediateSaveAll(@RequestBody JSONArray tableData) throws Exception { + public Result mockImmediateSaveAll(@RequestBody JSONArray tableData) throws InterruptedException { // 【注】： // 1、tableData里包含该页所有的数据 // 2、如果你实现了“即时保存”，那么除了新增的数据，其他的都是已经保存过的了， @@ -178,7 +180,7 @@ public class DlMockController { * @return */ @GetMapping("/getData") - public Result getMockData( + public Result> getMockData( @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, // 父级id，根据父级id查询子级，如果为空则查询顶级 @@ -204,7 +206,7 @@ public class DlMockController { * @return */ @GetMapping("/getDdjhData") - public Result getMockDdjhData( + public Result> getMockDdjhData( // SpringMVC 会自动将参数注入到实体里 MockEntity mockEntity, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -222,32 +224,11 @@ public class DlMockController { Map parameterMap = request.getParameterMap(); // 遍历输出到控制台 log.info("\ngetDdjhData - 普通查询条件："); - for (String key : parameterMap.keySet()) { - log.info("-- " + key + ": " + JSON.toJSONString(parameterMap.get(key))); + for (Map.Entry entry : parameterMap.entrySet()) { + log.info("-- " + entry.getKey() + ": " + JSON.toJSONString(entry.getValue())); } // 输出高级查询 - try { - log.info("\ngetDdjhData - 高级查询条件："); - // 高级查询模式 - MatchTypeEnum matchType = MatchTypeEnum.getByValue(superQueryMatchType); - if (matchType == null) { - log.info("-- 高级查询模式：不识别（" + superQueryMatchType + "）"); - } else { - log.info("-- 高级查询模式：" + matchType.getValue()); - } - superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8"); - List conditions = JSON.parseArray(superQueryParams, QueryCondition.class); - if (conditions != null) { - for (QueryCondition condition : conditions) { - log.info("-- " + JSON.toJSONString(condition)); - } - } else { - log.info("-- 没有传递任何高级查询条件"); - } - } catch (Exception e) { - log.error("-- 高级查询操作失败：" + superQueryParams, e); - e.printStackTrace(); - } + printExpertQuery(superQueryParams, superQueryMatchType); /* 注：实际使用中不用写上面那种繁琐的代码，这里只是为了直观的输出到控制台里而写的示例， 使用下面这种写法更简洁方便 */ @@ -270,12 +251,19 @@ public class DlMockController { IPage page = this.queryDataPage(dataList, parentId, pageNo, pageSize); // 逐行查询子表数据，用于计算拖轮状态 + List records = getJsonObjects(dataList, page); + page.setRecords(records); + return Result.OK(page); + } + + @NotNull + private List getJsonObjects(JSONArray dataList, IPage page) { List records = page.getRecords(); - for (JSONObject record : records) { + for (JSONObject obj : records) { Map tugStatusMap = new HashMap<>(); - String id = record.getString("id"); + String id = obj.getString("id"); // 查询出主表的拖轮 - String tugMain = record.getString("tug"); + String tugMain = obj.getString("tug"); // 判断是否有值 if (StringUtils.isNotBlank(tugMain)) { // 拖轮根据分号分割 @@ -283,49 +271,81 @@ public class DlMockController { // 查询子表数据 List subRecords = this.queryDataPage(dataList, id, null, null).getRecords(); // 遍历子表和拖轮数据，找出进行计算反推拖轮状态 - for (JSONObject subData : subRecords) { - String subTug = subData.getString("tug"); - if (StringUtils.isNotBlank(subTug)) { - for (String tug : tugs) { - if (tug.equals(subTug)) { - // 计算拖轮状态逻辑 - int statusCode = 0; - - /* 如果有发船时间、作业开始时间、作业结束时间、回船时间，则主表中的拖轮列中的每个拖轮背景色要即时变色 */ - - // 有发船时间，状态 +1 - String departureTime = subData.getString("departure_time"); - if (StringUtils.isNotBlank(departureTime)) { - statusCode += 1; - } - // 有作业开始时间，状态 +1 - String workBeginTime = subData.getString("work_begin_time"); - if (StringUtils.isNotBlank(workBeginTime)) { - statusCode += 1; - } - // 有作业结束时间，状态 +1 - String workEndTime = subData.getString("work_end_time"); - if (StringUtils.isNotBlank(workEndTime)) { - statusCode += 1; - } - // 有回船时间，状态 +1 - String returnTime = subData.getString("return_time"); - if (StringUtils.isNotBlank(returnTime)) { - statusCode += 1; - } - // 保存拖轮状态，key是拖轮的值，value是状态，前端根据不同的状态码，显示不同的颜色，这个颜色也可以后台计算完之后返回给前端直接使用 - tugStatusMap.put(tug, statusCode); - break; - } - } - } - } + getRecords(tugStatusMap, tugs, subRecords); } // 新加一个字段用于保存拖轮状态，不要直接覆盖原来的，这个字段可以不保存到数据库里 - record.put("tug_status", tugStatusMap); + obj.put("tug_status", tugStatusMap); + } + return records; + } + + private void getRecords(Map tugStatusMap, String[] tugs, List subRecords) { + for (JSONObject subData : subRecords) { + String subTug = subData.getString("tug"); + if (StringUtils.isNotBlank(subTug)) { + doForTugs(tugStatusMap, tugs, subData, subTug); + } + } + } + + private void doForTugs(Map tugStatusMap, String[] tugs, JSONObject subData, String subTug) { + for (String tug : tugs) { + if (tug.equals(subTug)) { + // 计算拖轮状态逻辑 + int statusCode = 0; + + /* 如果有发船时间、作业开始时间、作业结束时间、回船时间，则主表中的拖轮列中的每个拖轮背景色要即时变色 */ + + // 有发船时间，状态 +1 + String departureTime = subData.getString("departure_time"); + if (StringUtils.isNotBlank(departureTime)) { + statusCode += 1; + } + // 有作业开始时间，状态 +1 + String workBeginTime = subData.getString("work_begin_time"); + if (StringUtils.isNotBlank(workBeginTime)) { + statusCode += 1; + } + // 有作业结束时间，状态 +1 + String workEndTime = subData.getString("work_end_time"); + if (StringUtils.isNotBlank(workEndTime)) { + statusCode += 1; + } + // 有回船时间，状态 +1 + String returnTime = subData.getString("return_time"); + if (StringUtils.isNotBlank(returnTime)) { + statusCode += 1; + } + // 保存拖轮状态，key是拖轮的值，value是状态，前端根据不同的状态码，显示不同的颜色，这个颜色也可以后台计算完之后返回给前端直接使用 + tugStatusMap.put(tug, statusCode); + break; + } + } + } + + private void printExpertQuery(@RequestParam(name = "superQueryParams", required = false) String superQueryParams, @RequestParam(name = "superQueryMatchType", required = false) String superQueryMatchType) { + try { + log.info("\ngetDdjhData - 高级查询条件："); + // 高级查询模式 + MatchTypeEnum matchType = MatchTypeEnum.getByValue(superQueryMatchType); + if (matchType == null) { + log.info("-- 高级查询模式：不识别（" + superQueryMatchType + "）"); + } else { + log.info("-- 高级查询模式：" + matchType.getValue()); + } + superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8"); + List conditions = JSON.parseArray(superQueryParams, QueryCondition.class); + if (conditions != null) { + for (QueryCondition condition : conditions) { + log.info("-- " + JSON.toJSONString(condition)); + } + } else { + log.info("-- 没有传递任何高级查询条件"); + } + } catch (Exception e) { + log.error("-- 高级查询操作失败：" + superQueryParams, e); + e.printStackTrace(); } - page.setRecords(records); - return Result.OK(page); } /** From 34a22b379169fefbb0fcc2057f6e3ae08ad6b78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Mar 2023 09:55:20 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91JeroDemoCont?= =?UTF-8?q?roller=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> list(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(jeroDemo, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); @@ -78,7 +78,7 @@ public class JeroDemoController extends JeroController add(@RequestBody JeroDemo jeroDemo) { JeroDemoService.save(jeroDemo); return Result.OK("操作成功!"); } @@ -92,7 +92,7 @@ public class JeroDemoController extends JeroController edit(@RequestBody JeroDemo jeroDemo) { JeroDemoService.updateById(jeroDemo); return Result.OK("更新成功！"); } @@ -106,7 +106,7 @@ public class JeroDemoController extends JeroController map) { + public Result delete(@RequestBody Map map) { String id = map.get("id"); JeroDemoService.removeById(id); return Result.OK("删除成功!"); @@ -134,7 +134,7 @@ public class JeroDemoController extends JeroController 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 importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, JeroDemo.class); } @@ -238,7 +238,7 @@ public class JeroDemoController extends JeroController testOnlineAdd(@RequestBody JSONObject json) { log.info(json.toJSONString()); return Result.OK("操作成功!"); } @@ -255,7 +255,7 @@ public class JeroDemoController extends JeroController> loadMpPermissonList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = new QueryWrapper(); //编程方式，给queryWrapper装载数据权限规则 @@ -276,7 +276,7 @@ public class JeroDemoController extends JeroController> loadSqlPermissonList(JeroDemo jeroDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { IPage pageList = JeroDemoService.queryListWithPermission(pageSize, pageNo); return Result.OK(pageList); From ac9237fc0f04eb8a627407e9fe11d6c7c7a0531c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Mar 2023 09:55:30 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91JeroOrderMai?= =?UTF-8?q?nController=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/controller/JeroOrderMainController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java index c0f1129b..74ca73ce 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java @@ -64,7 +64,7 @@ public class JeroOrderMainController extends JeroController> queryPageList(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); IPage pageList = jeroOrderMainService.page(page, queryWrapper); @@ -78,7 +78,7 @@ public class JeroOrderMainController extends JeroController add(@RequestBody JeroOrderMainPage jeroOrderMainPage) { JeroOrderMain jeroOrderMain = new JeroOrderMain(); BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain); jeroOrderMainService.saveMain(jeroOrderMain, jeroOrderMainPage.getJeroOrderCustomerList(), jeroOrderMainPage.getJeroOrderTicketList()); @@ -92,7 +92,7 @@ public class JeroOrderMainController extends JeroController eidt(@RequestBody JeroOrderMainPage jeroOrderMainPage) { JeroOrderMain jeroOrderMain = new JeroOrderMain(); BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain); jeroOrderMainService.updateCopyMain(jeroOrderMain, jeroOrderMainPage.getJeroOrderCustomerList(), jeroOrderMainPage.getJeroOrderTicketList()); @@ -132,7 +132,7 @@ public class JeroOrderMainController extends JeroController queryById(@RequestParam(name = "id", required = true) String id) { JeroOrderMain jeroOrderMain = jeroOrderMainService.getById(id); return Result.OK(jeroOrderMain); } @@ -144,7 +144,7 @@ public class JeroOrderMainController extends JeroController> queryOrderCustomerListByMainId(@RequestParam(name = "id", required = true) String id) { List jeroOrderCustomerList = jeroOrderCustomerService.selectCustomersByMainId(id); return Result.OK(jeroOrderCustomerList); } @@ -156,7 +156,7 @@ public class JeroOrderMainController extends JeroController> queryOrderTicketListByMainId(@RequestParam(name = "id", required = true) String id) { List jeroOrderTicketList = jeroOrderTicketService.selectTicketsByMainId(id); return Result.OK(jeroOrderTicketList); } @@ -210,7 +210,7 @@ public class JeroOrderMainController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) { From ba1d89009544d238d29d160c36eb9d94df3f022c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Mar 2023 09:55:42 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91JeroOrderTab?= =?UTF-8?q?MainController=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JeroOrderTabMainController.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 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 12b3bdc8..b1c21d9e 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 @@ -61,7 +61,7 @@ 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) { @@ -78,7 +78,7 @@ 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); @@ -92,7 +92,7 @@ public class JeroOrderTabMainController { * @return */ @PostMapping("/edit") - public Result edit(@RequestBody JeroOrderMainPage jeroOrderMainPage) { + public Result edit(@RequestBody JeroOrderMainPage jeroOrderMainPage) { JeroOrderMain jeroOrderMain = new JeroOrderMain(); BeanUtils.copyProperties(jeroOrderMainPage, jeroOrderMain); jeroOrderMainService.updateById(jeroOrderMain); @@ -132,7 +132,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); } @@ -145,7 +145,7 @@ 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) { @@ -162,7 +162,7 @@ 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) { @@ -179,7 +179,7 @@ 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(ResultConstant.OP_OK); } @@ -191,7 +191,7 @@ public class JeroOrderTabMainController { * @return */ @PostMapping("/editCustomer") - public Result editCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) { + public Result editCustomer(@RequestBody JeroOrderCustomer jeroOrderCustomer) { jeroOrderCustomerService.updateById(jeroOrderCustomer); return Result.OK(ResultConstant.OP_OK); } @@ -203,7 +203,7 @@ public class JeroOrderTabMainController { * @return */ @PostMapping(value = "/deleteCustomer") - public Result deleteCustomer(@RequestBody Map map) { + public Result deleteCustomer(@RequestBody Map map) { String id = map.get("id"); jeroOrderCustomerService.removeById(id); return Result.OK(ResultConstant.DEL_OK); @@ -216,7 +216,7 @@ public class JeroOrderTabMainController { * @return */ @PostMapping(value = "/deleteBatchCustomer") - public Result deleteBatchCustomer(@RequestBody Map map) { + public Result deleteBatchCustomer(@RequestBody Map map) { String ids = map.get("ids"); this.jeroOrderCustomerService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK(ResultConstant.BATCH_DEL_OK); @@ -229,7 +229,7 @@ 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(ResultConstant.OP_OK); } @@ -241,7 +241,7 @@ public class JeroOrderTabMainController { * @return */ @PostMapping("/editTicket") - public Result editTicket(@RequestBody JeroOrderTicket jeroOrderTicket) { + public Result editTicket(@RequestBody JeroOrderTicket jeroOrderTicket) { jeroOrderTicketService.updateById(jeroOrderTicket); return Result.OK(ResultConstant.OP_OK); } @@ -253,7 +253,7 @@ public class JeroOrderTabMainController { * @return */ @PostMapping(value = "/deleteTicket") - public Result deleteTicket(@RequestBody Map map) { + public Result deleteTicket(@RequestBody Map map) { String id = map.get("id"); jeroOrderTicketService.removeById(id); return Result.OK(ResultConstant.DEL_OK); @@ -266,7 +266,7 @@ public class JeroOrderTabMainController { * @return */ @PostMapping(value = "/deleteBatchTicket") - public Result deleteBatchTicket(@RequestBody Map map) { + public Result deleteBatchTicket(@RequestBody Map map) { String ids = map.get("ids"); this.jeroOrderTicketService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK(ResultConstant.BATCH_DEL_OK); From 586157dd36d657c92b79e142c6dea0894797239f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Mar 2023 09:55:55 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91JoaDemoContr?= =?UTF-8?q?oller=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/controller/JoaDemoController.java | 42 +++++++------------ 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java index 936c9c48..d6930434 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java @@ -1,15 +1,9 @@ package com.jero.modules.demo.test.controller; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultConstant; import com.jero.common.system.base.controller.JeroController; @@ -17,31 +11,27 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.oConvertUtils; import com.jero.modules.demo.test.entity.JoaDemo; import com.jero.modules.demo.test.service.IJoaDemoService; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import lombok.extern.slf4j.Slf4j; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** * @Description: 流程测试 @@ -206,7 +196,7 @@ public class JoaDemoController { */ // @RequestMapping(value = "/importExcel", method = RequestMethod.POST) @PostMapping("/importExcel") - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) { From 03de63bc9793bd7d2812a613d05df3fa7f0059b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Mar 2023 09:56:21 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91oConvertUtil?= =?UTF-8?q?s=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/common/util/oConvertUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oConvertUtils.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oConvertUtils.java index de9ee859..052cdc7a 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oConvertUtils.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oConvertUtils.java @@ -614,6 +614,7 @@ public class oConvertUtils { } catch (IllegalAccessException e) { log.error("entityToModel : 安全权限异常", e); } + assert model != null; BeanUtils.copyProperties(entity, model); return (T)model; } From ceb45fe9fe5d86cc0d7b0075cc2ab533a3698839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Mar 2023 09:56:32 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91VxeMockContr?= =?UTF-8?q?oller=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vxe/controller/VxeMockController.java | 122 ++++++++++-------- 1 file changed, 69 insertions(+), 53 deletions(-) diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/vxe/controller/VxeMockController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/vxe/controller/VxeMockController.java index f03c093a..914b6198 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/vxe/controller/VxeMockController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/mock/vxe/controller/VxeMockController.java @@ -16,6 +16,8 @@ import com.jero.common.system.query.QueryCondition; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.demo.mock.vxe.entity.MockEntity; import com.jero.modules.demo.mock.vxe.websocket.VXESocket; +import org.apache.poi.ss.formula.functions.T; +import org.jetbrains.annotations.NotNull; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -38,7 +40,7 @@ public class VxeMockController { * @return */ @GetMapping("/change1") - public Result mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) { + public Result mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) { /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */ // 封装行数据 @@ -61,7 +63,7 @@ public class VxeMockController { * @return */ @GetMapping("/change2") - public Result mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) { + public Result mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) { /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */ // 封装行数据 @@ -85,7 +87,7 @@ public class VxeMockController { * @return */ @GetMapping("/change3") - public Result mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) { + public Result mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) { /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */ // 封装行数据 @@ -121,7 +123,7 @@ public class VxeMockController { * @return */ @GetMapping("/change4") - public Result mockChange4(@RequestParam("status") String status) { + public Result mockChange4(@RequestParam("status") String status) { // 封装socket数据 JSONObject socketData = new JSONObject(); // 这里的 key 是前端注册时使用的key，必须保持一致 @@ -143,7 +145,7 @@ public class VxeMockController { * @param rowData 行数据，实际使用时可以替换成一个实体类 */ @PostMapping ("/immediateSaveRow") - public Result mockImmediateSaveRow(@RequestBody JSONObject rowData) throws Exception { + public Result mockImmediateSaveRow(@RequestBody JSONObject rowData) throws InterruptedException { log.info("即时保存.rowData：" + rowData.toJSONString()); // 延时1.5秒，模拟网慢堵塞真实感 Thread.sleep(500); @@ -156,7 +158,7 @@ public class VxeMockController { * @param tableData 表格数据（实际使用时可以替换成一个List实体类） */ @PostMapping("/immediateSaveAll") - public Result mockImmediateSaveAll(@RequestBody JSONArray tableData) throws Exception { + public Result mockImmediateSaveAll(@RequestBody JSONArray tableData) throws InterruptedException { // 【注】： // 1、tableData里包含该页所有的数据 // 2、如果你实现了“即时保存”，那么除了新增的数据，其他的都是已经保存过的了， @@ -179,7 +181,7 @@ public class VxeMockController { * @return */ @GetMapping("/getData") - public Result getMockData( + public Result> getMockData( @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, // 父级id，根据父级id查询子级，如果为空则查询顶级 @@ -205,7 +207,7 @@ public class VxeMockController { * @return */ @GetMapping("/getDdjhData") - public Result getMockDdjhData( + public Result> getMockDdjhData( // SpringMVC 会自动将参数注入到实体里 MockEntity mockEntity, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -223,8 +225,8 @@ public class VxeMockController { Map parameterMap = request.getParameterMap(); // 遍历输出到控制台 log.info("\ngetDdjhData - 普通查询条件："); - for (String key : parameterMap.keySet()) { - log.info("-- " + key + ": " + JSON.toJSONString(parameterMap.get(key))); + for (Map.Entry entry : parameterMap.entrySet()) { + log.info("-- " + entry.getKey() + ": " + JSON.toJSONString(entry.getValue())); } // 输出高级查询 try { @@ -270,13 +272,20 @@ public class VxeMockController { } IPage page = this.queryDataPage(dataList, parentId, pageNo, pageSize); + List records = getJsonObjects(dataList, page); + page.setRecords(records); + return Result.OK(page); + } + + @NotNull + private List getJsonObjects(JSONArray dataList, IPage page) { // 逐行查询子表数据，用于计算拖轮状态 List records = page.getRecords(); - for (JSONObject record : records) { + for (JSONObject obj : records) { Map tugStatusMap = new HashMap<>(); - String id = record.getString("id"); + String id = obj.getString("id"); // 查询出主表的拖轮 - String tugMain = record.getString("tug"); + String tugMain = obj.getString("tug"); // 判断是否有值 if (StringUtils.isNotBlank(tugMain)) { // 拖轮根据分号分割 @@ -284,49 +293,56 @@ public class VxeMockController { // 查询子表数据 List subRecords = this.queryDataPage(dataList, id, null, null).getRecords(); // 遍历子表和拖轮数据，找出进行计算反推拖轮状态 - for (JSONObject subData : subRecords) { - String subTug = subData.getString("tug"); - if (StringUtils.isNotBlank(subTug)) { - for (String tug : tugs) { - if (tug.equals(subTug)) { - // 计算拖轮状态逻辑 - int statusCode = 0; - - /* 如果有发船时间、作业开始时间、作业结束时间、回船时间，则主表中的拖轮列中的每个拖轮背景色要即时变色 */ - - // 有发船时间，状态 +1 - String departureTime = subData.getString("departure_time"); - if (StringUtils.isNotBlank(departureTime)) { - statusCode += 1; - } - // 有作业开始时间，状态 +1 - String workBeginTime = subData.getString("work_begin_time"); - if (StringUtils.isNotBlank(workBeginTime)) { - statusCode += 1; - } - // 有作业结束时间，状态 +1 - String workEndTime = subData.getString("work_end_time"); - if (StringUtils.isNotBlank(workEndTime)) { - statusCode += 1; - } - // 有回船时间，状态 +1 - String returnTime = subData.getString("return_time"); - if (StringUtils.isNotBlank(returnTime)) { - statusCode += 1; - } - // 保存拖轮状态，key是拖轮的值，value是状态，前端根据不同的状态码，显示不同的颜色，这个颜色也可以后台计算完之后返回给前端直接使用 - tugStatusMap.put(tug, statusCode); - break; - } - } - } - } + doForSubRecords(tugStatusMap, tugs, subRecords); } // 新加一个字段用于保存拖轮状态，不要直接覆盖原来的，这个字段可以不保存到数据库里 - record.put("tug_status", tugStatusMap); + obj.put("tug_status", tugStatusMap); + } + return records; + } + + private void doForSubRecords(Map tugStatusMap, String[] tugs, List subRecords) { + for (JSONObject subData : subRecords) { + String subTug = subData.getString("tug"); + if (StringUtils.isNotBlank(subTug)) { + doForTugs(tugStatusMap, tugs, subData, subTug); + } + } + } + + private void doForTugs(Map tugStatusMap, String[] tugs, JSONObject subData, String subTug) { + for (String tug : tugs) { + if (tug.equals(subTug)) { + // 计算拖轮状态逻辑 + int statusCode = 0; + + /* 如果有发船时间、作业开始时间、作业结束时间、回船时间，则主表中的拖轮列中的每个拖轮背景色要即时变色 */ + + // 有发船时间，状态 +1 + String departureTime = subData.getString("departure_time"); + if (StringUtils.isNotBlank(departureTime)) { + statusCode += 1; + } + // 有作业开始时间，状态 +1 + String workBeginTime = subData.getString("work_begin_time"); + if (StringUtils.isNotBlank(workBeginTime)) { + statusCode += 1; + } + // 有作业结束时间，状态 +1 + String workEndTime = subData.getString("work_end_time"); + if (StringUtils.isNotBlank(workEndTime)) { + statusCode += 1; + } + // 有回船时间，状态 +1 + String returnTime = subData.getString("return_time"); + if (StringUtils.isNotBlank(returnTime)) { + statusCode += 1; + } + // 保存拖轮状态，key是拖轮的值，value是状态，前端根据不同的状态码，显示不同的颜色，这个颜色也可以后台计算完之后返回给前端直接使用 + tugStatusMap.put(tug, statusCode); + break; + } } - page.setRecords(records); - return Result.OK(page); } /** From 8bdd0211c8b3d1f5e3acdaf8c68645bf354c8529 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Thu, 16 Mar 2023 09:59:54 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E3=80=90fix=20bug=E3=80=91vxe-table=20?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/demo/JVxeDemo/JVxeDemo2.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/demo/JVxeDemo/JVxeDemo2.vue b/jero-web/src/views/demo/JVxeDemo/JVxeDemo2.vue index e86424ee..4fcd82dc 100644 --- a/jero-web/src/views/demo/JVxeDemo/JVxeDemo2.vue +++ b/jero-web/src/views/demo/JVxeDemo/JVxeDemo2.vue @@ -40,7 +40,8 @@ export default { dict: 'sys_user,realname,username', params: { key: 'select_dict_search', - type: JVXETypes.selectDictSearch + type: JVXETypes.selectDictSearch, + dict: 'sys_user,realname,username' } }, { From 02862bc649b07c90e09d57ae760798dfa9f560de Mon Sep 17 00:00:00 2001 From: danshihao Date: Thu, 16 Mar 2023 10:36:10 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E3=80=90fix=2066426=E3=80=91=E9=83=A8?= =?UTF-8?q?=E5=88=86demo=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/demo/list/JTableList.vue | 148 ++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 jero-web/src/views/demo/list/JTableList.vue diff --git a/jero-web/src/views/demo/list/JTableList.vue b/jero-web/src/views/demo/list/JTableList.vue new file mode 100644 index 00000000..a46cbc47 --- /dev/null +++ b/jero-web/src/views/demo/list/JTableList.vue @@ -0,0 +1,148 @@ + + + + + From 0456a37db6a3315d9a2bf6fde8d7682b6507e5f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Mar 2023 11:32:06 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91IQuartzJobSe?= =?UTF-8?q?rvice=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/quartz/service/IQuartzJobService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/service/IQuartzJobService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/service/IQuartzJobService.java index 4fb5a187..23e3fa6a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/service/IQuartzJobService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/service/IQuartzJobService.java @@ -29,7 +29,7 @@ public interface IQuartzJobService extends IService { * 执行定时任务 * @param quartzJob */ - void execute(QuartzJob quartzJob) throws Exception; + void execute(QuartzJob quartzJob) throws IllegalAccessException, InstantiationException, ClassNotFoundException, SchedulerException; /** * 暂停任务 From 2257d965f6352874487c55abd045254501e0ef15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Mar 2023 11:32:23 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91ISysUserServ?= =?UTF-8?q?ice=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/system/service/ISysUserService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index c78f2d80..27d6bedf 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -154,7 +154,7 @@ public interface ISysUserService extends IService { * @param page 分页参数 * @return */ - IPage queryUserByOrgCode(String orgCode, SysUser userParams, IPage page); + IPage queryUserByOrgCode(String orgCode, SysUser userParams, Page page); /** * 根据角色Id查询 From c175e33a152a5d593c8aeab1c303f882acd38767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Mar 2023 11:32:36 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91QuartzJobSer?= =?UTF-8?q?viceImpl=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/quartz/service/impl/QuartzJobServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/service/impl/QuartzJobServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/service/impl/QuartzJobServiceImpl.java index 3d83b32b..6f06a66e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/service/impl/QuartzJobServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/service/impl/QuartzJobServiceImpl.java @@ -95,7 +95,7 @@ public class QuartzJobServiceImpl extends ServiceImpl Date: Thu, 16 Mar 2023 11:32:52 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91SysDepartCon?= =?UTF-8?q?troller=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/controller/SysDepartController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 4e0cdcd8..2aa6682a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -248,7 +248,6 @@ public class SysDepartController { // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @PostMapping("/deleteBatch") @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) -// public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { public Result deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); if (ids == null || "".equals(ids.trim())) { From 0abf57a92ce73e69d1fb06e30db9b402a42dacaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Mar 2023 11:33:08 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91SysDictContr?= =?UTF-8?q?oller=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/controller/SysDictController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 35e24773..206110aa 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -392,7 +392,6 @@ public class SysDictController { @ApiOperation(value = "字典控制器-删除字典", notes = "字典控制器-删除字典") @PostMapping(value = "/delete") @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) -// public Result delete(@RequestParam(name="id",required=true) String id) { public Result delete(@RequestBody Map map) { String id = map.get("id"); boolean ok = sysDictService.removeById(id); From 1ef5d987b5a7ff7189e9ffb0d3650b3bead2d3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Mar 2023 11:33:29 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91SysUserServi?= =?UTF-8?q?ceImpl=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/service/impl/SysUserServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 9542fc17..5c99e628 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -295,7 +295,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public IPage queryUserByOrgCode(String orgCode, SysUser userParams, IPage page) { + public IPage queryUserByOrgCode(String orgCode, SysUser userParams, Page page) { List list = baseMapper.getUserByOrgCode(page, orgCode, userParams); Integer total = baseMapper.getUserByOrgCodeTotal(orgCode, userParams); @@ -370,8 +370,8 @@ public class SysUserServiceImpl extends ServiceImpl impl * @return */ @Override - public Result checkUserIsEffective(SysUser sysUser) { - Result result = new Result<>(); + public Result checkUserIsEffective(SysUser sysUser) { + Result result = new Result<>(); //情况1：根据用户信息查询，该用户不存在 if (sysUser == null) { baseCommonService.addLog("用户登录失败，用户不存在！", CommonConstant.LOG_TYPE_1, null); From b0689225c9998209b11c7c91116e3d40b4a3b3f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 16 Mar 2023 11:34:32 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6url=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E4=BF=AE=E6=94=B9=E6=88=9044=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/jero/jero_database.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/resources/jero/jero_database.properties b/jero-boot/jero-boot-module-system/src/main/resources/jero/jero_database.properties index 5c440784..d75b279b 100644 --- a/jero-boot/jero-boot-module-system/src/main/resources/jero/jero_database.properties +++ b/jero-boot/jero-boot-module-system/src/main/resources/jero/jero_database.properties @@ -1,9 +1,9 @@ #mysql driver_name=com.mysql.cj.jdbc.Driver -url=jdbc:mysql://121.36.69.172:3307/jero-boot?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai +url=jdbc:mysql://10.10.10.44:3306/jero-boot-bug?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai username=root -password=123456 -database_name=jero-boot +password=hzwlsoft.com +database_name=jero-boot-bug #oracle #diver_name=oracle.jdbc.driver.OracleDriver @@ -24,4 +24,4 @@ database_name=jero-boot #url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=jero #username=sa #password=SA -#database_name=jero \ No newline at end of file +#database_name=jero From 580c720c05d56214790288215a54d6213a37b2c8 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Thu, 16 Mar 2023 13:38:40 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E3=80=90fix=20bug=20=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E3=80=91=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=EF=BC=8C?= =?UTF-8?q?put=E3=80=81delete=E6=94=B9=E4=B8=BApost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/onlineForm/onlineForm.js | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/jero-web/src/components/onlineForm/onlineForm.js b/jero-web/src/components/onlineForm/onlineForm.js index b975b1ee..2feb542a 100644 --- a/jero-web/src/components/onlineForm/onlineForm.js +++ b/jero-web/src/components/onlineForm/onlineForm.js @@ -1489,14 +1489,14 @@ })); while (t.length) n = n.then(t.shift(), t.shift()); return n - }, a.forEach(["delete", "get", "head", "options"], (function(e) { + }, a.forEach(["get", "head", "options"], (function(e) { s.prototype[e] = function(t, n) { return this.request(a.merge(n || {}, { method: e, url: t })) } - })), a.forEach(["post", "put", "patch"], (function(e) { + })), a.forEach(["post", "patch"], (function(e) { s.prototype[e] = function(t, n, r) { return this.request(a.merge(r || {}, { method: e, @@ -8082,7 +8082,7 @@ function o(e, t) { return Object(r["a"])({ url: e, - method: "put", + method: "post", data: t }) } @@ -8098,7 +8098,7 @@ function c(e, t) { return Object(r["a"])({ url: e, - method: "delete", + method: "post", params: t }) } @@ -10407,7 +10407,7 @@ }, edit: function(e, t) { var that = this; - this.titleText = "编辑", this.uiSchema.method = "put", this.uiSchema.formTemplate = e, this.uiSchema.url = + this.titleText = "编辑", this.uiSchema.method = "post", this.uiSchema.formTemplate = e, this.uiSchema.url = this.url.optPre + this.code, this.uiSchema = c({}, this.uiSchema), this.visible = !0, this.disableSubmit = ! 1, Object(o["c"])(this.url.optPre + this.code + "/" + t).then((function(e) { if (e.success) { @@ -11122,9 +11122,9 @@ } } }; - r.forEach(["delete", "get", "head"], (function(e) { + r.forEach(["post", "get", "head"], (function(e) { c.headers[e] = {} - })), r.forEach(["post", "put", "patch"], (function(e) { + })), r.forEach(["post", "patch"], (function(e) { c.headers[e] = r.merge(i) })), e.exports = c }).call(this, n("f28c")) @@ -11639,7 +11639,7 @@ while (1) switch (e.prev = e.next) { case 0: return a = "/sys/fillRule/executeRuleByCode/".concat(t), i = {}, "function" === typeof r && (i = r()), - e.next = 5, Object(_api_manage__WEBPACK_IMPORTED_MODULE_5__["e"])(a, i, "PUT"); + e.next = 5, Object(_api_manage__WEBPACK_IMPORTED_MODULE_5__["e"])(a, i, "POST"); case 5: if (o = e.sent, s = o.success, c = o.message, l = o.result, !s) { e.next = 13; @@ -20330,7 +20330,7 @@ e.single = 1 == t.result.head.tableType; var n = { formTemplate: t.result.head.formTemplate, - method: "put", + method: "post", url: e.url.optPre + t.result.head.id }; e.schema = Object.assign({}, t.result.schema, n); @@ -24352,7 +24352,7 @@ var t = this, n = "post", r = this.url.add; - this.model.id && (n = "put", r = this.url.edit), this.confirmLoading = !0, Object(s["e"])(r, e, n).then(( + this.model.id && (r = this.url.edit), this.confirmLoading = !0, Object(s["e"])(r, e, n).then(( function(e) { e.success ? (t.$message.success(e.message), t.$emit("ok"), t.close()) : t.$message.warning(e.message) })).finally((function() { @@ -29134,7 +29134,7 @@ e.exports = function(e) { l(e), e.baseURL && !s(e.url) && (e.url = c(e.baseURL, e.url)), e.headers = e.headers || {}, e.data = a(e.data, e.headers, e.transformRequest), e.headers = r.merge(e.headers.common || {}, e.headers[e.method] || {}, e.headers || - {}), r.forEach(["delete", "get", "head", "post", "put", "patch", "common"], (function(t) { + {}), r.forEach(["get", "head", "post", "patch", "common"], (function(t) { delete e.headers[t] })); var t = e.adapter || o.adapter; @@ -34058,7 +34058,7 @@ e.head && e.head.tableName && (e.head.tableName = e.head.tableName.toLowerCase().trim()); var i = "post", o = this.url.addAll; - this.model.id && (i = "put", o = this.url.editAll), Object(p["e"])(o, e, i).then((function(n) { + this.model.id && (o = this.url.editAll), Object(p["e"])(o, e, i).then((function(n) { n.success ? (t.refreshCacheTableName(t.metaTableName, e.head["tableName"]), t.$message.success(n.message), t.$emit("ok"), t.close()) : t.$message.warning(n.message) })).finally((function() { @@ -37496,8 +37496,8 @@ if (!n) { t.confirmLoading = !0; var a = "", - o = ""; - e.model.id ? (a += e.url.edit, o = "put") : (a += e.url.add, o = "post"); + o = "post"; + e.model.id ? (a += e.url.edit) : (a += e.url.add); var s = Object.assign(e.model, r); s.cgformHeadId = e.code, Object(i["e"])(a, s, o).then((function(e) { e.success ? (t.$message.success(e.message), t.$emit("ok")) : t.$message.warning(e.message) @@ -40153,7 +40153,7 @@ }, edit: function(e, t) { var n = this; - this.titleText = "编辑", this.uiSchema.method = "put", this.uiSchema.formTemplate = e, this.uiSchema.url = + this.titleText = "编辑", this.uiSchema.method = "post", this.uiSchema.formTemplate = e, this.uiSchema.url = this.urls.optPre + this.code, this.uiSchema = v({}, this.uiSchema), this.visible = !0, this.disableSubmit = ! 1, Object(i["c"])(this.urls.optPre + this.code + "/" + t).then((function(e) { if (e.success) { @@ -73614,7 +73614,7 @@ }, edit: function(e, t) { var n = this; - this.titleText = "编辑", this.uiSchema.method = "put", this.uiSchema.formTemplate = e, this.uiSchema.url = + this.titleText = "编辑", this.uiSchema.method = "post", this.uiSchema.formTemplate = e, this.uiSchema.url = this.url.optPre + this.code, this.uiSchema = c({}, this.uiSchema), this.visible = !0, this.disableSubmit = ! 1, Object(o["c"])(this.url.optPre + this.code + "/" + t).then((function(e) { if (e.success) {