From bfcdef84bed8a4804667593ff6863e9337b7ac20 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 9 Aug 2023 11:06:19 +0800
Subject: [PATCH] 2023-08-09

---
 .../report/biz/wechat/WechatRest.java         | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
index 7abc856b..6117b7f9 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java
@@ -1,6 +1,8 @@
 package com.yxt.supervise.report.biz.wechat;
 
+import cn.hutool.Hutool;
 import cn.hutool.core.thread.ThreadUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.report.aes.AesException;
@@ -23,6 +25,7 @@ import com.yxt.supervise.report.ds.system.systemMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -274,19 +277,11 @@ public class WechatRest {
         // 公众号的模板id(也有相应的接口可以查询到)
         String templateId = "BT6BHEojCmgWNTcpz1raHNIpJEEISP1E134btP51p_8";
         //微信的基础accessToken
-        String accessToken=getAccessToken(APP_ID_BIZ,APPSECRETBIZ);
+//        String accessToken=getAccessToken(APP_ID_BIZ,APPSECRETBIZ);
+        String accessToken=getAccessToken("wx05604ce2a8bede05","3d36e8a61212cf773a2fa4e6c9a83334");
         String wxUrl = WX_URL_MESSAGE_SEND.replace("ACCESS_TOKEN", accessToken);
         List<String> openIds=new ArrayList<>();
-        openIds.add("oGdho60xVtWEXUks7nYEAn0tGlDE");
-        openIds.add("oGdho612Vd1p8v_o1Zw2f8rCA9_M");
-        openIds.add("oGdho615_xBMYYwftEjjBlC6p2uE");
-        openIds.add("oGdho6ys73QBJ_iM0aHWdvPnl_zs");
-        openIds.add("oGdho66394A-4-NyumcJ1MEaT8Lo");
-        openIds.add("oGdho68CArVhC_-7ELkG-jX21ruk");
-        openIds.add("oGdho6yYB47f52HVk2NqirrFbRRk");
-        openIds.add("oGdho6-12-ioAKeLhVUDYPucbDb4");
-        openIds.add("oGdho668Hew45t0xfBJC84TNGVzI");
-        openIds.add("oGdho6-LvwNY6KylgMlEG0C_JMmQ");
+        openIds.add("oA-GE6zKB_5wQsVX6USlRQYV39vE");
         String pa="";
         JSONObject jsonObject=new JSONObject();
         List<MessageOpenidDto> list=new ArrayList<>();
@@ -294,8 +289,9 @@ public class WechatRest {
             MessageOpenidDto dto=new MessageOpenidDto();
             dto.setOpenId(openId);
             list.add(dto);
-            sendMag.put("time1", new Template(reportStockDay.getReportTime()));
-            sendMag.put("thing2", new Template("质物库存汇总("+reportStockDay.getProjectName()+")"));
+//            sendMag.put("time1", new Template(reportStockDay.getReportTime()));
+            sendMag.put("time1", new Template("测试"));
+            sendMag.put("thing2", new Template("质物库存汇总()"));
             sendMag.put("thing3", new Template("赵丽晓"));
             Map<String, String> miniprogram = new HashMap<>();
             miniprogram.put("appid","wx05604ce2a8bede05");
@@ -326,7 +322,7 @@ public class WechatRest {
         logDto.setMessageOpenidDtos(list);
         ThreadUtil.execute(() -> {
             try {
-                messagePushLogService.save(logDto);
+//                messagePushLogService.save(logDto);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -362,8 +358,13 @@ public class WechatRest {
             MessageOpenidDto dto=new MessageOpenidDto();
             dto.setOpenId(openId);
             list.add(dto);
+            String name ="监管数据总览("+projectDaily.getProjectName()+")";
+            if(name.length()>20){
+                name=name.substring(0,19);
+                name=name+"…";
+            };
             sendMag.put("time1", new Template(projectDaily.getReportTime()));
-            sendMag.put("thing2", new Template("监管数据总览("+projectDaily.getProjectName()+")"));
+            sendMag.put("thing2", new Template(name));
             sendMag.put("thing3", new Template("赵丽晓"));
             Map<String, String> miniprogram = new HashMap<>();
             miniprogram.put("appid","wx05604ce2a8bede05");
@@ -473,6 +474,7 @@ public class WechatRest {
         });
         //return forEntity.getBody();
     }
+
     public String getAccessToken(String appId,String appsecret) throws Exception {
         String url = WX_URL_ACCESS_TOKEN.replace("APPID", appId).replace("APPSECRET", appsecret);
         RestTemplate restTemplate=new RestTemplate();