From 8d913e5594f45ca2a4ce656ea9feb99ffe715913 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 29 十一月 2024 18:44:58 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 178 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 90 insertions(+), 88 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 f5cbbb7..ddaa6f2 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
@@ -1,5 +1,6 @@
package com.ruoyi.web.component;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
@@ -204,6 +205,7 @@
String value = redisCache.getCacheObject("cache-0");
ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
serviceSubtask1.setTaskid(commonTaskcallMQ.getTaskid());
+ log.error("缂撳瓨涓璼erviceSubtask1鐨勫�间负锛歿}", serviceSubtask1);
List<ServiceSubtask> selectServiceSubtaskList1 = ivrTaskcallMapper.selectServiceSubtaskList(serviceSubtask1);
for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
if (StringUtils.isEmpty(value)) {
@@ -213,6 +215,7 @@
value = value + "," + serviceSubtask2.getId().toString() + ",";
}
}
+ log.error("缂撳瓨涓璫ache-0鐨勫�间负锛歿}", value);
redisCache.setCacheObject("cache-0", value);
} else {
//闈炵珛鍗冲彂閫�
@@ -238,8 +241,8 @@
serviceSubtaskRecord.setPreachform("3");
serviceSubtaskRecord.setResult("fail");
serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setRemark("鐢佃瘽鍙戦�佸け璐�");
- log.error("鐢佃瘽鍙戦�佸け璐ワ細{}", exception.getMessage());
+ serviceSubtaskRecord.setRemark("闃熷垪浠诲姟鐢佃瘽鍙戦�佸け璐�");
+ log.error("闃熷垪浠诲姟鐢佃瘽鍙戦�佸け璐ワ細{}", exception.getMessage());
lssubIds.add(serviceSubtask.getId());
serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
continue;
@@ -247,9 +250,9 @@
//鍦ㄥ瓙浠诲姟琛ㄩ噷璁板綍涓�涓�
String uuid = UUID.randomUUID().toString();
serviceSubtask.setResult("success");
- serviceSubtask.setRemark("鐢佃瘽鍙戦�佹垚鍔�");
+ serviceSubtask.setRemark("闃熷垪浠诲姟鐢佃瘽鍙戦�佹垚鍔�");
serviceSubtask.setGuid(uuid);
- serviceSubtask.setSendstate(6L);
+ serviceSubtask.setSendstate(3L);
serviceSubtask.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
@@ -261,7 +264,7 @@
serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
serviceSubtaskRecord.setPreachform("3");
serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setRemark("鐢佃瘽鍙戦�佹垚鍔�");
+ serviceSubtaskRecord.setRemark("闃熷垪浠诲姟鐢佃瘽鍙戦�佹垚鍔�");
serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
}
if (CollectionUtils.isEmpty(lssubIds)) {
@@ -360,7 +363,7 @@
serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
serviceSubtaskRecord.setPreachform("4");
serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setRemark("鐭俊鍙戦�佸け璐�");
+ serviceSubtaskRecord.setRemark("鐭俊鍙戦�佹垚鍔�");
lssubIds.add(serviceSubtask.getId());
serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
continue;
@@ -401,7 +404,6 @@
serviceSubtaskRecord.setResult("success");
serviceSubtaskRecord.setRemark("鐭俊鍙戦�佹垚鍔�");
serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
-
}
if (CollectionUtils.isEmpty(lssubIds)) {
//濡傛灉鈥滀复鏃跺瓙浠诲姟鈥濅负绌猴紝璇存槑鍏ㄥ彂閫佸畬浜�
@@ -417,90 +419,90 @@
String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
-
-// SendMagParam sendMagParam = new SendMagParam();
-// sendMagParam.setType("5");
-// sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + ivrTask1.getTaskName() + "¶m5=false");
-// log.info("閾炬帴瀹屾暣璺緞锛歿}", ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + ivrTask1.getTaskName() + "¶m5=false");
-// //杩欎釜妯℃澘ID鍏堝啓姝伙紝鍚庨潰鍋氭垚鍙��
-// sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4");
-// Map map = new HashMap();
-// map.put("first", ivrTask1.getTaskName());
-// sendMagParam.setContent(JSON.toJSONString(map));
-// sendMagParam.setOpenid(serviceSubtask.getOpenid());
-// Boolean aBoolean = sendService.sendMsg(sendMagParam);
- String url = null;
try {
-// if (type == 1) {
-// url = ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
-// } else if (type == 2) {
-// url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
-// } else if (type == 3) {
-// url = ip + ":" + req_path + "/outsideChainxj?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
-// }
- if (type == 1) {
- //闅忚
- ServiceOutPath serviceOutPath = new ServiceOutPath();
- serviceOutPath.setParam1(taskId);
- serviceOutPath.setParam2(patid);
- serviceOutPath.setCreateTime(new Date());
- iServiceOutPathService.insertServiceOutPath(serviceOutPath);
- String format = String.format("%03X", serviceOutPath.getId());
- serviceOutPath.setRadix(format);
- serviceOutPath.setUpdateTime(new Date());
- iServiceOutPathService.updateServiceOutPath(serviceOutPath);
-// sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "¶m2=" + patid + "¶m5=false");
- url = ip + ":" + req_path + "/sf?p=" + format;
- } else if (type == 2) {
- //闂埜
- ServiceOutPath serviceOutPath = new ServiceOutPath();
- serviceOutPath.setParam1(taskId);
- serviceOutPath.setParam2(patid);
-// serviceOutPath.setParam3(URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()));
- serviceOutPath.setParam3(ivrTask1.getTaskName());
- serviceOutPath.setCreateTime(new Date());
- iServiceOutPathService.insertServiceOutPath(serviceOutPath);
- String format = String.format("%03X", serviceOutPath.getId());
- serviceOutPath.setRadix(format);
- serviceOutPath.setUpdateTime(new Date());
- iServiceOutPathService.updateServiceOutPath(serviceOutPath);
-// sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false");
- url = ip + ":" + req_path + "/wt?p=" + format;
- } else if (type == 3) {
- //瀹ｆ暀
- ServiceOutPath serviceOutPath = new ServiceOutPath();
- serviceOutPath.setParam1(taskId);
- serviceOutPath.setParam2(patid);
-// serviceOutPath.setParam3(URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()));
- serviceOutPath.setParam3(ivrTask1.getTaskName());
- serviceOutPath.setCreateTime(new Date());
- iServiceOutPathService.insertServiceOutPath(serviceOutPath);
- String format = String.format("%03X", serviceOutPath.getId());
- serviceOutPath.setRadix(format);
- serviceOutPath.setUpdateTime(new Date());
- iServiceOutPathService.updateServiceOutPath(serviceOutPath);
- url = ip + ":" + req_path + "/xj?p=" + format;
- }
+ SendMagParam sendMagParam = new SendMagParam();
+ sendMagParam.setType("5");
+ sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + ivrTask1.getTaskName() + "¶m5=false");
+ log.info("閾炬帴瀹屾暣璺緞锛歿}", ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + ivrTask1.getTaskName() + "¶m5=false");
+ //杩欎釜妯℃澘ID鍏堝啓姝伙紝鍚庨潰鍋氭垚鍙��
+ sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4");
+ Map map = new HashMap();
+ map.put("first", ivrTask1.getTaskName());
+ sendMagParam.setContent(JSON.toJSONString(map));
+ sendMagParam.setOpenid(serviceSubtask.getOpenid());
+ Boolean aBoolean = sendService.sendMsg(sendMagParam);
+ String url = null;
- String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), "鏃�");
- Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
- if (!map.isEmpty()) {
- serviceSubtask.setResult("success");
- serviceSubtask.setSendstate(3L);
- if ((Boolean) map.get("succ") == false) {
- ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
- serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
- serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
- serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
- serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
- serviceSubtaskRecord.setPreachform("5");
- serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setRemark(map.get("msg").toString());
- lssubIds.add(serviceSubtask.getId());
- serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- continue;
- }
+//// if (type == 1) {
+//// url = ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
+//// } else if (type == 2) {
+//// url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
+//// } else if (type == 3) {
+//// url = ip + ":" + req_path + "/outsideChainxj?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
+//// }
+// if (type == 1) {
+// //闅忚
+// ServiceOutPath serviceOutPath = new ServiceOutPath();
+// serviceOutPath.setParam1(taskId);
+// serviceOutPath.setParam2(patid);
+// serviceOutPath.setCreateTime(new Date());
+// iServiceOutPathService.insertServiceOutPath(serviceOutPath);
+// String format = String.format("%03X", serviceOutPath.getId());
+// serviceOutPath.setRadix(format);
+// serviceOutPath.setUpdateTime(new Date());
+// iServiceOutPathService.updateServiceOutPath(serviceOutPath);
+//// sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "¶m2=" + patid + "¶m5=false");
+// url = ip + ":" + req_path + "/sf?p=" + format;
+// } else if (type == 2) {
+// //闂埜
+// ServiceOutPath serviceOutPath = new ServiceOutPath();
+// serviceOutPath.setParam1(taskId);
+// serviceOutPath.setParam2(patid);
+//// serviceOutPath.setParam3(URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()));
+// serviceOutPath.setParam3(ivrTask1.getTaskName());
+// serviceOutPath.setCreateTime(new Date());
+// iServiceOutPathService.insertServiceOutPath(serviceOutPath);
+// String format = String.format("%03X", serviceOutPath.getId());
+// serviceOutPath.setRadix(format);
+// serviceOutPath.setUpdateTime(new Date());
+// iServiceOutPathService.updateServiceOutPath(serviceOutPath);
+//// sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false");
+// url = ip + ":" + req_path + "/wt?p=" + format;
+// } else if (type == 3) {
+// //瀹ｆ暀
+// ServiceOutPath serviceOutPath = new ServiceOutPath();
+// serviceOutPath.setParam1(taskId);
+// serviceOutPath.setParam2(patid);
+//// serviceOutPath.setParam3(URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()));
+// serviceOutPath.setParam3(ivrTask1.getTaskName());
+// serviceOutPath.setCreateTime(new Date());
+// iServiceOutPathService.insertServiceOutPath(serviceOutPath);
+// String format = String.format("%03X", serviceOutPath.getId());
+// serviceOutPath.setRadix(format);
+// serviceOutPath.setUpdateTime(new Date());
+// iServiceOutPathService.updateServiceOutPath(serviceOutPath);
+// url = ip + ":" + req_path + "/xj?p=" + format;
+// }
+//
+// String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), "鏃�");
+// Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
+// if (!map.isEmpty()) {
+ serviceSubtask.setResult("success");
+ serviceSubtask.setSendstate(3L);
+ if (aBoolean == false) {
+ ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
+ serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
+ serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
+ serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
+ serviceSubtaskRecord.setPreachform("5");
+ serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
+ serviceSubtaskRecord.setRemark(map.get("msg").toString());
+ lssubIds.add(serviceSubtask.getId());
+ serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
+ continue;
}
+// }
} catch (Exception e) {
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
--
Gitblit v1.9.3