From ea6e1675bbd411e30b21369698ed4b0587c21c0e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 08 五月 2021 13:45:34 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/task/wechat/WeChatPushMessageTemplate.java | 166 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 126 insertions(+), 40 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
old mode 100644
new mode 100755
index 6135025..58e65fa
--- 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
@@ -3,8 +3,11 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Synchronized;
import com.java110.core.factory.WechatFactory;
+import com.java110.core.smo.ISaveTransactionLogSMO;
import com.java110.dto.RoomDto;
+import com.java110.dto.app.AppDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.notice.NoticeDto;
import com.java110.dto.owner.OwnerAppUserDto;
@@ -23,7 +26,9 @@
import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.job.quartz.TaskSystemQuartz;
+import com.java110.po.transactionLog.TransactionLogPo;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.WechatConstant;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
@@ -65,6 +70,9 @@
@Autowired
private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
+ @Autowired
+ private ISaveTransactionLogSMO saveTransactionLogSMOImpl;
+
@Autowired
private RestTemplate outRestTemplate;
@@ -127,13 +135,7 @@
}
//
- NoticeDto noticeDto = new NoticeDto();
- noticeDto.setCommunityId(communityDto.getCommunityId());
- noticeDto.setPage(1);
- noticeDto.setRow(50);
- noticeDto.setState(NoticeDto.STATE_WAIT);
- noticeDto.setNoticeTypeCd(NoticeDto.NOTICE_TYPE_OWNER_WECHAT);
- List<NoticeDto> noticeDtos = noticeInnerServiceSMOImpl.queryNotices(noticeDto);
+ List<NoticeDto> noticeDtos = getNotices(communityDto.getCommunityId());
if (noticeDtos == null || noticeDtos.size() < 1) {
return;
@@ -149,6 +151,28 @@
}
+ @Java110Synchronized(value = "communityId")
+ private List<NoticeDto> getNotices(String communityId) {
+ NoticeDto noticeDto = new NoticeDto();
+ noticeDto.setCommunityId(communityId);
+ noticeDto.setPage(1);
+ noticeDto.setRow(50);
+ noticeDto.setState(NoticeDto.STATE_WAIT);
+ noticeDto.setNoticeTypeCd(NoticeDto.NOTICE_TYPE_OWNER_WECHAT);
+ List<NoticeDto> noticeDtos = noticeInnerServiceSMOImpl.queryNotices(noticeDto);
+
+ //鏇存柊涓哄彂閫佷腑
+ for (NoticeDto noticeDto1 : noticeDtos) {
+ noticeDto = new NoticeDto();
+ noticeDto.setNoticeId(noticeDto1.getNoticeId());
+ noticeDto.setState(NoticeDto.STATE_DOING);
+ noticeDto.setCommunityId(communityId);
+ noticeInnerServiceSMOImpl.updateNotice(noticeDto);
+ }
+
+ return noticeDtos;
+ }
+
private void doSentWechat(NoticeDto noticeDto, String templateId, String accessToken, SmallWeChatDto weChatDto) throws Exception {
Date startTime = DateUtil.getDateFromString(noticeDto.getStartTime(), DateUtil.DATE_FORMATE_STRING_A);
@@ -161,7 +185,7 @@
String objType = noticeDto.getObjType();
switch (objType) {
- case NoticeDto.OBJ_TYPE_COMMUNITY:
+ case NoticeDto.OBJ_TYPE_ALL:
sendAllOwner(noticeDto, templateId, accessToken, weChatDto);
break;
case NoticeDto.OBJ_TYPE_FLOOR:
@@ -173,6 +197,9 @@
case NoticeDto.OBJ_TYPE_ROOM:
sendRoomOwner(noticeDto, templateId, accessToken, weChatDto);
break;
+ case NoticeDto.OBJ_TYPE_COMMUNITY:
+ sendCommunityOwner(noticeDto, templateId, accessToken, weChatDto);
+ break;
}
NoticeDto tmpNoticeDto = new NoticeDto();
@@ -180,6 +207,14 @@
tmpNoticeDto.setState(NoticeDto.STATE_FINISH);
noticeInnerServiceSMOImpl.updateNotice(tmpNoticeDto);
+ }
+
+ private void sendCommunityOwner(NoticeDto noticeDto, String templateId, String accessToken, SmallWeChatDto weChatDto) {
+ 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);
}
private void sendFloorOwner(NoticeDto noticeDto, String templateId, String accessToken, SmallWeChatDto weChatDto) {
@@ -266,26 +301,42 @@
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;
+ }
for (OwnerAppUserDto appUserDto : ownerAppUserDtos) {
- Data data = new Data();
+ Date startTime = DateUtil.getCurrentDate();
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
- templateMessage.setTemplate_id(templateId);
- 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);
- templateMessage.setUrl(wechatUrl + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId());
- logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
- ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(sendMsgUrl + accessToken, JSON.toJSONString(templateMessage), String.class);
- logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
+ try {
+ Data data = new Data();
+ templateMessage.setTemplate_id(templateId);
+ 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);
+ templateMessage.setUrl(wechatUrl + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId());
+ logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
+ responseEntity = outRestTemplate.postForEntity(sendTemplate + accessToken, JSON.toJSONString(templateMessage), String.class);
+ logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
+ } catch (Exception e) {
+ logger.error("鍙戦�佸け璐�", e);
+ } finally {
+ doSaveLog(startTime, DateUtil.getCurrentDate(), "/pages/notice/detail/detail", JSON.toJSONString(templateMessage), responseEntity, appUserDto.getOpenId());
+ }
}
}
private void doSendToOpenId(NoticeDto noticeDto, String templateId, String accessToken, String nextOpenid, SmallWeChatDto weChatDto) {
- String url = getUser.replace("ACCESS_TOKEN", accessToken);
+ String url = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN,WechatConstant.GET_USER_URL);
+ if(StringUtil.isEmpty(url)){
+ url = getUser;
+ }
+ url = url.replace("ACCESS_TOKEN", accessToken);
if (!StringUtil.isEmpty(nextOpenid)) {
url += ("&next_openid=" + nextOpenid);
}
@@ -316,29 +367,42 @@
miniprogram = new Miniprogram();
miniprogram.setAppid(wechatUrl);
}
+
+ 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++) {
- String openId = openids.getString(openIndex);
+ Date startTime = DateUtil.getCurrentDate();
Data data = new Data();
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
- templateMessage.setTemplate_id(templateId);
- templateMessage.setTouser(openId);
- 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());
- } else {
- miniprogram.setPagepath("/pages/notice/detail/detail?noticeId=" + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId());
- templateMessage.setMiniprogram(miniprogram);
+ String openId = openids.getString(openIndex);
+ try {
+ templateMessage.setTemplate_id(templateId);
+ templateMessage.setTouser(openId);
+ 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());
+ } else {
+ miniprogram.setPagepath("/pages/notice/detail/detail?noticeId=" + noticeDto.getNoticeId() + "&wAppId=" + weChatDto.getAppId());
+ templateMessage.setMiniprogram(miniprogram);
+ }
}
+ logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
+ responseEntity = outRestTemplate.postForEntity(sendTemplate + accessToken, JSON.toJSONString(templateMessage), String.class);
+ logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
+ } catch (Exception e) {
+ logger.error("鍙戦�佸け璐�", e);
+ } finally {
+ doSaveLog(startTime, DateUtil.getCurrentDate(), "/pages/notice/detail/detail", JSON.toJSONString(templateMessage), responseEntity, openId);
}
- logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
- ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(sendMsgUrl + accessToken, JSON.toJSONString(templateMessage), String.class);
- logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
}
//锛堝叧娉ㄨ�呭垪琛ㄥ凡杩斿洖瀹屾椂锛岃繑鍥瀗ext_openid涓虹┖锛�
@@ -347,4 +411,26 @@
}
}
+ private void doSaveLog(Date startDate, Date endDate, String serviceCode, String reqJson, ResponseEntity<String> responseEntity, String userId) {
+ try {
+ TransactionLogPo transactionLogPo = new TransactionLogPo();
+ transactionLogPo.setAppId(AppDto.OWNER_WECHAT_PAY);
+ transactionLogPo.setCostTime((endDate.getTime() - startDate.getTime()) + "");
+ transactionLogPo.setIp("");
+ transactionLogPo.setServiceCode(serviceCode);
+ transactionLogPo.setSrcIp("127.0.0.1");
+ transactionLogPo.setState(responseEntity.getStatusCode() != HttpStatus.OK ? "F" : "S");
+ transactionLogPo.setTimestamp(DateUtil.getCurrentDate().getTime() + "");
+ transactionLogPo.setUserId(userId);
+ transactionLogPo.setTransactionId(userId);
+ transactionLogPo.setRequestHeader("");
+ transactionLogPo.setResponseHeader(responseEntity.getHeaders().toSingleValueMap().toString());
+ transactionLogPo.setRequestMessage(reqJson);
+ transactionLogPo.setResponseMessage(responseEntity.getBody());
+ saveTransactionLogSMOImpl.saveLog(transactionLogPo);
+ } catch (Exception e) {
+ logger.error("瀛樻棩蹇楀け璐�", e);
+ }
+ }
+
}
--
Gitblit v1.8.0