From 3ede859fc8cd6068ea91f66553d38f5b510af3ef Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 17 四月 2026 17:06:03 +0800
Subject: [PATCH] 修改一下serviceSubtask的remark的值
---
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 67 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 26 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 5feda84..7a7d6d6 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
@@ -23,6 +23,7 @@
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import com.smartor.common.LSHospTokenUtil;
+import com.smartor.common.MtSubmitSmUtil;
import com.smartor.domain.*;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.*;
@@ -116,10 +117,10 @@
private String active;
@Autowired
- private ISysConfigService configService;
+ private MtSubmitSmUtil mtSubmitSmUtil;
- // 鍒涘缓鍥哄畾澶у皬鐨勭嚎绋嬫睜
- private static final ExecutorService executorService = Executors.newFixedThreadPool(10);
+ @Autowired
+ private ISysConfigService configService;
public RedisMqReceiver(RedisMessageListenerContainer listenerContainer) {
super(listenerContainer);
@@ -152,12 +153,12 @@
ServiceTask serviceTask = new ServiceTask();
serviceTask.setTaskid(Long.valueOf(commonTaskcallMQ.getTaskid()));
- //鍦ㄩ棶鍗蜂腑锛岄�変腑鏌愪釜閫夐」瑕佽繘琛屾湇鍔¤ˉ鍋挎椂锛屽彧鏄�熺敤璇ユ湇鍔＄殑澶栧３锛屼笉瀵硅鏈嶅姟鏈変换鍔″奖鍝�
- if (commonTaskcallMQ.getUpdateSendstate() == null || commonTaskcallMQ.getUpdateSendstate() == 1) {
- serviceTask.setSendState(5L);
- serviceTask.setFail(1L);
- serviceTaskMapper.updateServiceTask(serviceTask);
- }
+// //鍦ㄩ棶鍗蜂腑锛岄�変腑鏌愪釜閫夐」瑕佽繘琛屾湇鍔¤ˉ鍋挎椂锛屽彧鏄�熺敤璇ユ湇鍔＄殑澶栧３锛屼笉瀵硅鏈嶅姟鏈変换鍔″奖鍝�
+// if (commonTaskcallMQ.getUpdateSendstate() == null || commonTaskcallMQ.getUpdateSendstate() == 1) {
+// serviceTask.setSendState(5L);
+// serviceTask.setFail(1L);
+// serviceTaskMapper.updateServiceTask(serviceTask);
+// }
} catch (Exception e) {
Integer integer = redisCache.getCacheObject(commonTaskcallMQ.getTaskid().toString());
if (integer != null && integer == 3) {
@@ -310,7 +311,7 @@
iServiceOutPathService.updateServiceOutPath(serviceOutPath);
sendMagParam.setPhone(serviceSubtask.getPhone());
sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format);
- if (active.equals("ls") || active.equals("sltd")) {
+ if (active.equals("ls") || active.equals("sltd") || active.equals("nhfy")) {
sendMagParam.setContent("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌闅忚璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
} else if (active.equals("xh")) {
sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌闅忚璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
@@ -339,7 +340,7 @@
//濡傛灉type鏄闊抽殢璁跨殑璇濓紙璇存槑琛ュ伩鍙戦�佹柟寮忎腑鏈夌數璇濋殢璁跨殑鏂瑰紡锛岃繖閲岀殑澶栭摼灏卞湴鍧�鍙兘鐢�/sf锛�
if (serviceSubtask.getType().equals("1"))
sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format);
- if (active.equals("ls") || active.equals("sltd")) {
+ if (active.equals("ls") || active.equals("sltd") || active.equals("nhfy")) {
sendMagParam.setContent("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
} else if (active.equals("xh")) {
sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
@@ -366,7 +367,7 @@
if (heLibrary.getHetype().equals("1")) {
sendMagParam.setPhone(serviceSubtask.getPhone());
sendMagParam.setUrl(ip + ":" + req_path + "/xj?p=" + format);
- if (active.equals("ls") || active.equals("sltd")) {
+ if (active.equals("ls") || active.equals("sltd") || active.equals("nhfy")) {
sendMagParam.setContent("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌瀹ｆ暀璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
} else if (active.equals("xh")) {
sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌瀹ｆ暀璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "鏌ョ湅銆傛劅璋㈡偍閰嶅悎锛�");
@@ -428,23 +429,37 @@
setFailPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�", "5");
throw new BaseException("鐭俊鍙戦�佸け璐�");
}
- } else if (active.equals("sltd")) {
+ } else if (active.equals("sltd") || active.equals("nhfy")) {
//鐪佺珛鍚屽痉鐨勭煭淇″彂閫佹柟寮�
- String data = MessageSend.sendMsg(sendMagParam.getContent(), "6", sendMagParam.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
- if (StringUtils.isNotEmpty(data)) {
- ObjectMapper mapper = new ObjectMapper();
- JsonNode root = mapper.readTree(data);
- String status = root.get("result").get(0).get("status").asText();
- if (status.equals("00000")) {
- s = "true";
+ String data = null;
+ Map<String, Object> smsResult = null;
+ if (active.equals("sltd")) {
+ data = MessageSend.sendMsg(sendMagParam.getContent(), "6", sendMagParam.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+ if (StringUtils.isNotEmpty(data)) {
+ ObjectMapper mapper = new ObjectMapper();
+ JsonNode root = mapper.readTree(data);
+ String status = root.get("result").get(0).get("status").asText();
+ if (status.equals("00000")) {
+ s = "true";
+ } else {
+ setFailPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�: " + data, "5");
+ throw new BaseException("鐭俊鍙戦�佸け璐�");
+ }
+
} else {
setFailPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�: " + data, "5");
throw new BaseException("鐭俊鍙戦�佸け璐�");
}
- } else {
- setFailPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�: " + data, "5");
- throw new BaseException("鐭俊鍙戦�佸け璐�");
+ } else if (active.equals("nhfy")) {
+ smsResult = mtSubmitSmUtil.submitSm(sendMagParam.getPhone(), sendMagParam.getContent());
+ if (smsResult != null && smsResult.get("result") != null && smsResult.get("result").toString().equals("0")) {
+ s = "true";
+ } else {
+ setFailPreachForm(serviceSubtask, sendPreachform, "鐭俊鍙戦�佸け璐�", "5");
+ throw new BaseException("鐭俊鍙戦�佸け璐�");
+ }
}
+
} else if (active.equals("hzszlyy")) {
//甯備竴
long timestamp = new Date().getTime();
@@ -848,9 +863,9 @@
if (failSendstate.equals("4") || failSendstate.equals("5")) {
serviceSubtask.setCurrentPreachform(preachform);
serviceSubtask.setSendstate(5L);
- serviceSubtask.setRemark("setFailPreachForm鏂规硶 褰撳墠鐨刾reachform宸茬粡鏄渶鍚庝竴涓簡锛屽叏閮ㄦ墽琛屽け璐�");
+ serviceSubtask.setRemark("澶勭悊琛ュ伩浠诲姟,褰撳墠澶勭悊鏈�鍚庤ˉ鍋匡紝鍏ㄩ儴鎵ц澶辫触");
//浜哄伐鍙戦�佽秴鏃�
- if(ObjectUtils.isNotEmpty(preachform) && preachform.equals("1") && failSendstate.equals("7")){
+ if (ObjectUtils.isNotEmpty(preachform) && preachform.equals("1") && failSendstate.equals("7")) {
serviceSubtask.setSendstate(7L);
serviceSubtask.setRemark("浜哄伐鍙戦�佽秴鏃�");
}
@@ -868,7 +883,7 @@
serviceSubtask.setVisitTime(getNextVisitTime(serviceSubtask.getId(), serviceSubtask.getTaskid(), serviceSubtask.getVisitTime(), serviceSubtask.getCurrentPreachform()));
serviceSubtask.setSendstate(3L);
//浜哄伐鍙戦�佽秴鏃�
- if(ObjectUtils.isNotEmpty(preachform) && preachform.equals("1") && failSendstate.equals("7")){
+ if (ObjectUtils.isNotEmpty(preachform) && preachform.equals("1") && failSendstate.equals("7")) {
serviceSubtask.setSendstate(7L);
serviceSubtask.setRemark("浜哄伐鍙戦�佽秴鏃�");
}
--
Gitblit v1.9.3