From 6c1919fff8379197c06c07ddb47939262a379286 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 10 May 2023 09:53:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E9=80=81=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=B6=88=E6=81=AF=E5=90=8E=E6=B7=BB=E5=8A=A0=E5=88=B0?= =?UTF-8?q?redis=E4=B8=AD=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DepositoryRecordServiceImpl.java | 42 +++++++++++++++---- .../depository_manage/OtherTest.java | 3 +- 2 files changed, 35 insertions(+), 10 deletions(-) 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 800565dc..9f087466 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 @@ -2075,6 +2075,12 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { } else { redisPool.getRedisTemplateByDb(15).opsForHash().put(key, "minRecord", minRecord); } + + + // 删除在redis中的key + String redisOutKey = "wms_notificationOut_" + id; + redisPool.getRedisTemplateByDb(14).delete(redisOutKey); + // 获取出库仓库信息 Depository depositoryRecordById = depositoryMapper.findDepositoryById(applicationOutMinById.getDepositoryId()); // 设置子订单新编码 @@ -2318,6 +2324,10 @@ 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); + redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey,stringObjectMap); + redisPool.getRedisTemplateByDb(14).expire(redisOutKey,72,TimeUnit.HOURS); }); } else { // 如果是通过仓库 @@ -2371,6 +2381,10 @@ 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); + redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey,stringObjectMap); + redisPool.getRedisTemplateByDb(14).expire(redisOutKey,72,TimeUnit.HOURS); }); } @@ -2929,8 +2943,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { s = "PangFuZhen,"; qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1, userKey, token); }); - } - else { + } else { String result = ""; // 开启线程更改其他用户卡片模板样式 String simpleTime = DateUtil.getSimpleTime(new Date()); @@ -3045,9 +3058,12 @@ 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); + redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey,stringObjectMap); + redisPool.getRedisTemplateByDb(14).expire(redisOutKey,72,TimeUnit.HOURS); }); - } - else { + } else { // 如果是通过仓库 @@ -3098,6 +3114,10 @@ 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); + redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey,stringObjectMap); + redisPool.getRedisTemplateByDb(14).expire(redisOutKey,72,TimeUnit.HOURS); }); } } @@ -3366,8 +3386,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("state", "部门负责人审核未通过"); } - } - else { + } else { // 如果是仓储中心负责人 // 获取点击的按钮类型 String clickKey = templateCard.getEventKey().split("_")[1]; @@ -3469,9 +3488,12 @@ 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); + redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey,stringObjectMap); + redisPool.getRedisTemplateByDb(14).expire(redisOutKey,72,TimeUnit.HOURS); }); - } - else { + } else { // 如果是通过仓库 @@ -3522,6 +3544,10 @@ 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); + redisPool.getRedisTemplateByDb(14).opsForHash().putAll(redisOutKey,stringObjectMap); + redisPool.getRedisTemplateByDb(14).expire(redisOutKey,72,TimeUnit.HOURS); }); } } diff --git a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java index 67bfade9..581478a4 100644 --- a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java @@ -99,8 +99,7 @@ public class OtherTest { @Test public void someTest(){ - Object usertoken = redisPool.getRedisTemplateByDb(5).opsForHash().get("HXGK_GO_ZhixingCollege:ScanCode:Authentication:LoginApi_dev_e3bfa398fe9d0e1ab78a00ff59eff788", "usertoken"); - System.out.println(usertoken); + } @Test