diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index ea209f4b..1ddce97a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -839,7 +839,7 @@ public class DepositoryRecordController { departmentHeadId.append(departmentHeadByUser.getId()).append(","); } //李文轩liwenxuan 测试配置 start - departmentHeadId = new StringBuilder("9458").append(","); + //departmentHeadId = new StringBuilder("9458").append(","); //李文轩 liwenxuan测试配置 end map.put("departmenthead", departmentHeadId.toString()); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java index 56f1429d..1887a31b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/StockTakingController.java @@ -85,9 +85,9 @@ public class StockTakingController { if (workwechat == null || "".equals(workwechat)) { workwechat = departmentManager.getWechat(); } - //QyWxDepartmentManager.append(workwechat+","); + QyWxDepartmentManager.append(workwechat+","); } - QyWxDepartmentManager.append("LiWenXuan").append(","); + //QyWxDepartmentManager.append("LiWenXuan").append(","); map.put("state", 3); map.put("departmentManagerState", 3); map.remove("departmentManagerId"); @@ -461,9 +461,9 @@ public class StockTakingController { if (workwechat == null || "".equals(workwechat)) { workwechat = departmentManager.getWechat(); } - ///QyWxDepartmentManager.append(workwechat+","); + QyWxDepartmentManager.append(workwechat+","); } - QyWxDepartmentManager.append("LiWenXuan"); + //QyWxDepartmentManager.append("LiWenXuan"); if (map.containsKey("mainIdList")) { List mainIdList = ObjectFormatUtil.objToList(map.get("mainIdList"),Object.class); for (Object main : mainIdList diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java b/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java index e86041a7..9535f787 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java @@ -113,7 +113,7 @@ public class UserController { String userToken = (String) session.getAttribute("userToken"); AuthenticationTokenPool.removeUserToken(userToken); //liwenxuan 20230804 本地环境登出时不删redis, 上线要改回来 测试用 - //redisPool.getRedisTemplateByDb(5).delete(PublicConfig.LoginRedisPrefix + userKey); + redisPool.getRedisTemplateByDb(5).delete(PublicConfig.LoginRedisPrefix + userKey); } session.invalidate(); return new RestResponse("", 200, new StatusInfo("退出成功", "退出成功")); 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 5520f445..6df9dbb5 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 @@ -2680,9 +2680,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = depositoryManager.getWechat(); } - //depositoryManagerByQyWx.append(workwechat+","); + depositoryManagerByQyWx.append(workwechat+","); } - depositoryManagerByQyWx.append("LiWenXuan,"); + //depositoryManagerByQyWx.append("LiWenXuan,"); JSONObject jsonObject = qyWxOperationService.sendCcMessageToUsers(depositoryManagerByQyWx.toString(), record.getId(), userAgent, userKey, token); // 删除redis中本订单 @@ -2878,9 +2878,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = manager.getWechat(); } - //QyWxUid.append(workwechat+","); + QyWxUid.append(workwechat+","); } - QyWxUid.append("LiWenXuan,"); + //QyWxUid.append("LiWenXuan,"); // 将当前子单的管理员插入到子单记录中 minRecord.put("manager", minRecordManage.toString()); // 添加子订单到redis中 @@ -2964,9 +2964,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = manager.getWechat(); } - // QyWxUid.append(workwechat+","); + QyWxUid.append(workwechat+","); } - QyWxUid.append("LiWenXuan,"); + //QyWxUid.append("LiWenXuan,"); minRecord.put("manager", minRecordManage.toString()); // 添加子订单到redis中 redisPool.getRedisTemplateByDb(15).opsForHash().putAll(minRecordKey, minRecord); @@ -4694,9 +4694,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = byPort.getWechat(); } - //QyWxUid.append(workwechat).append(","); + QyWxUid.append(workwechat).append(","); } - QyWxUid.append("LiWenXuan" + ","); + //QyWxUid.append("LiWenXuan" + ","); map.put("depositoryManager", depositoryManager.toString()); } else { String[] split = depositoryManagerString.split(","); @@ -4715,9 +4715,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = userById.getWechat(); } - //QyWxUid.append(workwechat + ","); + QyWxUid.append(workwechat + ","); } - QyWxUid.append("LiWenXuan").append(","); + //QyWxUid.append("LiWenXuan").append(","); } // 向仓储中心负责人发送新的消息 @@ -4863,9 +4863,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = manager.getWechat(); } - // QyWxUid.append(workwechat+","); + QyWxUid.append(workwechat+","); } - QyWxUid.append("LiWenXuan,"); + //QyWxUid.append("LiWenXuan,"); minRecord.put("manager", minRecordManage.toString()); // 添加子订单到redis中 redisPool.getRedisTemplateByDb(15).opsForHash().putAll(minRecordKey, minRecord); @@ -4952,9 +4952,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (workwechat == null || "".equals(workwechat)) { workwechat = manager.getWechat(); } - // QyWxUid.append(workwechat+","); + QyWxUid.append(workwechat+","); } - QyWxUid.append("LiWenXuan,"); + //QyWxUid.append("LiWenXuan,"); minRecord.put("manager", minRecordManage.toString()); // 添加子订单到redis中 redisPool.getRedisTemplateByDb(15).opsForHash().putAll(minRecordKey, minRecord); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java index e4362fa1..3d48ae83 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java @@ -1988,7 +1988,7 @@ public class QyWxOperationService { Approval_template_approver approval_template_approver_departMentHeader = new Approval_template_approver(); approval_template_approver_departMentHeader.setAttr(1); //上线要修改 把企业微信接收审批通知的人改成开发者. - userIdList = new ArrayList<>(Collections.singleton("LiWenXuan")); + //userIdList = new ArrayList<>(Collections.singleton("LiWenXuan")); approval_template_approver_departMentHeader.setUserid(userIdList); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java index fbb9ea80..65353b35 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java @@ -567,8 +567,8 @@ public class StockTakingServiceImpl implements StockTakingService { if (workwechat == null || "".equals(workwechat)) { workwechat = originator.getWechat(); } - JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", mainId, normalMinId, userAgent, userKey, token); - // JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent, userKey, token); + //JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", mainId, normalMinId, userAgent, userKey, token); + JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinId, userAgent, userKey, token); // 将当前返回结果保存到redis中 if (jsonObject != null) { Map QyWxMessageMap = new HashMap<>(); @@ -618,7 +618,7 @@ public class StockTakingServiceImpl implements StockTakingService { QyWxUid1.append(workwechat).append(","); } String s = QyWxUid1.toString(); - s = "LiWenXuan,"; + //s = "LiWenXuan,"; qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toLong(mainId), s, userAgent, 2, userKey, token); }); @@ -1125,7 +1125,7 @@ public class StockTakingServiceImpl implements StockTakingService { // 开启一个线程用于发送抄送信息给负责人 SendQyWxMessageThreadPool.execute(() -> { String s = QyWxUid.toString(); - s = "LiWenXuan,"; + //s = "LiWenXuan,"; JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, userToken, mainRecord, userAgent, userKey, token); }); @@ -1670,7 +1670,7 @@ public class StockTakingServiceImpl implements StockTakingService { QyWxUid.append(workwechat).append(","); } String s = QyWxUid.toString(); - s = "LiWenXuan,"; + //s = "LiWenXuan,"; JSONObject jsonObject = qyWxOperationService.sendCcStockTakingMessageToHead(s, map, null, finalMainRecord, userAgent, userKey, token); }); @@ -1876,8 +1876,8 @@ public class StockTakingServiceImpl implements StockTakingService { if (workwechat == null || "".equals(workwechat)) { workwechat = originator.getWechat(); } - JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", ObjectFormatUtil.toLong(mainId), normalMinId, userAgent, userKey, token); -// JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toLong(mainId), normalMinId, userAgent, userKey, token); + //JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", ObjectFormatUtil.toLong(mainId), normalMinId, userAgent, userKey, token); + JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, ObjectFormatUtil.toLong(mainId), normalMinId, userAgent, userKey, token); // 将当前返回结果保存到redis中 if (jsonObject != null) { Map QyWxMessageMap = new HashMap<>(); @@ -2751,9 +2751,9 @@ public class StockTakingServiceImpl implements StockTakingService { if (workwechat == null || "".equals(workwechat)) { workwechat = userByPort.getWechat(); } -// departMentHeadQyWxName.append(workwechat+","); + departMentHeadQyWxName.append(workwechat+","); //liwenxuan - departMentHeadQyWxName.append("LiWenXuan,"); + //departMentHeadQyWxName.append("LiWenXuan,"); JSONObject jsonObject = qyWxOperationService.sendCcStockTakingTransferMessageToHead(departMentHeadQyWxName.toString(), map, userToken, finalMainRecord, userAgent, userKey, token); } @@ -2944,8 +2944,8 @@ public class StockTakingServiceImpl implements StockTakingService { if(workwechat == null || "".equals(workwechat)){ workwechat = originator.getWechat(); } - JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", mainId, normalMinIds, userAgent, userkey, token); - //JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds, userAgent,userkey,token); + //JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage("LiWenXuan,", mainId, normalMinIds, userAgent, userkey, token); + JSONObject jsonObject = qyWxOperationService.sendQyWxToStockTakingMessage(workwechat, mainId, normalMinIds, userAgent,userkey,token); if (jsonObject != null) { // 将当前返回结果保存到redis中 Map QyWxMessageMap = new HashMap<>(); @@ -2972,8 +2972,8 @@ public class StockTakingServiceImpl implements StockTakingService { if(workwechat == null || "".equals(workwechat)){ workwechat = originator.getWechat(); } - qyWxOperationService.sendStockTakingErrMessageToHead("LiWenXuan,", errIds, mainRecord, null, userAgent, userkey, token); - //qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord, null, userAgent,userkey,token); + //qyWxOperationService.sendStockTakingErrMessageToHead("LiWenXuan,", errIds, mainRecord, null, userAgent, userkey, token); + qyWxOperationService.sendStockTakingErrMessageToHead(workwechat, errIds, mainRecord, null, userAgent,userkey,token); } }); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index abd3be29..316b50ed 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test + active: prod server: port: 11111 \ No newline at end of file diff --git a/src/main/resources/redisson-config.yml b/src/main/resources/redisson-config.yml index 7f324130..6f2a9976 100644 --- a/src/main/resources/redisson-config.yml +++ b/src/main/resources/redisson-config.yml @@ -1,8 +1,8 @@ #Redisson配置 singleServerConfig: - address: "redis://127.0.0.1:6379" #内网,本地 - #address: "redis://172.20.5.57:6379" #外网 - #password: "Redis+brngJ3U19@8_Z2^7a" #外网 + #address: "redis://127.0.0.1:6379" #内网,本地 + address: "redis://172.20.5.57:6379" #外网 + password: "Redis+brngJ3U19@8_Z2^7a" #外网 clientName: null database: 15 #选择使用哪个数据库0~15 idleConnectionTimeout: 10000 diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html index e7c36210..3289b0f8 100644 --- a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html +++ b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html @@ -59,7 +59,7 @@ layui.$(function () { //liwenxuan上线要改回来 开发环境扫码 - /*let wxScan = parent.parent.parent; + let wxScan = parent.parent.parent; if (wxScan.wx !== undefined) { wxScan = wxScan.wx; } else { @@ -84,12 +84,12 @@ } - });*/ + }); - var result = "1201020003";//当needResult为1时返回处理结果 1701795870830534656 + /*var result = "14030003";//当needResult为1时返回处理结果 1701795870830534656 14030003 var req = {}; req.qrCode = result; - outboundLogic(req); + outboundLogic(req);*/ }); @@ -280,7 +280,7 @@ }, function () { // 继续 layer.close(layer.index); // 关闭弹窗 //liwenxuan 上线要改回来,扫码直接赋值. - /*parent.parent.parent.wx.scanQRCode({ + parent.parent.parent.wx.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 @@ -291,12 +291,12 @@ req.qrCode = result; outboundLogic(req); } - })*/ + }) // 回调 - var result = '1648852836191346688';//1638091255811710976当needResult为1时返回处理结果1641262864907149312 + /*var result = '1686569952214294528';//1638091255811710976当needResult为1时返回处理结果1641262864907149312 var req = {}; req.qrCode = result; - outboundLogic(req); + outboundLogic(req);*/ }, function () { // 取消 // 关闭当前页