From 7660f289107d877f5cd70d383483b6ca08a4d22d Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Wed, 16 Aug 2023 09:56:03 +0800 Subject: [PATCH] 8/16 --- .../report/api/messagepushlog/MessagePushLogDto.java | 2 +- .../biz/messagepushlog/MessagePushLogService.java | 12 +++++++----- .../yxt/supervise/report/biz/wechat/WechatRest.java | 6 ++---- .../supervise/report/wx/SuperviseWxMessSender.java | 11 ++++++++--- .../report/wx/SuperviseWxMessSenderTest.java | 6 ++++-- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/messagepushlog/MessagePushLogDto.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/messagepushlog/MessagePushLogDto.java index ce4801ae..bb928877 100644 --- a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/messagepushlog/MessagePushLogDto.java +++ b/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 content; private Map content; - private List messageOpenidDtos; + private List messageOpenids; private String openid;//小程序openid private String projectSid; private String orderDate; diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java index b809486b..39276f4d 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java +++ b/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 { 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); } /** diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/SuperviseWxMessSender.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/SuperviseWxMessSender.java index 6448921d..6a41c7ec 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/SuperviseWxMessSender.java +++ b/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 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 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(() -> { diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/SuperviseWxMessSenderTest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/SuperviseWxMessSenderTest.java index da99f8a2..dea46be5 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/test/java/com/yxt/supervise/report/wx/SuperviseWxMessSenderTest.java +++ b/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 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());