8/16

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/messagepushlog/MessagePushLogDto.java

@@ -20,7 +20,7 @@ public class MessagePushLogDto implements Dto {
     private String pagepath;
     //private Map<String, Template> content;
     private Map<String, String> content;
-    private List<MessageOpenidDto> messageOpenidDtos;
+    private List<String> messageOpenids;
     private String openid;//小程序openid
     private String projectSid;
     private String orderDate;

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java

@@ -48,11 +48,13 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
         BeanUtil.copyProperties(dto, entity, "id");
         entity.setSid(UUID.randomUUID().toString());
         baseMapper.insert(entity);
-        MessageOpenid messageOpenid=new MessageOpenid();
-        messageOpenid.setOpenId(dto.getOpenid());
-        messageOpenid.setMessageSid(entity.getSid());
-        messageOpenid.setSid(UUID.randomUUID().toString());
-        messageOpenidService.save(messageOpenid);
+        for(String openid:dto.getMessageOpenids()){
+            MessageOpenid messageOpenid=new MessageOpenid();
+            messageOpenid.setOpenId(openid);
+            messageOpenid.setMessageSid(entity.getSid());
+            messageOpenid.setSid(UUID.randomUUID().toString());
+            messageOpenidService.save(messageOpenid);
+        }
         return rb.success().setMsg("保存成功");
 
     }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java

@@ -178,7 +178,7 @@ public class WechatRest {
         logDto.setContent(sendMag);
         logDto.setMessageTime(csmCashReportVo.getDataDate());
         logDto.setPagepath(pa);
-        logDto.setMessageOpenidDtos(list);
+//        logDto.setMessageOpenids(list);
         ThreadUtil.execute(() -> {
             try {
                 messagePushLogService.save(logDto);
@@ -352,9 +352,7 @@ public class WechatRest {
         }
         ProjectDaily projectDaily=projectDailyService.fetchByProjectAndDay(projectSid,orderDate);
         // 公众号的模板id(也有相应的接口可以查询到)
-        for(String openId:openIds){
-            r= SuperviseWxMessSender.jgsjzlSend("赵丽晓",openId,projectSid,projectDaily.getProjectName(),projectDaily.getReportTime());
-        }
+        r= SuperviseWxMessSender.jgsjzlSend("赵丽晓",openIds,projectSid,projectDaily.getProjectName(),projectDaily.getReportTime());
         System.out.println(r);
     }
     /**

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/SuperviseWxMessSender.java

@@ -12,6 +12,8 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import java.util.HashMap;
+import java.util.List;
+
 @Component
 public class SuperviseWxMessSender {
 
@@ -37,7 +39,8 @@ public class SuperviseWxMessSender {
      * @param reportTime
      * @return
      */
-    public static RespMessReturn jgsjzlSend(String sender, String touser, String projectSid, String projectName, String reportTime) {
+    public static RespMessReturn jgsjzlSend(String sender, List<String> tousers, String projectSid, String projectName, String reportTime) {
+        RespMessReturn respMessReturn=new RespMessReturn();
         String orderDate = reportTime.substring(0, 10);
         String pagepath = jgsjzl_pagepath.replace("ORDER_DATE", orderDate).replace("PROJECT_SID", projectSid);
         HashMap<String, String> data = new HashMap<>();
@@ -45,12 +48,14 @@ public class SuperviseWxMessSender {
         String thing2 = "监管数据总览(" + projectName + ")";
         data.put("thing2", maxLength20(thing2));
         data.put("thing3", sender);
-        RespMessReturn respMessReturn = WxMessage.sendMessage(jgsjzl_template_id, touser, pagepath, data);
+        for(String touser:tousers){
+            respMessReturn = WxMessage.sendMessage(jgsjzl_template_id, touser, pagepath, data);
+        }
         MessagePushLogDto logDto=new MessagePushLogDto();
         logDto.setContent(data);
         logDto.setMessageTime(reportTime);
         logDto.setPagepath(pagepath);
-        logDto.setOpenid(touser);
+        logDto.setMessageOpenids(tousers);
         logDto.setProjectSid(projectSid);
         logDto.setOrderDate(orderDate);
         ThreadUtil.execute(() -> {

yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/SuperviseWxMessSenderTest.java

@@ -3,15 +3,17 @@ package com.yxt.supervise.report.wx;
 import com.yxt.supervise.report.wx.obj.RespMessReturn;
 import org.junit.Test;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 public class SuperviseWxMessSenderTest {
 
 //    @Test
     public void testJgsjzlSend() {
 
-        String touser = "oGdho68CArVhC_-7ELkG-jX21ruk";
-
+        List<String> touser =new ArrayList<>();
+//        "oGdho68CArVhC_-7ELkG-jX21ruk"
         RespMessReturn respMessReturn = SuperviseWxMessSender.jgsjzlSend("liuliu1", touser, "1111", "测试项目567890123", "2023-03-12 14:22:05");
         System.out.println(respMessReturn.getErrcode());
         System.out.println(respMessReturn.getErrmsg());