From 3bb752a7657275538ebeba27834af5c759c4eb18 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 24 十二月 2025 10:57:22 +0800
Subject: [PATCH] 【市一】 微信公众号 发送调整

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 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 3ee4de0..9ac181e 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
@@ -770,9 +770,14 @@
 
                     //鑾峰彇寰俊鍏紬鍙疯姹備俊鎭牴鎹満鏋処D
                     List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid());
-                    if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
-                        setSuccessPreachForm(serviceSubtask, sendPreachform, "銆愬叕浼楀彿銆戣鏈烘瀯鐨勫叕浼楀彿閰嶇疆淇℃伅涓嶅叏锛屾棤娉曢�氳繃鍏紬鍙峰彂閫�", "4");
-                        return;
+                    //甯備竴鍖婚櫌 涓嶆牎楠�
+                    if(active.equals("hzszlyy")){
+
+                    }else {
+                        if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
+                            setSuccessPreachForm(serviceSubtask, sendPreachform, "銆愬叕浼楀彿銆戣鏈烘瀯鐨勫叕浼楀彿閰嶇疆淇℃伅涓嶅叏锛屾棤娉曢�氳繃鍏紬鍙峰彂閫�", "4");
+                            return;
+                        }
                     }
 
                     if (StringUtils.isEmpty(patArchive.getPatidHis())) {
@@ -780,9 +785,10 @@
                         return;
                     }
                     String wxCode = "";
-                    if (active.equals("hzszlyy")) {//甯備竴鍖婚櫌
+                    //甯備竴鍖婚櫌
+                    if (active.equals("hzszlyy")) {
                         //澶勭悊涓枃涔辩爜闂
-                        String title = URLEncoder.encode("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲~鍐欍��", StandardCharsets.UTF_8.toString());
+                        /**String title = URLEncoder.encode("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲~鍐欍��", StandardCharsets.UTF_8.toString());
                         String content = URLEncoder.encode("鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲~鍐欍��", StandardCharsets.UTF_8.toString());
                         String encodedUrl = URLEncoder.encode(url, StandardCharsets.UTF_8.toString());
                         String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh=" + serviceSubtask.getSfzh() +
@@ -792,7 +798,14 @@
                                 "&url=" + encodedUrl +
                                 "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
 //                        HttpUtils.sendGet(urlTemp);
-                        HttpUtils.sendPost(urlTemp);
+                        String sendMsg = "";
+                        sendMsg = HttpUtils.sendPost(urlTemp);
+                        log.info(sendMsg); **/
+
+                        String sendMsg = "";
+                        sendMsg = smsUtils.sendChat(url, patArchive.getTelcode(), serviceSubtask.getSfzh());
+                        log.info(sendMsg);
+
                     } else {
                         wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
                     }

--
Gitblit v1.9.3