From a40c2eb885bcdb697c2e16dae4f43cb6cd718973 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 22 一月 2024 11:28:03 +0800
Subject: [PATCH] 优化小区数据
---
service-job/src/main/java/com/java110/job/msgNotify/wechat/WechatMsgNotifyImpl.java | 133 ++++++++++++++++++++++++++------------------
1 files changed, 78 insertions(+), 55 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/msgNotify/wechat/WechatMsgNotifyImpl.java b/service-job/src/main/java/com/java110/job/msgNotify/wechat/WechatMsgNotifyImpl.java
index 321284b..07cacc4 100644
--- a/service-job/src/main/java/com/java110/job/msgNotify/wechat/WechatMsgNotifyImpl.java
+++ b/service-job/src/main/java/com/java110/job/msgNotify/wechat/WechatMsgNotifyImpl.java
@@ -2,15 +2,16 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.client.RestTemplate;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.mapping.Mapping;
-import com.java110.dto.mapping.MappingDto;
import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.dto.privilege.RoleCommunityDto;
import com.java110.dto.user.StaffAppAuthDto;
import com.java110.dto.wechat.Content;
-import com.java110.dto.wechat.Data;
import com.java110.dto.wechat.PropertyFeeTemplateMessage;
import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
+import com.java110.intf.user.IRoleCommunityV1InnerServiceSMO;
import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
import com.java110.job.msgNotify.IMsgNotify;
import com.java110.job.msgNotify.IWechatTemplate;
@@ -24,7 +25,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
import java.util.HashMap;
import java.util.List;
@@ -69,7 +69,6 @@
templateKeys.put(SPEC_CD_WECHAT_OA_WORKFLOW_AUDIT_FINISH_TEMPLATE, new String[]{"娴佺▼鍚嶇О", "娴佺▼鐘舵��"});
-
}
@Autowired
@@ -80,6 +79,8 @@
@Autowired
private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMOImpl;
+
+
@Autowired
private RestTemplate outRestTemplate;
@@ -118,9 +119,9 @@
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
templateMessage.setTemplate_id(templateId);
templateMessage.setTouser(openId);
- data.put("thing2",new Content("閫�璐圭敵璇峰鎵�"));
- data.put("time10",new Content(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B)));
- data.put("thing9",new Content(content.getString("name")));
+ data.put("thing2", new Content("閫�璐圭敵璇峰鎵�"));
+ data.put("time10", new Content(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B)));
+ data.put("thing9", new Content(content.getString("name")));
templateMessage.setData(data);
//鑾峰彇鍛樺伐鍏紬鍙峰湴鍧�
String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN, "STAFF_WECHAT_URL");
@@ -138,19 +139,19 @@
*
* @param communityId 灏忓尯
* @param userId 鐢ㄦ埛
- * @param content {
+ * @param contents [{
* "feeTypeName",
* "payerObjName",
* "billAmountOwed",
* "date",
* url
- * }
+ * }]
* @return
*/
@Override
- public ResultVo sendOweFeeMsg(String communityId, String userId,String ownerId, JSONObject content) {
+ public ResultVo sendOweFeeMsg(String communityId, String userId, String ownerId, List<JSONObject> contents) {
- if(StringUtil.isEmpty(userId) || userId.startsWith("-")){
+ if (StringUtil.isEmpty(userId) || userId.startsWith("-")) {
throw new IllegalArgumentException("涓氫富鏈粦瀹氾紝娌℃湁鑾峰彇鍒板井淇penId");
}
@@ -161,11 +162,15 @@
ownerAppUserDto.setAppType(OwnerAppUserDto.APP_TYPE_WECHAT);
ownerAppUserDto.setUserId(userId);
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
- if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
+ if (ownerAppUserDtos == null || ownerAppUserDtos.isEmpty()) {
throw new IllegalArgumentException("涓氫富鏈粦瀹氾紝娌℃湁鑾峰彇鍒板井淇penId");
}
String openId = ownerAppUserDtos.get(0).getOpenId();
+
+ if (StringUtil.isEmpty(openId) || openId.startsWith("-")) {
+ throw new IllegalArgumentException("娌℃湁鑾峰彇鍒板井淇penId");
+ }
Mapping mapping = MappingCache.getMapping(MappingConstant.WECHAT_DOMAIN, SPEC_CD_OWE_FEE_TEMPLATE);
if (mapping == null) {
@@ -174,22 +179,31 @@
String templateId = wechatTemplateImpl.getTemplateId(communityId, mapping.getValue(), mapping.getName(), templateKeys.get(SPEC_CD_OWE_FEE_TEMPLATE));
String url = sendMsgUrl + accessToken;
- JSONObject data = new JSONObject();
- PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
- templateMessage.setTemplate_id(templateId);
- templateMessage.setTouser(openId);
- data.put("thing2",new Content(content.getString("feeTypeName")));
- data.put("thing12",new Content(content.getString("payerObjName")));
- data.put("amount3",new Content(content.getString("billAmountOwed")));
- data.put("time19",new Content(content.getString("date")));
- templateMessage.setData(data);
- templateMessage.setUrl(content.getString("url"));
- logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
- ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
- logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
-
- JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
- return new ResultVo(paramOut.getIntValue("errcode"), paramOut.getString("errmsg"));
+ JSONObject paramOut = null;
+ for (JSONObject content : contents) {
+ JSONObject data = new JSONObject();
+ PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
+ templateMessage.setTemplate_id(templateId);
+ templateMessage.setTouser(openId);
+ data.put("thing2", new Content(content.getString("feeTypeName")));
+ String payerObjName = content.getString("payerObjName");
+ if (!StringUtil.isEmpty(payerObjName) && payerObjName.length() > 20) {
+ payerObjName = payerObjName.substring(0, 20);
+ }
+ data.put("thing12", new Content(payerObjName));
+ data.put("amount3", new Content(content.getString("billAmountOwed")));
+ data.put("time19", new Content(content.getString("date")));
+ templateMessage.setData(data);
+ templateMessage.setUrl(content.getString("url") + "&wAppId=" + wechatTemplateImpl.getAppId(communityId));
+ logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
+ ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
+ logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
+ paramOut = JSONObject.parseObject(responseEntity.getBody());
+ if (paramOut.getIntValue("errcode") != 0) {
+ return new ResultVo(paramOut.getIntValue("errcode"), paramOut.getString("errmsg"));
+ }
+ }
+ return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
}
@Override
@@ -222,16 +236,21 @@
if (staffAppAuthDtos == null || staffAppAuthDtos.size() < 1) {
throw new IllegalArgumentException("鍛樺伐鏈璇侊紝娌℃湁鑾峰彇鍒板井淇penId");
}
+
+
+
+
openId = staffAppAuthDtos.get(0).getOpenId();
}
JSONObject data = new JSONObject();
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
templateMessage.setTemplate_id(templateId);
templateMessage.setTouser(openId);
- data.put("thing2",new Content(content.getString("feeTypeCdName")));
- data.put("thing10",new Content(content.getString("payFeeRoom")));
- data.put("time18",new Content(content.getString("payFeeTime")));
- data.put("amount6",new Content(content.getString("receivedAmount")));
+ // data.put("thing2", new Content(content.getString("feeTypeCdName")));
+ data.put("thing2", new Content(content.getString("feeName")));
+ data.put("thing10", new Content(content.getString("payFeeRoom")));
+ data.put("time18", new Content(content.getString("payFeeTime")));
+ data.put("amount6", new Content(content.getString("receivedAmount")));
templateMessage.setData(data);
templateMessage.setUrl(content.getString("url"));
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
@@ -282,9 +301,13 @@
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
templateMessage.setTemplate_id(templateId);
templateMessage.setTouser(openId);
- data.put("thing8",new Content(content.getString("repairTypeName")));
- data.put("thing11",new Content(content.getString("repairObjName")));
- data.put("thing10",new Content(content.getString("repairName")));
+ data.put("thing8", new Content(content.getString("repairTypeName")));
+ data.put("thing11", new Content(content.getString("repairObjName")));
+ String context = content.getString("context");
+ if (!StringUtil.isEmpty(context) && context.length() > 20) {
+ context = context.substring(0, 20);
+ }
+ data.put("thing10", new Content(context));
templateMessage.setData(data);
templateMessage.setUrl(content.getString("url"));
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
@@ -333,10 +356,10 @@
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
templateMessage.setTemplate_id(templateId);
templateMessage.setTouser(openId);
- data.put("thing2",new Content(content.getString("repairName")));
- data.put("phone_number3",new Content(content.getString("tel")));
- data.put("time13",new Content(content.getString("time")));
- data.put("thing9",new Content(content.getString("address")));
+ data.put("thing7", new Content(content.getString("repairName")));
+ data.put("phone_number3", new Content(content.getString("tel")));
+ data.put("time13", new Content(content.getString("time")));
+ data.put("thing9", new Content(content.getString("address")));
templateMessage.setData(data);
templateMessage.setUrl(content.getString("url"));
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
@@ -386,9 +409,9 @@
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
templateMessage.setTemplate_id(templateId);
templateMessage.setTouser(openId);
- data.put("thing6",new Content(content.getString("name")));
- data.put("phone_number9",new Content(content.getString("tel")));
- data.put("time3",new Content(content.getString("time")));
+ data.put("thing6", new Content(content.getString("name")));
+ data.put("phone_number9", new Content(content.getString("tel")));
+ data.put("time3", new Content(content.getString("time")));
templateMessage.setData(data);
templateMessage.setUrl(content.getString("url"));
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
@@ -439,9 +462,9 @@
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
templateMessage.setTemplate_id(templateId);
templateMessage.setTouser(openId);
- data.put("thing9",new Content(content.getString("repairObjName")));
- data.put("thing10",new Content(content.getString("staffName")));
- data.put("time5",new Content(content.getString("time")));
+ data.put("thing9", new Content(content.getString("repairObjName")));
+ data.put("thing10", new Content(content.getString("staffName")));
+ data.put("time5", new Content(content.getString("time")));
templateMessage.setData(data);
templateMessage.setUrl(content.getString("url"));
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
@@ -477,9 +500,9 @@
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
templateMessage.setTemplate_id(templateId);
templateMessage.setTouser(openId);
- data.put("thing8",new Content(content.getString("repairTypeName")));
- data.put("thing11",new Content(content.getString("repairObjName")));
- data.put("thing10",new Content(content.getString("repairName")));
+ data.put("thing8", new Content(content.getString("repairTypeName")));
+ data.put("thing11", new Content(content.getString("repairObjName")));
+ data.put("thing10", new Content(content.getString("repairName")));
templateMessage.setData(data);
templateMessage.setUrl(content.getString("url"));
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
@@ -491,7 +514,7 @@
}
/**
- * oa 娴佺▼寰呭鎵归�氱煡
+ * oa 娴佺▼寰呭鎵归�氱煡
*
* @param communityId 灏忓尯
* @param userId 鐢ㄦ埛
@@ -528,9 +551,9 @@
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
templateMessage.setTemplate_id(templateId);
templateMessage.setTouser(openId);
- data.put("thing2",new Content(content.getString("flowName")));
- data.put("thing9",new Content(content.getString("create_user_name")));
- data.put("time10",new Content(content.getString("create_time")));
+ data.put("thing2", new Content(content.getString("flowName")));
+ data.put("thing9", new Content(content.getString("create_user_name")));
+ data.put("time10", new Content(content.getString("create_time")));
templateMessage.setData(data);
templateMessage.setUrl(content.getString("url"));
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
@@ -542,7 +565,7 @@
}
/**
- * oa 娴佺▼閫氱煡鍙戣捣浜�
+ * oa 娴佺▼閫氱煡鍙戣捣浜�
*
* @param communityId 灏忓尯
* @param userId 鐢ㄦ埛
@@ -578,8 +601,8 @@
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
templateMessage.setTemplate_id(templateId);
templateMessage.setTouser(openId);
- data.put("thing2",new Content(content.getString("flowName")));
- data.put("thing6",new Content(content.getString("staffName")));
+ data.put("thing2", new Content(content.getString("flowName")));
+ data.put("thing6", new Content(content.getString("staffName")));
templateMessage.setData(data);
templateMessage.setUrl(content.getString("url"));
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
--
Gitblit v1.8.0