From 131458aab7fff1dbcf9d3120e170aeac6635dba8 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Mon, 15 Apr 2024 14:55:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=95=B4=E5=92=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zc/business/controller/MsmController.java | 10 +++++++---
 .../main/java/com/zc/business/service/IMsmService.java |  2 +-
 .../com/zc/business/service/impl/MsmServiceImpl.java   |  8 ++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/MsmController.java b/zc-business/src/main/java/com/zc/business/controller/MsmController.java
index 10a3070d..739c217e 100644
--- a/zc-business/src/main/java/com/zc/business/controller/MsmController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/MsmController.java
@@ -46,15 +46,19 @@ public class MsmController extends BaseController {
     //调用微信推送
     @PostMapping("/wenXinPush")
     public AjaxResult commandAndDispatch(@RequestBody HashMap map){
-        return AjaxResult.success(msmService.wenXinSend("wx9ee0e3babfd8d2af","de2ecb80b30d63135918ba3ae6ffb711"));
+        return AjaxResult.success(msmService.wenXinSend("wx9ee0e3babfd8d2af","de2ecb80b30d63135918ba3ae6ffb711","内容"));
     }
     //整合推送
     @PostMapping("/pushAll")
     public AjaxResult pushAll(@RequestBody HashMap map)
     {
-        if (map == null || StringUtils.isBlank(map.get("type").toString())) {
+        if (map == null || !map.containsKey("type")||StringUtils.isBlank(map.get("type").toString())) {
             return AjaxResult.error("参数错误");
         }
+        if (map == null ||!map.containsKey("content")|| StringUtils.isBlank(map.get("content").toString())) {
+            return AjaxResult.error("内容为空");
+        }
+        String content = map.get("content").toString();//信息内容
         ArrayList<String> array = (ArrayList<String>) map.get("type");
         Boolean send = null;
         Integer data = null;
@@ -70,7 +74,7 @@ public class MsmController extends BaseController {
                 continue;
             }
             if ("2".equals(type)) { //微信
-                JSONArray objects = msmService.wenXinSend("wx9ee0e3babfd8d2af", "de2ecb80b30d63135918ba3ae6ffb711");
+                JSONArray objects = msmService.wenXinSend("wx9ee0e3babfd8d2af", "de2ecb80b30d63135918ba3ae6ffb711",content);
                 data = (Integer) objects.get(0);
                 continue;
             }
diff --git a/zc-business/src/main/java/com/zc/business/service/IMsmService.java b/zc-business/src/main/java/com/zc/business/service/IMsmService.java
index 5dc10cdf..b5eed095 100644
--- a/zc-business/src/main/java/com/zc/business/service/IMsmService.java
+++ b/zc-business/src/main/java/com/zc/business/service/IMsmService.java
@@ -16,6 +16,6 @@ public interface IMsmService {
      *
      * @return
      */
-    JSONArray wenXinSend(String appId, String appSecret);
+    JSONArray wenXinSend(String appId, String appSecret,String content);
 
 }
\ No newline at end of file
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/MsmServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/MsmServiceImpl.java
index aa151b06..dff802d2 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/MsmServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/MsmServiceImpl.java
@@ -80,9 +80,9 @@ public class MsmServiceImpl implements IMsmService {
 //    }
     //微信推送
     @Override
-    public JSONArray wenXinSend(String appId, String appSecret) {
+    public JSONArray wenXinSend(String appId, String appSecret,String content) {
         MsmServiceImpl msmService = new MsmServiceImpl();
-        return msmService.sendTemp(appId, appSecret);
+        return msmService.sendTemp(appId, appSecret,content);
     }
 
     //获取微信token
@@ -111,7 +111,7 @@ public class MsmServiceImpl implements IMsmService {
     }
 
     //执行微信推送
-    public JSONArray sendTemp(String appId, String appSecret) {
+    public JSONArray sendTemp(String appId, String appSecret,String content) {
         JSONArray objects = new JSONArray();
         ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(100);
         MsmServiceImpl msmService = new MsmServiceImpl();
@@ -134,7 +134,7 @@ public class MsmServiceImpl implements IMsmService {
                 // 封装data
                 com.alibaba.fastjson.JSONObject data = new com.alibaba.fastjson.JSONObject();
                 com.alibaba.fastjson.JSONObject name = new com.alibaba.fastjson.JSONObject();
-                name.put("value", "做一个身体和心灵都勇敢的人，趁着身体未老，心灵还透明。晚安!");
+                name.put("value", content);
                 data.put("name", name);
                 com.alibaba.fastjson.JSONObject weather = new com.alibaba.fastjson.JSONObject();
                 weather.put("value", "阴天  19°c");