From 76fb5d8b5249d74a77ca3e44ca9cf98b57b31ace Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期五, 30 五月 2025 14:00:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 10c7c9a..0f2bbf1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -275,13 +275,16 @@
subIds.clear();
subIds.addAll(lssubIds);
lssubIds.clear();
- } else if (descByCode.equals("澶氬獟浣�")) {
+ }
+ else if (descByCode.equals("澶氬獟浣�")) {
//澶氬獟浣�
continue;
- } else if (descByCode.equals("绾歌川")) {
+ }
+ else if (descByCode.equals("绾歌川")) {
//绾歌川
continue;
- } else if (descByCode.equals("鐭俊")) {
+ }
+ else if (descByCode.equals("鐭俊")) {
//鐭俊
//瀵箄rl涓袱涓弬鏁板姞瀵�
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
@@ -388,7 +391,7 @@
ss.setRemark("鐭俊鍙戦�佸け璐�,璇ユ満鏋勬病鏈夐厤缃煭淇″湴鍧�");
ss.setSendstate(5L);
ss.setId(serviceSubtask.getId());
- ss.setFinishtime(new Date());
+// ss.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(ss);
continue;
}
@@ -454,7 +457,8 @@
subIds.clear();
subIds.addAll(lssubIds);
lssubIds.clear();
- } else if (descByCode.equals("鍏紬鍙�")) {
+ }
+ else if (descByCode.equals("鍏紬鍙�")) {
//鍏紬鍙�
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
@@ -512,7 +516,7 @@
ss.setRemark("鍏紬鍙峰彂閫佸け璐�,his绯荤粺鐨勬偅鑰卛d涓虹┖");
ss.setSendstate(5L);
ss.setId(serviceSubtask.getId());
- ss.setFinishtime(new Date());
+// ss.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(ss);
continue;
}
@@ -526,7 +530,7 @@
ss.setRemark("璇ユ満鏋勭殑鍏紬鍙烽厤缃俊鎭笉鍏紝鏃犳硶閫氳繃鍏紬鍙峰彂閫�");
ss.setSendstate(5L);
ss.setId(serviceSubtask.getId());
- ss.setFinishtime(new Date());
+// ss.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(ss);
continue;
}
@@ -611,7 +615,7 @@
serviceSubtask.setRemark("鍙戦�佸け璐�");
serviceSubtask.setSendstate(5L);
serviceSubtask.setId(id);
- serviceSubtask.setFinishtime(new Date());
+// serviceSubtask.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
}
}
--
Gitblit v1.9.3