From 37b79cfd8e5ecdc6f9f09750583f998183c338fb Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 07 十一月 2024 10:55:27 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 409 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 314 insertions(+), 95 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 2c95a25..f5cbbb7 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,24 +1,22 @@
package com.ruoyi.web.component;
-import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.ServiceFromEnum;
+import com.ruoyi.common.utils.HttpUtil;
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.web.task.PhoneTask;
import com.smartor.common.SendService;
import com.smartor.config.RobotPhoneUtils;
import com.smartor.domain.*;
import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.mapper.ServiceTaskMapper;
-import com.smartor.mapper.SvyTaskMapper;
-import com.smartor.mapper.SvyTaskSingleMapper;
import com.smartor.service.*;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.connection.Message;
@@ -26,7 +24,7 @@
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
import org.springframework.stereotype.Component;
-import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
@@ -56,9 +54,7 @@
private String thirdWXUrl;
@Autowired
- private IIvrTaskTemplateService ivrTaskTemplateService;
- @Autowired
- private ISvyTaskTemplateService svyTaskTemplateService;
+ private IServiceOutPathService iServiceOutPathService;
@Autowired
private ServiceSubtaskMapper ivrTaskcallMapper;
@@ -89,6 +85,9 @@
@Autowired
IBaseSmsaccountService baseSmsaccountService;
+
+ @Value("${xhsmsPath}")
+ private String xhsmsPath;
// 鍒涘缓鍥哄畾澶у皬鐨勭嚎绋嬫睜
private static final ExecutorService executorService = Executors.newFixedThreadPool(10);
@@ -162,71 +161,117 @@
if (StringUtils.isNotEmpty(commonTaskcallMQ.getPreachform())) {
//濡備綍浠诲姟鍙戦�佹柟寮忎笉涓虹┖
String[] split = commonTaskcallMQ.getPreachform().split(",");
- System.out.println("split鐨勫�间负锛�" + split);
+ log.error("split鐨勫�间负锛歿}", split);
+
+ //瀹氫箟涓�涓泦鍚堬紝鐢ㄤ笌瀛樻病鏈夋墽琛岀殑瀛愪换鍔D
+ List<Long> subIds = new ArrayList<>();
+ //涓存椂瀛樻病鏈夋墽琛岀殑瀛愪换鍔D
+ List<Long> lssubIds = new ArrayList<>();
+ //鏄惁灏嗗叏閮ㄦ偅鑰呰�呭彂閫佸畬
+ Boolean isSend = false;
+
+ aa:
for (String serviceFrom : split) {
String descByCode = ServiceFromEnum.getDescByCode(Integer.valueOf(serviceFrom));
- //杩欓噷鍙互鑰冭檻鐢ㄧ瓥鐣ユā寮忎紭鍖栦竴涓嬶紝涓嶇劧澶毦鐪嬩簡
-
-// //閫氳繃妯℃澘ID鑾峰彇妯℃澘闂
-// IvrTaskTemplateVO ivrTaskTemplateVO = new IvrTaskTemplateVO();
-// ivrTaskTemplateVO.setId(Long.valueOf(commonTaskcallMQ.getTemplateid()));
-// IvrTaskTemplateVO ivrTaskTemplateVO1 = ivrTaskTemplateService.selectInfoByCondition(ivrTaskTemplateVO);
+ if (isSend == true) {
+ break aa;
+ }
//閫氳繃浠诲姟ID鎷垮埌鎮ｈ�呬俊鎭�
ServiceSubtaskVO ivrTaskcall = new ServiceSubtaskVO();
ivrTaskcall.setTaskid(commonTaskcallMQ.getTaskid());
+ ivrTaskcall.setSendstate(1L);
List<ServiceSubtask> selectServiceSubtaskList = ivrTaskcallMapper.selectServiceSubtaskList(ivrTaskcall);
if (descByCode.equals("鐢佃瘽")) {
for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
- ServiceTask ivrTask = ivrTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
- if (ivrTask.getSendState() != null && ivrTask.getSendState() == 3 || ivrTask.getSendState() != null && ivrTask.getSendState() == 4) {
- //濡備綍浠诲姟琚�滄殏鍋溾�濇垨鈥滅粓姝⑩��
- break;
- }
- //鑾峰彇鍒皏alue鍊兼渶灏戠殑key
- String key = getKey();
- if (commonTaskcallMQ.getSendType().equals("2")) {
- //璇存槑鏄珛鍗冲彂閫�
- String value = redisCache.getCacheObject("cache-0");
- ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
- serviceSubtask1.setTaskid(commonTaskcallMQ.getTaskid());
- List<ServiceSubtask> selectServiceSubtaskList1 = ivrTaskcallMapper.selectServiceSubtaskList(serviceSubtask1);
- for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
- if (StringUtils.isEmpty(value)) {
- value = "," + serviceSubtask2.getId().toString() + ",";
- } else {
- value = value + "," + serviceSubtask2.getId().toString() + ",";
- }
- }
- redisCache.setCacheObject("cache-0", value);
- } else {
- //闈炵珛鍗冲彂閫�
- String value = redisCache.getCacheObject(key);
- ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
- serviceSubtask1.setTaskid(commonTaskcallMQ.getTaskid());
- List<ServiceSubtask> selectServiceSubtaskList1 = ivrTaskcallMapper.selectServiceSubtaskList(serviceSubtask1);
- for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
- if (StringUtils.isEmpty(value)) {
- value = "," + serviceSubtask2.getId().toString() + ",";
- } else {
- value = value + "," + serviceSubtask2.getId().toString() + ",";
- }
- }
- redisCache.setCacheObject(key, value);
+ //鍏堝垽鏂竴涓嬶紝subIds鏄惁涓虹┖锛屽鏋滀笉涓虹┖锛屽彧鎵цsubIds閲岀殑鎮ｈ��
+ if (CollectionUtils.isNotEmpty(subIds)) {
+ boolean contains = subIds.contains(serviceSubtask.getId());
+ //濡傛灉contains涓嶄负true,璇存槑褰撳墠鐨勬偅鑰呭凡缁忓彂閫佹垚鍔燂紝鐩存帴寰幆涓嬩竴涓汉灏辫
+ if (!contains) continue;
}
- //浠诲姟鍙戦�佽褰曪紙杩欎釜浠ｇ爜搴旇鍐欏湪phoneTask涓紝鍏堝啓鍦ㄨ繖锛屽悗闈㈠啀鏀癸級
+ try {
+ ServiceTask ivrTask = ivrTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+ if (ivrTask.getSendState() != null && ivrTask.getSendState() == 3 || ivrTask.getSendState() != null && ivrTask.getSendState() == 4) {
+ //濡備綍浠诲姟琚�滄殏鍋溾�濇垨鈥滅粓姝⑩��
+ break;
+ }
+ //鑾峰彇鍒皏alue鍊兼渶灏戠殑key
+ String key = getKey();
+ if (commonTaskcallMQ.getSendType().equals("2")) {
+ //璇存槑鏄珛鍗冲彂閫�
+ String value = redisCache.getCacheObject("cache-0");
+ ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
+ serviceSubtask1.setTaskid(commonTaskcallMQ.getTaskid());
+ List<ServiceSubtask> selectServiceSubtaskList1 = ivrTaskcallMapper.selectServiceSubtaskList(serviceSubtask1);
+ for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
+ if (StringUtils.isEmpty(value)) {
+ value = "," + serviceSubtask2.getId().toString() + ",";
+ } else {
+ if (!value.contains("," + serviceSubtask2.getId().toString()))
+ value = value + "," + serviceSubtask2.getId().toString() + ",";
+ }
+ }
+ redisCache.setCacheObject("cache-0", value);
+ } else {
+ //闈炵珛鍗冲彂閫�
+ String value = redisCache.getCacheObject(key);
+ ServiceSubtaskVO serviceSubtask1 = new ServiceSubtaskVO();
+ serviceSubtask1.setTaskid(commonTaskcallMQ.getTaskid());
+ List<ServiceSubtask> selectServiceSubtaskList1 = ivrTaskcallMapper.selectServiceSubtaskList(serviceSubtask1);
+ for (ServiceSubtask serviceSubtask2 : selectServiceSubtaskList1) {
+ if (StringUtils.isEmpty(value)) {
+ value = "," + serviceSubtask2.getId().toString() + ",";
+ } else {
+ value = value + "," + serviceSubtask2.getId().toString() + ",";
+ }
+ }
+ redisCache.setCacheObject(key, value);
+ }
+ } catch (Exception exception) {
+ ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
+ serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
+ serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
+ serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
+ serviceSubtaskRecord.setPreachform("3");
+ serviceSubtaskRecord.setResult("fail");
+ serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
+ serviceSubtaskRecord.setRemark("鐢佃瘽鍙戦�佸け璐�");
+ log.error("鐢佃瘽鍙戦�佸け璐ワ細{}", exception.getMessage());
+ lssubIds.add(serviceSubtask.getId());
+ serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
+ continue;
+ }
+ //鍦ㄥ瓙浠诲姟琛ㄩ噷璁板綍涓�涓�
+ String uuid = UUID.randomUUID().toString();
+ serviceSubtask.setResult("success");
+ serviceSubtask.setRemark("鐢佃瘽鍙戦�佹垚鍔�");
+ serviceSubtask.setGuid(uuid);
+ serviceSubtask.setSendstate(6L);
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+
+ //浠诲姟鍙戦�佽褰�
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
- serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
+ serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
+ serviceSubtaskRecord.setUuid(uuid);
serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
serviceSubtaskRecord.setPreachform("3");
serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
+ serviceSubtaskRecord.setRemark("鐢佃瘽鍙戦�佹垚鍔�");
serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
-
-// //閫氳繃澶氱嚎绋嬬殑鏂瑰紡鍘绘墦鐢佃瘽
-// executorService.submit(new PhoneTask(serviceSubtask, ivrTaskTemplateVO1, redisCache, sendService, phonePath, robotPhoneUtils));
}
+ if (CollectionUtils.isEmpty(lssubIds)) {
+ //濡傛灉鈥滀复鏃跺瓙浠诲姟鈥濅负绌猴紝璇存槑鍏ㄥ彂閫佸畬浜�
+ isSend = true;
+ }
+ //灏嗗瓙浠诲姟ID娓呯┖锛屽皢鈥滀复鏃跺瓙浠诲姟鈥濇暟鎹� 鏀惧埌 鈥滃瓙浠诲姟鈥� 涓�
+ subIds.clear();
+ subIds.addAll(lssubIds);
+ lssubIds.clear();
} else if (descByCode.equals("澶氬獟浣�")) {
//澶氬獟浣�
continue;
@@ -235,46 +280,137 @@
continue;
} else if (descByCode.equals("鐭俊")) {
//鐭俊
-// http://localhost:8099/followvisit/particty?param1=3¶m2=348
//瀵箄rl涓袱涓弬鏁板姞瀵�
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);
for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
+ //鍏堝垽鏂竴涓嬶紝subIds鏄惁涓虹┖锛屽鏋滀笉涓虹┖锛屽彧鎵цsubIds閲岀殑鎮ｈ��
+ if (CollectionUtils.isNotEmpty(subIds)) {
+ boolean contains = subIds.contains(serviceSubtask.getId());
+ //濡傛灉contains涓嶄负true,璇存槑褰撳墠鐨勬偅鑰呭凡缁忓彂閫佹垚鍔燂紝鐩存帴寰幆涓嬩竴涓汉灏辫
+ if (!contains) continue;
+ }
+
try {
String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
SendMagParam sendMagParam = new SendMagParam();
sendMagParam.setType("4");
if (type == 1) {
- sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "¶m2=" + patid + "¶m5=false");
- } else if (type == 1) {
- sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false");
+ //闅忚
+ ServiceOutPath serviceOutPath = new ServiceOutPath();
+ serviceOutPath.setParam1(taskId);
+ serviceOutPath.setParam2(patid);
+ serviceOutPath.setCreateTime(new Date());
+ iServiceOutPathService.insertServiceOutPath(serviceOutPath);
+// sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "¶m2=" + patid + "¶m5=false");
+ //杞垚16杩涘埗
+ String format = String.format("%03X", serviceOutPath.getId());
+ serviceOutPath.setRadix(format);
+ serviceOutPath.setUpdateTime(new Date());
+ iServiceOutPathService.updateServiceOutPath(serviceOutPath);
+ sendMagParam.setPhone(serviceSubtask.getPhone());
+ sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format);
+ sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌闅忚璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
+ } 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");
+ sendMagParam.setPhone(serviceSubtask.getPhone());
+ sendMagParam.setUrl(ip + ":" + req_path + "/wt?p=" + format);
+ sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
} else if (type == 3) {
- sendMagParam.setUrl(ip + ":" + req_path + "/outsideChainxj?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false");
+ //瀹ｆ暀
+ 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 + "/outsideChainxj?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false");
+ sendMagParam.setPhone(serviceSubtask.getPhone());
+ sendMagParam.setUrl(ip + ":" + req_path + "/xj?p=" + format);
+ sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌瀹ｆ暀璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
}
- Boolean aBoolean = sendService.sendMsg(sendMagParam);
-
- //浠诲姟鍙戦�佽褰�
+ //鐭俊杩橀渶瑕佹ā鏉�
+ Map<String, String> req = new HashMap<>();
+ req.put("phone", sendMagParam.getPhone());
+ req.put("content", sendMagParam.getContent());
+ String s = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
+ if (s.equals("true")) {
+ ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
+ serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
+ serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
+ serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
+ serviceSubtaskRecord.setPreachform("4");
+ serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
+ serviceSubtaskRecord.setRemark("鐭俊鍙戦�佸け璐�");
+ lssubIds.add(serviceSubtask.getId());
+ serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
+ continue;
+ }
+ } catch (Exception e) {
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
serviceSubtaskRecord.setPreachform("4");
+ serviceSubtaskRecord.setResult("fail");
serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setResult(aBoolean == true ? "success" : "error");
- serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+ serviceSubtaskRecord.setRemark("鐭俊鍙戦�佸け璐�");
+ log.error("鐭俊鍙戦�佸け璐ワ細{}", e.getMessage());
+ lssubIds.add(serviceSubtask.getId());
serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- } catch (UnsupportedEncodingException e) {
- String guid = UUID.randomUUID().toString();
- log.error("鐭俊浠诲姟锛屽彂閫佸け璐ュ師鍥狅細{},{}", e.getMessage(), guid);
- serviceSubtask.setResult("error");
- serviceSubtask.setRemark("绯荤粺閿欒锛堜换鍔★級");
- serviceSubtask.setGuid(guid);
- serviceSubtask.setSendstate(4L);
- serviceSubtask.setFinishtime(new Date());
- serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
+ continue;
}
+
+ //鍦ㄥ瓙浠诲姟琛ㄩ噷璁板綍涓�涓�
+ String uuid = UUID.randomUUID().toString();
+ serviceSubtask.setResult("success");
+ serviceSubtask.setRemark("鐭俊鍙戦�佹垚鍔�");
+ serviceSubtask.setGuid(uuid);
+ serviceSubtask.setSendstate(3L);
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+
+ //浠诲姟鍙戦�佽褰�
+ ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
+ serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
+ serviceSubtaskRecord.setUuid(uuid);
+ serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
+ serviceSubtaskRecord.setPreachform("5");
+ serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
+ serviceSubtaskRecord.setResult("success");
+ serviceSubtaskRecord.setRemark("鐭俊鍙戦�佹垚鍔�");
+ serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
+
}
+ if (CollectionUtils.isEmpty(lssubIds)) {
+ //濡傛灉鈥滀复鏃跺瓙浠诲姟鈥濅负绌猴紝璇存槑鍏ㄥ彂閫佸畬浜�
+ isSend = true;
+ }
+ //灏嗗瓙浠诲姟ID娓呯┖锛屽皢鈥滀复鏃跺瓙浠诲姟鈥濇暟鎹� 鏀惧埌 鈥滃瓙浠诲姟鈥� 涓�
+ subIds.clear();
+ subIds.addAll(lssubIds);
+ lssubIds.clear();
} else if (descByCode.equals("鍏紬鍙�")) {
//鍏紬鍙�
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
@@ -295,12 +431,55 @@
// 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) {
- url = ip + ":" + req_path + "/outsideChain?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
+ //闅忚
+ 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) {
- url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
+ //闂埜
+ 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) {
- url = ip + ":" + req_path + "/outsideChainxj?param1=" + taskId + "¶m2=" + patid + "¶m3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
+ //瀹ｆ暀
+ 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(), "鏃�");
@@ -309,39 +488,79 @@
serviceSubtask.setResult("success");
serviceSubtask.setSendstate(3L);
if ((Boolean) map.get("succ") == false) {
- serviceSubtask.setResult("error");
- serviceSubtask.setRemark(map.get("msg").toString());
- serviceSubtask.setSendstate(5L);
+ 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());
+ serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
serviceSubtaskRecord.setPreachform("5");
+ serviceSubtaskRecord.setResult("fail");
serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
- serviceSubtaskRecord.setResult("success");
- if ((Boolean) map.get("succ") == false) {
- serviceSubtaskRecord.setResult("error");
- }
- serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+ serviceSubtaskRecord.setRemark("鍏紬鍙峰彂閫佸け璐�");
+ log.error("鍏紬鍙峰彂閫佸け璐ワ細{}", e.getMessage());
+ lssubIds.add(serviceSubtask.getId());
serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- } catch (Exception e) {
- String guid = UUID.randomUUID().toString();
- log.error("鍏紬鍙蜂换鍔★紝鍙戦�佸け璐ュ師鍥狅細{},{}", e.getMessage(), guid);
- serviceSubtask.setResult("error");
- serviceSubtask.setRemark("绯荤粺閿欒锛堜换鍔★級");
- serviceSubtask.setGuid(guid);
- serviceSubtask.setSendstate(5L);
- serviceSubtask.setFinishtime(new Date());
- serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+ continue;
}
+ //鍦ㄥ瓙浠诲姟琛ㄩ噷璁板綍涓�涓�
+ String uuid = UUID.randomUUID().toString();
+ serviceSubtask.setResult("success");
+ serviceSubtask.setRemark("鍏紬鍙峰彂閫佹垚鍔�");
+ serviceSubtask.setGuid(uuid);
+ serviceSubtask.setSendstate(3L);
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+
+ //浠诲姟鍙戦�佽褰�
+ ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
+ serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ serviceSubtaskRecord.setUuid(uuid);
+ serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
+ serviceSubtaskRecord.setPreachform("5");
+ serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
+ serviceSubtaskRecord.setResult("success");
+ serviceSubtaskRecord.setRemark("鍏紬鍙峰彂閫佹垚鍔�");
+ serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
}
+ if (CollectionUtils.isEmpty(lssubIds)) {
+ //濡傛灉鈥滀复鏃跺瓙浠诲姟鈥濅负绌猴紝璇存槑鍏ㄥ彂閫佸畬浜�
+ isSend = true;
+ }
+ //灏嗗瓙浠诲姟ID娓呯┖锛屽皢鈥滀复鏃跺瓙浠诲姟鈥濇暟鎹� 鏀惧埌 鈥滃瓙浠诲姟鈥� 涓�
+ subIds.clear();
+ subIds.addAll(lssubIds);
+ lssubIds.clear();
}
//閫氱煡 MQ 娑堟伅宸茶鎺ユ敹,鍙互ACK(浠庨槦鍒椾腑鍒犻櫎)浜� 锛堣繖涓渶瑕佹牴鎹笟鍔″啀鍘诲鐞咥CK锛�
}
+ if (CollectionUtils.isNotEmpty(subIds)) {
+ //濡傛灉鍏ㄩ儴鐨勫彂閫佹柟寮忛兘鍙戝畬浜嗭紝杩樻湁鏄湭鍙戦�佺殑,闇�瑕佸幓subTask琛ㄤ腑锛岃褰曚竴涓嬶紝鍙戦�佸け璐�
+ for (Long id : subIds) {
+ ServiceSubtask serviceSubtask = new ServiceSubtask();
+ serviceSubtask.setResult("error");
+ serviceSubtask.setRemark("鍙戦�佸け璐�");
+ serviceSubtask.setSendstate(5L);
+ serviceSubtask.setId(id);
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+ }
+ }
}
+
}
// /**
--
Gitblit v1.9.3