From d5222c7ae76d34cf8a7e32fee1ed15c988c3b330 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 14 三月 2025 20:30:42 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 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 5f3b6cd..fcfb2f9 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
@@ -15,7 +15,10 @@
 import com.smartor.domain.*;
 import com.smartor.mapper.ServiceSubtaskMapper;
 import com.smartor.mapper.ServiceTaskMapper;
-import com.smartor.service.*;
+import com.smartor.service.IBaseSmsaccountService;
+import com.smartor.service.IServiceOutPathService;
+import com.smartor.service.IServiceSubtaskRecordService;
+import com.smartor.service.ISvyTaskTemplateService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,9 +28,6 @@
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.stereotype.Component;
 
-import java.math.BigInteger;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -154,10 +154,11 @@
         log.error("杩涗换鍔′簡鍚楋紵{}", commonTaskcallMQ);
         //鍒ゆ柇涓�涓媍ommonTaskcallMQ涓殑stopstate鏄惁涓巌vr_task涓殑涓�鑷达紝涓嶄竴鑷达紝鍒欒鏄庢槸鏆傚仠浜�
         ServiceTask ivrTask1 = ivrTaskMapper.selectServiceTaskByTaskid(commonTaskcallMQ.getTaskid());
-        if (ivrTask1.getStopState() != commonTaskcallMQ.getStopState()) {
-            //灏嗘秷鎭粠闃熷垪涓墧闄�
-            return;
-        }
+
+//        if (ivrTask1.getStopState() != commonTaskcallMQ.getStopState()) {
+//            //灏嗘秷鎭粠闃熷垪涓墧闄�
+//            return;
+//        }
 
         if (StringUtils.isNotEmpty(commonTaskcallMQ.getPreachform())) {
             //濡備綍浠诲姟鍙戦�佹柟寮忎笉涓虹┖
@@ -183,6 +184,9 @@
                 ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid());
                 ivrTaskcall.setSendstate(1L);
                 List<ServiceSubtask> selectServiceSubtaskList = ivrTaskcallMapper.selectServiceSubtaskList(ivrTaskcall);
+                if (CollectionUtils.isEmpty(selectServiceSubtaskList)) {
+                    continue;
+                }
                 if (descByCode.equals("鐢佃瘽")) {
                     for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
                         //鍏堝垽鏂竴涓嬶紝subIds鏄惁涓虹┖锛屽鏋滀笉涓虹┖锛屽彧鎵цsubIds閲岀殑鎮ｈ��
@@ -211,7 +215,8 @@
                                     list.add(serviceSubtask2.getId().toString());
                                 }
                                 log.error("缂撳瓨涓璫ache-0鐨勫�间负锛歿}", list);
-                                redisCache.setCacheListLeft("cache-0", list);
+//                                redisCache.setCacheListLeft("cache-0", list);
+                                redisCache.setCacheListLeftAndDistinct("cache-0", list);
                             } else {
                                 //闈炵珛鍗冲彂閫�
                                 ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
@@ -221,7 +226,8 @@
                                 for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
                                     list.add(serviceSubtask2.getId().toString());
                                 }
-                                redisCache.setCacheListLeft(key, list);
+//                                redisCache.setCacheListLeft(key, list);
+                                redisCache.setCacheListLeftAndDistinct(key, list);
                             }
                         } catch (Exception exception) {
                             ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
@@ -288,6 +294,7 @@
 
                         try {
                             String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
+                            String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key);
                             SendMagParam sendMagParam = new SendMagParam();
                             sendMagParam.setType("4");
                             if (type == 1) {
@@ -295,6 +302,7 @@
                                 ServiceOutPath serviceOutPath = new ServiceOutPath();
                                 serviceOutPath.setParam1(taskId);
                                 serviceOutPath.setParam2(patid);
+                                serviceOutPath.setParam6(subId);
                                 serviceOutPath.setCreateTime(new Date());
                                 iServiceOutPathService.insertServiceOutPath(serviceOutPath);
 //                                sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "&param2=" + patid + "&param5=false");
@@ -311,6 +319,7 @@
                                 ServiceOutPath serviceOutPath = new ServiceOutPath();
                                 serviceOutPath.setParam1(taskId);
                                 serviceOutPath.setParam2(patid);
+                                serviceOutPath.setParam6(subId);
 //                                serviceOutPath.setParam3(URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()));
                                 serviceOutPath.setParam3(ivrTask1.getTaskName());
                                 serviceOutPath.setCreateTime(new Date());
@@ -328,6 +337,7 @@
                                 ServiceOutPath serviceOutPath = new ServiceOutPath();
                                 serviceOutPath.setParam1(taskId);
                                 serviceOutPath.setParam2(patid);
+                                serviceOutPath.setParam6(subId);
 //                                serviceOutPath.setParam3(URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()));
                                 serviceOutPath.setParam3(ivrTask1.getTaskName());
                                 serviceOutPath.setCreateTime(new Date());

--
Gitblit v1.9.3