From 22d7512ecb341426ecaa5ac8d48d7aa2b37c1059 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 09 六月 2022 16:27:41 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java | 161 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 106 insertions(+), 55 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java b/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
index fce4629..b93f05c 100755
--- a/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
+++ b/service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java
@@ -7,8 +7,8 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.factory.Java110ThreadPoolFactory;
import com.java110.core.factory.WechatFactory;
+import com.java110.core.log.LoggerFactory;
import com.java110.core.smo.ISaveTransactionLogSMO;
-import com.java110.core.trace.Java110TraceFactory;
import com.java110.dto.RoomDto;
import com.java110.dto.app.AppDto;
import com.java110.dto.community.CommunityDto;
@@ -19,6 +19,7 @@
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
import com.java110.dto.task.TaskDto;
+import com.java110.dto.wechatSubscribe.WechatSubscribeDto;
import com.java110.entity.wechat.Content;
import com.java110.entity.wechat.Data;
import com.java110.entity.wechat.Miniprogram;
@@ -29,9 +30,11 @@
import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
+import com.java110.intf.user.IWechatSubscribeV1InnerServiceSMO;
import com.java110.job.quartz.TaskSystemQuartz;
import com.java110.po.logSystemError.LogSystemErrorPo;
import com.java110.po.transactionLog.TransactionLogPo;
+import com.java110.po.wechatSubscribe.WechatSubscribePo;
import com.java110.service.smo.ISaveSystemErrorSMO;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.WechatConstant;
@@ -39,13 +42,13 @@
import com.java110.utils.util.ExceptionUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -61,6 +64,9 @@
private static Logger logger = LoggerFactory.getLogger(WeChatPushMessageTemplate.class);
public static final int DEFAULT_THREAD_NUM = 20;
+ public static final int DEFAULT_SUBSCRIBE_PERSON = 100;
+
+ public static final int DEFAULT_QUERY_APP_OWNER_COUNT = 50;
@Autowired
private INoticeInnerServiceSMO noticeInnerServiceSMOImpl;
@@ -82,12 +88,14 @@
@Autowired
private ISaveTransactionLogSMO saveTransactionLogSMOImpl;
-
@Autowired
private RestTemplate outRestTemplate;
@Autowired
private ISaveSystemErrorSMO saveSystemErrorSMOImpl;
+
+ @Autowired
+ private IWechatSubscribeV1InnerServiceSMO wechatSubscribeV1InnerServiceSMOImpl;
//妯℃澘淇℃伅鎺ㄩ�佸湴鍧�
private static String sendMsgUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";
@@ -242,8 +250,19 @@
OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
ownerAppUserDto.setCommunityId(noticeDto.getCommunityId());
- List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
- doSend(ownerAppUserDtos, noticeDto, templateId, accessToken, weChatDto);
+ int count = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsersCount(ownerAppUserDto);
+
+ double maxPage = Math.ceil(count/DEFAULT_QUERY_APP_OWNER_COUNT)+1;
+
+ for(int page = 0; page < maxPage; page++){
+ ownerAppUserDto.setPage(page+1);
+ ownerAppUserDto.setRow(DEFAULT_QUERY_APP_OWNER_COUNT);
+ List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+ doSend(ownerAppUserDtos, noticeDto, templateId, accessToken, weChatDto);
+ }
+//
+// List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+// doSend(ownerAppUserDtos, noticeDto, templateId, accessToken, weChatDto);
}
private void sendFloorOwner(NoticeDto noticeDto, String templateId, String accessToken, SmallWeChatDto weChatDto) {
@@ -325,35 +344,67 @@
}
private void sendAllOwner(NoticeDto noticeDto, String templateId, String accessToken, SmallWeChatDto weChatDto) {
- doSendToOpenId(noticeDto, templateId, accessToken, "", weChatDto);
- }
+ //鍒ゆ柇鍏虫敞琛ㄧ殑鐢ㄦ埛閲� 鏄惁澶т簬100浜�
+ WechatSubscribeDto wechatSubscribeDto = new WechatSubscribeDto();
+ wechatSubscribeDto.setAppId(weChatDto.getAppId());
+ wechatSubscribeDto.setOpenType(WechatSubscribeDto.OPEN_TYPE_WECHAT);
- private void doSend(List<OwnerAppUserDto> ownerAppUserDtos, NoticeDto noticeDto, String templateId, String accessToken, SmallWeChatDto weChatDto) {
- String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL") + "/#/pages/notice/detail/detail?noticeId=";
- ResponseEntity<String> responseEntity = null;
- String sendTemplate = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN,WechatConstant.SEND_TEMPLATE_URL);
- if(StringUtil.isEmpty(sendTemplate)){
+ int count = wechatSubscribeV1InnerServiceSMOImpl.queryWechatSubscribesCount(wechatSubscribeDto);
+
+ //鍙兘鍏紬鍙� 宸茬粡 浣跨敤浜嗗ソ涔� 浣嗘槸 绋嬪簭鍙兘鍒氬紑濮嬬敤
+ if (count < DEFAULT_SUBSCRIBE_PERSON) {
+ //doSendToOpenId(noticeDto, templateId, accessToken, "", weChatDto);
+ WechatSubscribePo tmpWechatSubscribePo = new WechatSubscribePo();
+ tmpWechatSubscribePo.setAppId(weChatDto.getAppId());
+ wechatSubscribeV1InnerServiceSMOImpl.deleteWechatSubscribe(tmpWechatSubscribePo);
+ getAllOpenId(accessToken, "", weChatDto);
+ }
+
+ List<WechatSubscribeDto> wechatSubscribeDtos = wechatSubscribeV1InnerServiceSMOImpl.queryDistinctWechatSubscribes(wechatSubscribeDto);
+
+ if (wechatSubscribeDtos == null || wechatSubscribeDtos.size() < 1) {
+ return;
+ }
+
+ String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL");
+ Miniprogram miniprogram = null;
+ if (wechatUrl.startsWith("https://") || wechatUrl.startsWith("http://")) {
+
+ } else {
+ miniprogram = new Miniprogram();
+ miniprogram.setAppid(wechatUrl);
+ }
+
+ String sendTemplate = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.SEND_TEMPLATE_URL);
+ if (StringUtil.isEmpty(sendTemplate)) {
sendTemplate = sendMsgUrl;
}
- for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
+ ResponseEntity<String> responseEntity = null;
+ for (WechatSubscribeDto wechatSubscribeDto1 : wechatSubscribeDtos) {
Date startTime = DateUtil.getCurrentDate();
+ Data data = new Data();
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
try {
- Data data = new Data();
templateMessage.setTemplate_id(templateId);
- templateMessage.setTouser(appUserDto.getOpenId());
+ templateMessage.setTouser(wechatSubscribeDto1.getOpenId());
data.setFirst(new Content(noticeDto.getTitle()));
data.setKeyword1(new Content(noticeDto.getTitle()));
data.setKeyword2(new Content(noticeDto.getStartTime()));
data.setKeyword3(new Content(StringUtil.delHtmlTag(noticeDto.getContext())));
data.setRemark(new Content("濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
templateMessage.setData(data);
- templateMessage.setUrl(wechatUrl + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId()+"&communityId="+noticeDto.getCommunityId());
- logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
- //responseEntity = outRestTemplate.postForEntity(sendTemplate + accessToken, JSON.toJSONString(templateMessage), String.class);
- PushWechatTemplateMessageThread pushWechatTemplateMessageThread = new PushWechatTemplateMessageThread(outRestTemplate,sendTemplate + accessToken, JSON.toJSONString(templateMessage));
+ if (!StringUtil.isEmpty(wechatUrl)) {
+ if (miniprogram == null) {
+ templateMessage.setUrl(wechatUrl + "/#/pages/notice/detail/detail?noticeId=" + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId() + "&communityId=" + noticeDto.getCommunityId());
+ } else {
+ miniprogram.setPagepath("/pages/notice/detail/detail?noticeId=" + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId() + "&communityId=" + noticeDto.getCommunityId());
+ templateMessage.setMiniprogram(miniprogram);
+ }
+ }
+ //骞跺彂澶勭悊
+ PushWechatTemplateMessageThread pushWechatTemplateMessageThread = new PushWechatTemplateMessageThread(outRestTemplate, sendTemplate + accessToken, JSON.toJSONString(templateMessage));
publicWeChatPushMessageTemplateJava110ThreadPoolFactory.submit(pushWechatTemplateMessageThread);
- logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
+ //responseEntity = outRestTemplate.postForEntity(sendTemplate + accessToken, JSON.toJSONString(templateMessage), String.class);
} catch (Exception e) {
LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
logSystemErrorPo.setErrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_errId));
@@ -362,14 +413,14 @@
saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
logger.error("鍙戦�佸け璐�", e);
} finally {
- doSaveLog(startTime, DateUtil.getCurrentDate(), "/pages/notice/detail/detail", JSON.toJSONString(templateMessage), responseEntity, appUserDto.getOpenId());
+ doSaveLog(startTime, DateUtil.getCurrentDate(), "/pages/notice/detail/detail", JSON.toJSONString(templateMessage), responseEntity, wechatSubscribeDto1.getOpenId());
}
}
}
- private void doSendToOpenId(NoticeDto noticeDto, String templateId, String accessToken, String nextOpenid, SmallWeChatDto weChatDto) {
- String url = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN,WechatConstant.GET_USER_URL);
- if(StringUtil.isEmpty(url)){
+ private void getAllOpenId(String accessToken, String nextOpenid, SmallWeChatDto weChatDto) {
+ String url = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.GET_USER_URL);
+ if (StringUtil.isEmpty(url)) {
url = getUser;
}
url = url.replace("ACCESS_TOKEN", accessToken);
@@ -395,47 +446,52 @@
JSONObject dataObj = paramOutObj.getJSONObject("data");
JSONArray openids = dataObj.getJSONArray("openid");
nextOpenid = paramOutObj.getString("next_openid");
- String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL");
- Miniprogram miniprogram = null;
- if (wechatUrl.startsWith("https://") || wechatUrl.startsWith("http://")) {
-
- } else {
- miniprogram = new Miniprogram();
- miniprogram.setAppid(wechatUrl);
+ List<WechatSubscribePo> wechatSubscribePos = new ArrayList<>();
+ for (int openIndex = 0; openIndex < openids.size(); openIndex++) {
+ String openId = openids.getString(openIndex);
+ WechatSubscribePo wechatSubscribePo = new WechatSubscribePo();
+ wechatSubscribePo.setAppId(weChatDto.getAppId());
+ wechatSubscribePo.setOpenId(openId);
+ wechatSubscribePo.setSubId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
+ wechatSubscribePo.setOpenType(WechatSubscribeDto.OPEN_TYPE_WECHAT);
+ wechatSubscribePos.add(wechatSubscribePo);
}
- String sendTemplate = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN,WechatConstant.SEND_TEMPLATE_URL);
- if(StringUtil.isEmpty(sendTemplate)){
+ if (wechatSubscribePos.size() > 0) {
+ wechatSubscribeV1InnerServiceSMOImpl.saveWechatSubscribes(wechatSubscribePos);
+ }
+
+ //锛堝叧娉ㄨ�呭垪琛ㄥ凡杩斿洖瀹屾椂锛岃繑鍥瀗ext_openid涓虹┖锛�
+ if (!StringUtil.isEmpty(nextOpenid)) {
+ getAllOpenId(accessToken, nextOpenid, weChatDto);
+ }
+ }
+
+ private void doSend(List<OwnerAppUserDto> ownerAppUserDtos, NoticeDto noticeDto, String templateId, String accessToken, SmallWeChatDto weChatDto) {
+ String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL") + "/#/pages/notice/detail/detail?noticeId=";
+ ResponseEntity<String> responseEntity = null;
+ String sendTemplate = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.SEND_TEMPLATE_URL);
+ if (StringUtil.isEmpty(sendTemplate)) {
sendTemplate = sendMsgUrl;
}
- ResponseEntity<String> responseEntity = null;
- for (int openIndex = 0; openIndex < openids.size(); openIndex++) {
+ for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
Date startTime = DateUtil.getCurrentDate();
- Data data = new Data();
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
- String openId = openids.getString(openIndex);
try {
+ Data data = new Data();
templateMessage.setTemplate_id(templateId);
- templateMessage.setTouser(openId);
+ templateMessage.setTouser(appUserDto.getOpenId());
data.setFirst(new Content(noticeDto.getTitle()));
data.setKeyword1(new Content(noticeDto.getTitle()));
data.setKeyword2(new Content(noticeDto.getStartTime()));
data.setKeyword3(new Content(StringUtil.delHtmlTag(noticeDto.getContext())));
data.setRemark(new Content("濡傛湁鐤戦棶璇疯仈绯荤浉鍏崇墿涓氫汉鍛�"));
templateMessage.setData(data);
- if (!StringUtil.isEmpty(wechatUrl)) {
- if (miniprogram == null) {
- templateMessage.setUrl(wechatUrl + "/#/pages/notice/detail/detail?noticeId=" + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId()+"&communityId="+noticeDto.getCommunityId());
- } else {
- miniprogram.setPagepath("/pages/notice/detail/detail?noticeId=" + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId()+"&communityId="+noticeDto.getCommunityId());
- templateMessage.setMiniprogram(miniprogram);
- }
- }
+ templateMessage.setUrl(wechatUrl + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId() + "&communityId=" + noticeDto.getCommunityId());
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
-
- PushWechatTemplateMessageThread pushWechatTemplateMessageThread = new PushWechatTemplateMessageThread(outRestTemplate,sendTemplate + accessToken, JSON.toJSONString(templateMessage));
- publicWeChatPushMessageTemplateJava110ThreadPoolFactory.submit(pushWechatTemplateMessageThread);
//responseEntity = outRestTemplate.postForEntity(sendTemplate + accessToken, JSON.toJSONString(templateMessage), String.class);
+ PushWechatTemplateMessageThread pushWechatTemplateMessageThread = new PushWechatTemplateMessageThread(outRestTemplate, sendTemplate + accessToken, JSON.toJSONString(templateMessage));
+ publicWeChatPushMessageTemplateJava110ThreadPoolFactory.submit(pushWechatTemplateMessageThread);
logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
} catch (Exception e) {
LogSystemErrorPo logSystemErrorPo = new LogSystemErrorPo();
@@ -445,13 +501,8 @@
saveSystemErrorSMOImpl.saveLog(logSystemErrorPo);
logger.error("鍙戦�佸け璐�", e);
} finally {
- doSaveLog(startTime, DateUtil.getCurrentDate(), "/pages/notice/detail/detail", JSON.toJSONString(templateMessage), responseEntity, openId);
+ doSaveLog(startTime, DateUtil.getCurrentDate(), "/pages/notice/detail/detail", JSON.toJSONString(templateMessage), responseEntity, appUserDto.getOpenId());
}
- }
-
- //锛堝叧娉ㄨ�呭垪琛ㄥ凡杩斿洖瀹屾椂锛岃繑鍥瀗ext_openid涓虹┖锛�
- if (!StringUtil.isEmpty(nextOpenid)) {
- doSendToOpenId(noticeDto, templateId, accessToken, nextOpenid, weChatDto);
}
}
--
Gitblit v1.8.0