From f37340d34e42ded944304ad0601d3f3abc9d55bd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 30 四月 2025 17:55:05 +0800
Subject: [PATCH] 代码提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 4 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 4191ba6..68edc8f 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
@@ -8,8 +8,10 @@
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.WxGZHEnum;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.HttpUtil;
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
@@ -472,10 +474,34 @@
sendMagParam.setPhone(serviceSubtask.getPhone());
sendMagParam.setUrl(ip + ":" + req_path + "/wt?p=" + format);
sendMagParam.setContent("銆愭柊鍗庡尰闄€�戞偍濂斤紝閭�璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + sendMagParam.getUrl() + "濉啓銆傛劅璋㈡偍閰嶅悎锛�");
- Map<String, String> req = new HashMap<>();
- req.put("phone", sendMagParam.getPhone());
- req.put("content", sendMagParam.getContent());
- String isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
+ String isSuccess = null;
+ if (visitHosp == 1) {
+ Map<String, String> req = new HashMap<>();
+ req.put("phone", sendMagParam.getPhone());
+ req.put("content", sendMagParam.getContent());
+ isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
+ } else if (visitHosp == 2) {
+ //涓芥按鐨勭煭淇″彂閫佹柟寮�
+ String address = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
+ if (StringUtils.isEmpty(address)) {
+ ServiceSubtask ss = new ServiceSubtask();
+ ss.setResult("error");
+ ss.setRemark("鐭俊鍙戦�佸け璐�,璇ユ満鏋勬病鏈夐厤缃煭淇″湴鍧�");
+ ss.setSendstate(5L);
+ ss.setId(serviceSubtask.getId());
+ ss.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtask(ss);
+ continue;
+ }
+ String dxCode = getDXCode(address, sendMagParam.getPhone(), sendMagParam.getContent(), "", "", MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid()));
+ log.error("---------涓芥按鐭俊鍙戦�佺粨鏋滐細{}-------", dxCode);
+ ObjectMapper objectMapper = new ObjectMapper();
+ Map<String, Object> textParam = objectMapper.readValue(dxCode, Map.class);
+ String code = textParam.get("code").toString();
+ if (code.equals("0")) {
+ isSuccess = "true";
+ }
+ }
//浠诲姟鍙戦�佽褰�
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
@@ -816,6 +842,31 @@
return key;
}
+ private String getDXCode(String address, String ShouJiHM, String FaSongNR, String FaSongRID, String FaSongRXM, Map<String, Object> headerMap) {
+ Map<String, Object> map = new LinkedHashMap<>();
+
+ Map<String, Object> YeWuXX = new LinkedHashMap<>();
+ Map<String, Object> DuanXinXX = new LinkedHashMap<>();
+ DuanXinXX.put("ShouJiHM", ShouJiHM);
+ DuanXinXX.put("FaSongNR", FaSongNR);
+ DuanXinXX.put("FaSongRID", FaSongRID);
+ DuanXinXX.put("FaSongRXM", FaSongRXM);
+ YeWuXX.put("DuanXinXX", DuanXinXX);
+
+ map.put("XiaoXiTou", headerMap);
+ map.put("DuanXinXX", DuanXinXX);
+
+ String body = new Gson().toJson(map);
+
+ String result = HttpUtils.sendPost(address, body);
+ log.error("--------result鐨勫�间负锛歿}-----", result);
+
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ String code = (String) jsonObject.toString();
+ return code;
+ }
+
+
private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String setPatientname, String setPatientid, List<String> wxqqxx) {
XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
xinHuaWXReq.setIdcard(idcard);
--
Gitblit v1.9.3