From a24d7c5345cddb9454c351aae0637ed90333a934 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 16 七月 2024 17:57:07 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java |  102 +++++++++++++++++++++++---------------------------
 1 files changed, 47 insertions(+), 55 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 4f60fee..1d80368 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
@@ -95,56 +95,48 @@
     @Override
     public void onMessage(Message message, byte[] pattern) {
         log.info("鐩戝惉Redis key杩囨湡锛宬ey锛歿}锛宑hannel锛歿}", message.toString(), new String(pattern));
-        synchronized (RedisMqReceiver.class) {
-            String ip = localIP;
-            log.error("鏈満鐨勭綉缁淚P涓�:{}", ip);
-            String content = message.toString();
-            //鍒ゆ柇鏄笉鏄换鍔′俊鎭紝濡傛灉涓嶆槸锛岀洿鎺ヨ繑鍥烇紝涓嶉渶瑕佹墽琛�
-            if (!content.contains("taskid")) {
-                log.info("涓嶆槸浠诲姟淇℃伅");
-                return;
+        String ip = localIP;
+        log.error("鏈満鐨勭綉缁淚P涓�:{}", ip);
+        String content = message.toString();
+        //鍒ゆ柇鏄笉鏄换鍔′俊鎭紝濡傛灉涓嶆槸锛岀洿鎺ヨ繑鍥烇紝涓嶉渶瑕佹墽琛�
+        if (!content.contains("taskid")) {
+            log.info("涓嶆槸浠诲姟淇℃伅");
+            return;
+        }
+        CommonTaskcallMQ commonTaskcallMQ = null;
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            if (!content.startsWith("{")) {
+                commonTaskcallMQ = mapper.readValue("{" + content + "}", CommonTaskcallMQ.class);
+            } else {
+                commonTaskcallMQ = mapper.readValue(content, CommonTaskcallMQ.class);
             }
-            CommonTaskcallMQ commonTaskcallMQ = null;
-            try {
-                ObjectMapper mapper = new ObjectMapper();
-                if (!content.startsWith("{")) {
-                    commonTaskcallMQ = mapper.readValue("{" + content + "}", CommonTaskcallMQ.class);
-                } else {
-                    commonTaskcallMQ = mapper.readValue(content, CommonTaskcallMQ.class);
-                }
-                //杩欓噷涔嬫墍浠ヨ繖鏍峰仛涓�涓嬶紝鏄悶涓嶆噦锛屼负鍟ヤ細杩涙潵涓ら亶
-                Boolean aBoolean = redisCache.hasKey(commonTaskcallMQ.getTaskid().toString());
-                if (aBoolean) {
-                    return;
-                } else {
-                    redisCache.setCacheObject(commonTaskcallMQ.getTaskid().toString(), commonTaskcallMQ.getTaskid().toString(), 60, TimeUnit.SECONDS);
-                }
-                if (commonTaskcallMQ.getTaskType() == 1) {
-                    //闅忚
-                    sfHandle(commonTaskcallMQ, ip);
-                } else if (commonTaskcallMQ.getTaskType() == 2) {
-                    //闂嵎
-                    wjHandle(commonTaskcallMQ, ip);
-                } else if (commonTaskcallMQ.getTaskType() == 3) {
-                    //瀹ｆ暀
-                    xjHandle(commonTaskcallMQ, ip);
-                }
-                //澶勭悊瀹屾垚锛岀Щ闄edis
-                redisCache.deleteObject(message.toString());
 
-            } catch (Exception e) {
-                Integer integer = redisCache.getCacheObject(commonTaskcallMQ.getTaskid().toString());
-                if (integer != null && integer == 2) {
-                    //灏嗘秷鎭粠闃熷垪涓垹闄�
-                } else if (integer == null) {
-                    redisCache.setCacheObject(commonTaskcallMQ.getTaskid().toString(), 1, 120, TimeUnit.MINUTES);
-                } else {
-                    redisCache.setCacheObject(commonTaskcallMQ.getTaskid().toString(), integer + 1, 120, TimeUnit.MINUTES);
-                }
-
-                log.error("============娑堣垂澶辫触,灏濊瘯娑堟伅琛ュ彂鍐嶆娑堣垂!==============  {}", e.getMessage());
-                redisCache.setCacheObject(message.toString(), message.toString(), 60, TimeUnit.SECONDS);
+            if (commonTaskcallMQ.getTaskType() == 1) {
+                //闅忚
+                sfHandle(commonTaskcallMQ, ip);
+            } else if (commonTaskcallMQ.getTaskType() == 2) {
+                //闂嵎
+                wjHandle(commonTaskcallMQ, ip);
+            } else if (commonTaskcallMQ.getTaskType() == 3) {
+                //瀹ｆ暀
+                xjHandle(commonTaskcallMQ, ip);
             }
+            //澶勭悊瀹屾垚锛岀Щ闄edis
+            redisCache.deleteObject(message.toString());
+
+        } catch (Exception e) {
+            Integer integer = redisCache.getCacheObject(commonTaskcallMQ.getTaskid().toString());
+            if (integer != null && integer == 2) {
+                //灏嗘秷鎭粠闃熷垪涓垹闄�
+            } else if (integer == null) {
+                redisCache.setCacheObject(commonTaskcallMQ.getTaskid().toString(), 1, 120, TimeUnit.MINUTES);
+            } else {
+                redisCache.setCacheObject(commonTaskcallMQ.getTaskid().toString(), integer + 1, 120, TimeUnit.MINUTES);
+            }
+
+            log.error("============娑堣垂澶辫触,灏濊瘯娑堟伅琛ュ彂鍐嶆娑堣垂!==============  {}", e.getMessage());
+            redisCache.setCacheObject(message.toString(), message.toString(), 60, TimeUnit.SECONDS);
         }
     }
 
@@ -215,7 +207,7 @@
                         String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
                         SendMagParam sendMagParam = new SendMagParam();
                         sendMagParam.setType("4");
-                        sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "&param2=" + patid);
+                        sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "&param2=" + patid + "&param5=false");
                         Boolean aBoolean = sendService.sendMsg(sendMagParam);
 
 
@@ -238,8 +230,8 @@
                         String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
                         SendMagParam sendMagParam = new SendMagParam();
                         sendMagParam.setType("5");
-                        sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + ivrTask1.getTaskid().toString() + "&param2=" + serviceSubtask.getPatid().toString() + "&param3=" + ivrTask1.getTaskName());
-                        log.info("閾炬帴瀹屾暣璺緞锛歿}", req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + ivrTask1.getTaskName());
+                        sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + ivrTask1.getTaskid().toString() + "&param2=" + serviceSubtask.getPatid().toString() + "&param3=" + ivrTask1.getTaskName() + "&param5=false");
+                        log.info("閾炬帴瀹屾暣璺緞锛歿}", ip + ":" + req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + ivrTask1.getTaskName() + "&param5=false");
                         //杩欎釜妯℃澘ID鍏堝啓姝伙紝鍚庨潰鍋氭垚鍙��
                         sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4");
                         Map map = new HashMap();
@@ -331,7 +323,7 @@
                         String patid = rsaPublicKeyExample.encryptedData(ivrTaskSingle.getPatid().toString(), pub_key);
                         SendMagParam sendMagParam = new SendMagParam();
                         sendMagParam.setType("4");
-                        sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "&param2=" + patid);
+                        sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "&param2=" + patid + "&param5=false");
                         Boolean aBoolean = sendService.sendMsg(sendMagParam);
 
                         //浠诲姟鍙戦�佽褰�
@@ -352,8 +344,8 @@
                         String patid = rsaPublicKeyExample.encryptedData(ivrTaskSingle.getPatid().toString(), pub_key);
                         SendMagParam sendMagParam = new SendMagParam();
                         sendMagParam.setType("5");
-                        sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + ivrTask1.getTaskName());
-                        log.info("閾炬帴瀹屾暣璺緞锛歿}", req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + ivrTask1.getTaskName());
+                        sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + ivrTask1.getTaskName() + "&param5=false");
+                        log.info("閾炬帴瀹屾暣璺緞锛歿}", req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + ivrTask1.getTaskName() + "&param5=false");
                         //杩欎釜妯℃澘ID鍏堝啓姝伙紝鍚庨潰鍋氭垚鍙��
                         sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4");
                         Map map = new HashMap();
@@ -440,8 +432,8 @@
                         String patid = rsaPublicKeyExample.encryptedData(svyTaskSingle1.getPatid().toString(), pub_key);
                         SendMagParam sendMagParam = new SendMagParam();
                         sendMagParam.setType("5");
-                        sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + svyTask.getTaskName());
-                        log.info("閾炬帴瀹屾暣璺緞锛歿}", req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + svyTask.getTaskName());
+                        sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + svyTask.getTaskName() + "&param5=false");
+                        log.info("閾炬帴瀹屾暣璺緞锛歿}", req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + svyTask.getTaskName() + "&param5=false");
                         //杩欎釜妯℃澘ID鍏堝啓姝伙紝鍚庨潰鍋氭垚鍙��
                         sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4");
                         Map map = new HashMap();

--
Gitblit v1.9.3