From c4f9c032d2a4fcd57d59846bc208d7d225ba5aa8 Mon Sep 17 00:00:00 2001
From: zhs <zhs18203887318@163.com>
Date: 星期六, 16 八月 2025 15:28:48 +0800
Subject: [PATCH] 0816 zhs
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 771bf63..51f383f 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -3,16 +3,12 @@
import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.MsgLSEnum;
import com.ruoyi.common.enums.ServiceFromEnum;
import com.ruoyi.common.enums.VisitSendStateEnum;
import com.ruoyi.common.enums.WxGZHEnum;
-import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.HttpUtil;
import com.ruoyi.common.utils.OkHttpExample;
import com.ruoyi.common.utils.RSAPublicKeyExample;
@@ -20,6 +16,7 @@
import com.ruoyi.common.utils.http.HttpUtils;
import com.smartor.common.LSHospTokenUtil;
import com.smartor.domain.*;
+import com.smartor.mapper.HeLibraryMapper;
import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.mapper.ServiceTaskMapper;
import com.smartor.mapper.SysUserImportMapper;
@@ -30,20 +27,13 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.Transactional;
-import java.io.File;
-import java.io.FileWriter;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.MessageDigest;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -91,6 +81,9 @@
@Autowired
private SysUserImportMapper sysUserImportMapper;
+
+ @Autowired
+ private HeLibraryMapper heLibraryMapper;
@Value("${localIP}")
private String localIP;
@@ -359,10 +352,21 @@
//涓芥按鏈夌殑鍖婚櫌杩樻病娉曞仛闀挎湡浠诲姟闅忚
List<ServiceSubtask> subtaskList2 = new ArrayList<>();
if (visitHosp == 2) {
- for (ServiceSubtask serviceSubtask : subtaskList) {
- Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
- if (b) subtaskList2.add(serviceSubtask);
+ try {
+ for (ServiceSubtask serviceSubtask : subtaskList) {
+ Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
+
+ if (b) subtaskList2.add(serviceSubtask);
+ }
+ } catch (Exception e) {
+ log.error("-------闀挎湡浠诲姟寮傚父涓猴細", e);
+ continue;
}
+// for (ServiceSubtask serviceSubtask : subtaskList) {
+// Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
+//
+// if (b) subtaskList2.add(serviceSubtask);
+// }
subtaskList = subtaskList2;
}
@@ -478,7 +482,6 @@
serviceSubtask.setResult("error");
serviceSubtask.setRemark(patArchive.getNotrequiredreason());
serviceSubtask.setSendstate(4L);
-// serviceSubtask.setFinishtime(new Date());
iServiceSubtaskService.insertServiceSubtask(serviceSubtask);
continue;
}
@@ -497,9 +500,18 @@
serviceOutPath.setRadix(format);
serviceOutPath.setUpdateTime(new Date());
iServiceOutPathService.updateServiceOutPath(serviceOutPath);
- sendMagParam.setPhone(serviceSubtask.getPhone());
- sendMagParam.setUrl(ip + ":" + req_path + "/wt?p=" + format);
- sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
+ //鍏堝垽鏂竴涓嬪彂鐨勬槸涓嶆槸瀹ｆ暀
+ if (!"3".equals(serviceSubtask.getType())) {
+ sendMagParam.setPhone(serviceSubtask.getPhone());
+ sendMagParam.setUrl(ip + ":" + req_path + "/wt?p=" + format);
+ sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
+ } else {
+ HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid());
+ if ("2".equals(heLibrary.getHetype())) {
+ sendMagParam.setPhone(serviceSubtask.getPhone());
+ sendMagParam.setContent(heLibrary.getPreachcontent());
+ }
+ }
String isSuccess = null;
if (visitHosp == 1) {
Map<String, String> req = new HashMap<>();
--
Gitblit v1.9.3