From 284545b6694878772a77ed329283b4901a4534f0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 28 四月 2025 18:00:41 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java |   65 +++++++++++++++++++++++++-------
 1 files changed, 51 insertions(+), 14 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 cb645e8..9be2bab 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
@@ -11,6 +11,7 @@
 import com.google.gson.JsonObject;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.enums.ServiceFromEnum;
+import com.ruoyi.common.enums.WxGZHEnum;
 import com.ruoyi.common.utils.DtoConversionUtils;
 import com.ruoyi.common.utils.HttpUtil;
 import com.ruoyi.common.utils.RSAPublicKeyExample;
@@ -41,6 +42,7 @@
 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;
@@ -50,6 +52,8 @@
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
+
+import static cn.hutool.core.convert.Convert.toHex;
 
 /**
  * 瀹氭椂浠诲姟璋冨害娴嬭瘯
@@ -97,9 +101,6 @@
 
     @Value("${pub_key}")
     private String pub_key;
-
-    @Value("${thirdWXUrl}")
-    private String thirdWXUrl;
 
     @Value("${req_path}")
     private String req_path;
@@ -542,10 +543,32 @@
                                 url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "&param2=" + patid + "&param3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=false";
 //                                String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), "鏃�");
 
-                                String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatientno());
+                                //鑾峰彇寰俊鍏紬鍙疯姹備俊鎭牴鎹満鏋処D
+                                List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid());
+                                if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
+                                    ServiceSubtask ss = new ServiceSubtask();
+                                    ss.setResult("error");
+                                    ss.setRemark("璇ユ満鏋勭殑鍏紬鍙烽厤缃俊鎭笉鍏紝鏃犳硶閫氳繃鍏紬鍙峰彂閫�");
+                                    ss.setSendstate(5L);
+                                    ss.setId(serviceSubtask.getId());
+                                    ss.setFinishtime(new Date());
+                                    serviceSubtaskMapper.updateServiceSubtask(ss);
+                                    continue;
+                                }
+
+                                if (StringUtils.isEmpty(patArchive.getPatidHis())) {
+                                    ServiceSubtask ss = new ServiceSubtask();
+                                    ss.setResult("error");
+                                    ss.setRemark("鍏紬鍙峰彂閫佸け璐�,his绯荤粺鐨勬偅鑰卛d涓虹┖");
+                                    ss.setSendstate(5L);
+                                    ss.setId(serviceSubtask.getId());
+                                    ss.setFinishtime(new Date());
+                                    serviceSubtaskMapper.updateServiceSubtask(ss);
+                                    continue;
+                                }
+                                String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
 
                                 Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
-
                                 //浠诲姟鍙戦�佽褰�
                                 ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
                                 serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
@@ -799,7 +822,7 @@
         return key;
     }
 
-    private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String setPatientname, String setPatientid) {
+    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);
         xinHuaWXReq.setUrl(url);
@@ -809,17 +832,31 @@
         xinHuaWXReq.setMedcardno(null);
         xinHuaWXReq.setTitlename(taskName);
         xinHuaWXReq.setContent(taskDesc);
-        xinHuaWXReq.setAppid(appid);
+        xinHuaWXReq.setAppid(wxqqxx.get(1));
         log.error("----getWXCode---xinHuaWXReq鐨勫嚭鍙備负锛歿}", xinHuaWXReq);
-        String result = HttpUtils.sendPost(thirdWXUrl, new Gson().toJson(xinHuaWXReq));
+        String body = new Gson().toJson(xinHuaWXReq);
+        String encode = encode(wxqqxx.get(2).concat(body));
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("sign", encode);
+        String result = HttpUtils.sendPostByHeader(wxqqxx.get(3), body, headerMap);
+
         JSONObject jsonObject = JSONObject.parseObject(result);
         String code = (String) jsonObject.toString();
         return code;
     }
-//    public static void main(String[] args) {
-//        LocalDateTime originalDateTime = LocalDateTime.now();
-//        LocalDateTime startOfDay = originalDateTime.with(LocalTime.MIN);
-//        System.out.println("Original DateTime: " + originalDateTime);
-//        System.out.println("Start of Day: " + startOfDay);
-//    }
+
+
+    public String encode(String arg) {
+        if (arg == null) {
+            arg = "";
+        }
+        MessageDigest md5 = null;
+        try {
+            md5 = MessageDigest.getInstance("MD5");
+            md5.update(arg.getBytes("UTF-8"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return toHex(md5.digest());
+    }
 }

--
Gitblit v1.9.3