From 8590ef6a9ea67dc789436ac3558ed17a1e446c1a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 22 四月 2025 19:29:47 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java |   27 +++++++++++++++++----------
 ruoyi-admin/src/main/resources/application-druid.yml         |    4 ++--
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 316c5f2..a778413 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -102,10 +102,10 @@
     default-page: 1
     default-size: 10
 
-  #寰俊鍏紬鍙风殑瀵嗛挜
+  #寰俊鍏紬鍙风殑瀵嗛挜锛堜附姘达級
 appid: 3311000002.
 appSecret: MzMxMTAwMDAwMg==
-#绗笁鏂瑰井淇″叕浼楀彿鍙戦�佸湴鍧�锛堟柊鍗庡尰闄級
+#绗笁鏂瑰井淇″叕浼楀彿鍙戦�佸湴鍧�锛堜附姘达級
 thirdWXUrl: http://192.168.10.170:18001/frontend/medical/api
 
 #閽夐拤鐨勫瘑閽�
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 347f135..241063b 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
@@ -140,6 +140,9 @@
     @Value("${hosp_info_url}")
     private String hospInfoUrl;
 
+    @Value("${appid}")
+    private String appid;
+
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
         System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛� 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i));
     }
@@ -530,7 +533,10 @@
                                 String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
                                 String url = null;
                                 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(), "鏃�");
+
+                                String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), null,null,patArchive.getPatientno());
+
                                 Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
 
                                 //浠诲姟鍙戦�佽褰�
@@ -786,22 +792,23 @@
         return key;
     }
 
-    private String getWXCode(String idcard, String url, String taskName, String taskDesc, String submitprompt) {
+    private String getWXCode(String idcard, String url, String taskName, String taskDesc, String Medcardno, String setPatientname, String setPatientid) {
         XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
         xinHuaWXReq.setIdcard(idcard);
         xinHuaWXReq.setUrl(url);
-        xinHuaWXReq.setKeyword1("娴欎腑鍖诲ぇ浜岄櫌鍑洪櫌闅忚");
-        xinHuaWXReq.setKeyword2(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-        xinHuaWXReq.setKeyword3(taskName);
-        xinHuaWXReq.setKeyword4("鐤剧梾搴峰娉ㄦ剰浜嬮」");
+        xinHuaWXReq.setPatientid(setPatientid);
+        xinHuaWXReq.setPatientname(setPatientname);
+        xinHuaWXReq.setMobile(taskName);
+        xinHuaWXReq.setMedcardno(Medcardno);
+        xinHuaWXReq.setTitlename(taskName);
+        xinHuaWXReq.setContent(taskDesc);
+        xinHuaWXReq.setAppid(appid);
 
         String result = HttpUtils.sendPost(thirdWXUrl, new Gson().toJson(xinHuaWXReq));
         JSONObject jsonObject = JSONObject.parseObject(result);
-        log.error("jsonObject鐨勬暟鎹负锛歿}", jsonObject.toString());
-//        String code = (String) jsonObject.get("code");
-        return jsonObject.toString();
+        String code = (String) jsonObject.toString();
+        return code;
     }
-
 //    public static void main(String[] args) {
 //        LocalDateTime originalDateTime = LocalDateTime.now();
 //        LocalDateTime startOfDay = originalDateTime.with(LocalTime.MIN);

--
Gitblit v1.9.3