From ccfef76a72d76f8eb33dee43d546060d9065788c Mon Sep 17 00:00:00 2001 From: erdanergou Date: Fri, 9 Jun 2023 15:51:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=99=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=90=8E=E6=97=A0=E6=B3=95=E5=AD=98=E5=82=A8=E5=88=B0redis?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/PublicConfig.java | 15 +++++++++++ .../controller/PageController.java | 27 +++++++++---------- .../impl/DepositoryRecordServiceImpl.java | 12 ++++----- .../pages/application/application-review.html | 4 +-- .../depository_manage/SomeTest.java | 6 +++++ .../pages/application/application-review.html | 4 +-- 6 files changed, 43 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java b/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java index 5fa25002..1af943ad 100644 --- a/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java +++ b/src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java @@ -181,4 +181,19 @@ public class PublicConfig { exs.shutdownNow(); } } + + + /** + * 用于获取Map + * @param jsonObject + * @return + */ + public static Map returnMapString(JSONObject jsonObject){ + Map stringObjectMap = new HashMap<>(); + for (String next : jsonObject.keySet()) { + String value = String.valueOf(jsonObject.get(next)); + stringObjectMap.put(next,value); + } + return stringObjectMap; + } } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index b7b83b9b..b69b3c2c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -831,7 +831,7 @@ public class PageController { mv.addObject("display", "none"); } List businessTypeAll = businessTypeService.findBusinessTypeAll(); - mv.addObject("btList",businessTypeAll); + mv.addObject("btList", businessTypeAll); mv.setViewName("pages/application/application-out"); Integer maindeparment = userToken.getMaindeparment(); if (PublicConfig.roleAdminorgList.contains(maindeparment)) { @@ -851,7 +851,7 @@ public class PageController { ModelAndView mv = new ModelAndView(); // 获取所有出库业务类别 List businessTypeAll = businessTypeService.findBusinessTypeAll(); - mv.addObject("btList",businessTypeAll); + mv.addObject("btList", businessTypeAll); mv.setViewName("pages/applicationForStorageCenter/application-out_admin"); return mv; } @@ -868,7 +868,7 @@ public class PageController { public ModelAndView application_out_back(String code, String depositoryId, HttpServletRequest request) { ModelAndView mv = new ModelAndView(); List businessTypeAll = businessTypeService.findBusinessTypeAll(); - mv.addObject("btList",businessTypeAll); + mv.addObject("btList", businessTypeAll); mv.setViewName("pages/application/application-out_back"); String token = request.getHeader("user-token"); if (token == null) { @@ -1946,11 +1946,7 @@ public class PageController { // 获取当前出库仓库是否为开放仓库 int flagForOpenDepository = recordP.getFlagForOpenDepository(); - if (flagForOpenDepository == 2) { - mv.addObject("depositoryManagerText", "部门负责人"); - } else { - mv.addObject("depositoryManagerText", "仓储负责人"); - } + mv.addObject("depositoryManagerText", "负责人"); // 获取所有子订单 List applicationOutRecordMinByParent = depositoryRecordService.findApplicationOutRecordMinByParent(recordP.getId()); @@ -2043,15 +2039,18 @@ public class PageController { // 平衡岗人员 String balancePoster = recordP.getBalancePoster(); StringBuilder balancePosterName = new StringBuilder(); - if(balancePoster != null && !"".equals(balancePoster)){ + if (balancePoster != null && !"".equals(balancePoster)) { String[] strings = balancePoster.split(","); for (String string : strings) { - if(!"".equals(string)){ + if (!"".equals(string)) { UserByPort user = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(string), userKey, token); balancePosterName.append(user.getName()).append(","); } } - recordP.setBalancePosterTime(DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getBalancePosterTime()))); + String balancePosterTime = recordP.getBalancePosterTime(); + if (balancePosterTime != null && !"".equals(balancePosterTime) && !"0".equals(balancePosterTime)) { + recordP.setBalancePosterTime(DateUtil.TimeStampToDateTime(Long.valueOf(balancePosterTime))); + } } // 获取出库的所有仓库 @@ -2391,7 +2390,7 @@ public class PageController { } } applicationOutRecordPById.setBalancePosterTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationOutRecordPById.getBalancePosterTime()))); - }else{ + } else { applicationOutRecordPById.setBalancePosterTime(""); } @@ -3231,7 +3230,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } List businessTypeAll = businessTypeService.findBusinessTypeAll(); - mv.addObject("btList",businessTypeAll); + mv.addObject("btList", businessTypeAll); UserByPort userToken = AuthenticationTokenPool.getUserToken(token); List range = redisPool.getRedisTemplateByDb(15).boundListOps("WMS_temporaryValue_Out" + userToken.getNumber()).range(0, -1); // 获取当前用户是否存在可见仓库 @@ -3627,8 +3626,6 @@ public class PageController { } - - // 用于展示库存数据 @GetMapping("/toShowInventory") public ModelAndView toShowInventory(@RequestParam Map param) { diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index ab99b6e6..bf8c009e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -2410,7 +2410,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { SendQyWxMessageThreadPool.execute(() -> { JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent, userKey, token); String redisOutKey = "wms_notificationOut_" + applicationOutRecordMin.getId(); - Map stringObjectMap = jsonObject.toJavaObject(Map.class); + Map stringObjectMap = PublicConfig.returnMapString(jsonObject); redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey, stringObjectMap); redisPool.getRedisTemplateByDb(14).expire(redisOutKey, 72, TimeUnit.HOURS); }); @@ -2491,7 +2491,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { SendQyWxMessageThreadPool.execute(() -> { JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent, userKey, token); String redisOutKey = "wms_notificationOut_" + applicationOutRecordMin.getId(); - Map stringObjectMap = jsonObject.toJavaObject(Map.class); + Map stringObjectMap = PublicConfig.returnMapString(jsonObject); redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey, stringObjectMap); redisPool.getRedisTemplateByDb(14).expire(redisOutKey, 72, TimeUnit.HOURS); }); @@ -3472,7 +3472,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { SendQyWxMessageThreadPool.execute(() -> { JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent, userKey, token); String redisOutKey = "wms_notificationOut_" + applicationOutRecordMin.getId(); - Map stringObjectMap = jsonObject.toJavaObject(Map.class); + Map stringObjectMap = PublicConfig.returnMapString(jsonObject); redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey, stringObjectMap); redisPool.getRedisTemplateByDb(14).expire(redisOutKey, 72, TimeUnit.HOURS); }); @@ -3551,7 +3551,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { SendQyWxMessageThreadPool.execute(() -> { JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent, userKey, token); String redisOutKey = "wms_notificationOut_" + applicationOutRecordMin.getId(); - Map stringObjectMap = jsonObject.toJavaObject(Map.class); + Map stringObjectMap = PublicConfig.returnMapString(jsonObject); redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey, stringObjectMap); redisPool.getRedisTemplateByDb(14).expire(redisOutKey, 72, TimeUnit.HOURS); }); @@ -3950,7 +3950,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { SendQyWxMessageThreadPool.execute(() -> { JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent, userKey, token); String redisOutKey = "wms_notificationOut_" + applicationOutRecordMin.getId(); - Map stringObjectMap = jsonObject.toJavaObject(Map.class); + Map stringObjectMap = PublicConfig.returnMapString(jsonObject); redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey, stringObjectMap); redisPool.getRedisTemplateByDb(14).expire(redisOutKey, 72, TimeUnit.HOURS); }); @@ -4028,7 +4028,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { SendQyWxMessageThreadPool.execute(() -> { JSONObject jsonObject = qyWxOperationService.sendNotificationToDepositoryManager(QyWxUid.toString(), applicationOutRecordMin.getId(), userAgent, userKey, token); String redisOutKey = "wms_notificationOut_" + applicationOutRecordMin.getId(); - Map stringObjectMap = jsonObject.toJavaObject(Map.class); + Map stringObjectMap = PublicConfig.returnMapString(jsonObject); redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey, stringObjectMap); redisPool.getRedisTemplateByDb(14).expire(redisOutKey, 72, TimeUnit.HOURS); }); diff --git a/src/main/resources/templates/pages/application/application-review.html b/src/main/resources/templates/pages/application/application-review.html index a395c3d8..401d3cc2 100644 --- a/src/main/resources/templates/pages/application/application-review.html +++ b/src/main/resources/templates/pages/application/application-review.html @@ -102,7 +102,7 @@ 负责人 - 部门负责人 + 审核意见 @@ -268,7 +268,7 @@ $("#balancePosterNameT").show(); $("#reviewForBalance").show(); - } else if(balancePosterTime !== null && balancePosterTime !== "0"){ + } else if(balancePosterTime !== null && balancePosterTime !== "0" && balancePosterTime !== ""){ $("#depositoryManagerNameT").show(); $("#balancePosterNameT").show(); $("#balancePosterMessageT").show(); diff --git a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java index fc28600c..094bce63 100644 --- a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java @@ -314,4 +314,10 @@ public class SomeTest { } + + @Test + public void tes(){ + Integer a = 1; + System.out.println(String.valueOf(a)); + } } diff --git a/target/classes/templates/pages/application/application-review.html b/target/classes/templates/pages/application/application-review.html index a395c3d8..401d3cc2 100644 --- a/target/classes/templates/pages/application/application-review.html +++ b/target/classes/templates/pages/application/application-review.html @@ -102,7 +102,7 @@ 负责人 - 部门负责人 + 审核意见 @@ -268,7 +268,7 @@ $("#balancePosterNameT").show(); $("#reviewForBalance").show(); - } else if(balancePosterTime !== null && balancePosterTime !== "0"){ + } else if(balancePosterTime !== null && balancePosterTime !== "0" && balancePosterTime !== ""){ $("#depositoryManagerNameT").show(); $("#balancePosterNameT").show(); $("#balancePosterMessageT").show();