From d33e2d4a6e82487532251e8ec6e32b06de442d9f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 07 八月 2023 21:57:27 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/adapt/oa/OaWorkflowDistributeOrder.java | 127 +++++++++---------------------------------
1 files changed, 27 insertions(+), 100 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/oa/OaWorkflowDistributeOrder.java b/service-job/src/main/java/com/java110/job/adapt/oa/OaWorkflowDistributeOrder.java
index 45adb93..a2f673c 100644
--- a/service-job/src/main/java/com/java110/job/adapt/oa/OaWorkflowDistributeOrder.java
+++ b/service-job/src/main/java/com/java110/job/adapt/oa/OaWorkflowDistributeOrder.java
@@ -3,16 +3,16 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.WechatFactory;
-import com.java110.dto.CommunityMemberDto;
+import com.java110.dto.community.CommunityMemberDto;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
-import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
-import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
-import com.java110.dto.staffAppAuth.StaffAppAuthDto;
-import com.java110.entity.order.Business;
-import com.java110.entity.wechat.Content;
-import com.java110.entity.wechat.Data;
-import com.java110.entity.wechat.PropertyFeeTemplateMessage;
+import com.java110.dto.oaWorkflow.OaWorkflowFormDto;
+import com.java110.dto.wechat.SmallWeChatDto;
+import com.java110.dto.wechat.SmallWechatAttrDto;
+import com.java110.dto.user.StaffAppAuthDto;
+import com.java110.dto.system.Business;
+import com.java110.dto.wechat.Content;
+import com.java110.dto.wechat.Data;
+import com.java110.dto.wechat.PropertyFeeTemplateMessage;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.community.IRepairInnerServiceSMO;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
@@ -23,11 +23,14 @@
import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
-import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
+import com.java110.job.msgNotify.MsgNotifyFactory;
+import com.java110.po.oaWorkflow.OaWorkflowDataPo;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import com.java110.core.log.LoggerFactory;
@@ -122,42 +125,6 @@
* @param communityMemberDto
*/
private void sendMsg(OaWorkflowDataPo oaWorkflowDataPo, CommunityMemberDto communityMemberDto) {
- //鏌ヨ鍏紬鍙烽厤缃�
- SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
- smallWeChatDto.setWeChatType("1100");
- smallWeChatDto.setObjType(SmallWeChatDto.OBJ_TYPE_COMMUNITY);
- smallWeChatDto.setObjId(communityMemberDto.getCommunityId());
- List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
- if (smallWeChatDto == null || smallWeChatDtos.size() <= 0) {
- logger.info("鏈厤缃井淇″叕浼楀彿淇℃伅,瀹氭椂浠诲姟鎵ц缁撴潫");
- return;
- }
- SmallWeChatDto weChatDto = smallWeChatDtos.get(0);
- SmallWechatAttrDto smallWechatAttrDto = new SmallWechatAttrDto();
- smallWechatAttrDto.setCommunityId(communityMemberDto.getCommunityId());
- smallWechatAttrDto.setWechatId(weChatDto.getWeChatId());
- smallWechatAttrDto.setSpecCd(SmallWechatAttrDto.SPEC_CD_WECHAT_OA_WORKFLOW_AUDIT_TEMPLATE);
- List<SmallWechatAttrDto> smallWechatAttrDtos = smallWechatAttrInnerServiceSMOImpl.querySmallWechatAttrs(smallWechatAttrDto);
- if (smallWechatAttrDtos == null || smallWechatAttrDtos.size() <= 0) {
- logger.info("鏈厤缃井淇″叕浼楀彿娑堟伅妯℃澘");
- return;
- }
- String templateId = smallWechatAttrDtos.get(0).getValue();
- String accessToken = WechatFactory.getAccessToken(weChatDto.getAppId(), weChatDto.getAppSecret());
- if (StringUtil.isEmpty(accessToken)) {
- logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}", accessToken);
- return;
- }
-
- String url = sendMsgUrl + accessToken;
- //鏍规嵁 userId 鏌ヨ鍒皁penId
- StaffAppAuthDto staffAppAuthDto = new StaffAppAuthDto();
- staffAppAuthDto.setStaffId(oaWorkflowDataPo.getStaffId());
- staffAppAuthDto.setAppType("WECHAT");
- List<StaffAppAuthDto> staffAppAuthDtos = staffAppAuthInnerServiceSMO.queryStaffAppAuths(staffAppAuthDto);
- if (staffAppAuthDtos == null || staffAppAuthDtos.size() < 1) {
- return;
- }
//鏌ヨ娴佺▼鏄惁瀛樺湪
OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
oaWorkflowDto.setStoreId(oaWorkflowDataPo.getStoreId());
@@ -181,68 +148,28 @@
paramMap.put("row", 1);
List<Map> formDatas = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowFormDatas(paramMap);
Assert.listOnlyOne(formDatas, "宸ュ崟鏁版嵁涓嶅瓨鍦�");
- String openId = staffAppAuthDtos.get(0).getOpenId();
- Data data = new Data();
- PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
- templateMessage.setTemplate_id(templateId);
- templateMessage.setTouser(openId);
- data.setFirst(new Content("鎮ㄦ湁鏂扮殑OA宸ュ崟锛屽伐鍗曚俊鎭涓嬶細"));
- data.setKeyword1(new Content(oaWorkflowDtos.get(0).getFlowName()));
- data.setKeyword2(new Content(formDatas.get(0).get("create_user_name").toString()));
- data.setKeyword3(new Content(formDatas.get(0).get("create_time").toString()));
- data.setKeyword4(new Content("璇疯繘鍏ュ伐鍗曟煡鐪�"));
- data.setRemark(new Content("璇峰強鏃剁櫥褰曞叕浼楀彿鎺ュ崟纭锛�"));
- templateMessage.setData(data);
- //鑾峰彇鍛樺伐鍏紬鍙峰湴鍧�
+
+ JSONObject content = new JSONObject();
+ content.put("flowName", oaWorkflowDtos.get(0).getFlowName());
+ content.put("create_user_name", formDatas.get(0).get("create_user_name").toString());
+ content.put("create_time", formDatas.get(0).get("create_time").toString());
+ content.put("date", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
- templateMessage.setUrl(wechatUrl);
- logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
- ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
- logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
+ content.put("url", wechatUrl);
+ MsgNotifyFactory.sendOaDistributeMsg(communityMemberDto.getCommunityId(), oaWorkflowDataPo.getStaffId(), content);
String createUserId = formDatas.get(0).get("create_user_id").toString();
if (createUserId.equals(oaWorkflowDataPo.getStaffId())) {
return;
}
- //缁欑敵璇蜂汉鍙戞秷鎭�
-
- //鏍规嵁 userId 鏌ヨ鍒皁penId
- staffAppAuthDto = new StaffAppAuthDto();
- staffAppAuthDto.setStaffId(createUserId);
- staffAppAuthDto.setAppType("WECHAT");
- staffAppAuthDtos = staffAppAuthInnerServiceSMO.queryStaffAppAuths(staffAppAuthDto);
- if (staffAppAuthDtos == null || staffAppAuthDtos.size() < 1) {
- return;
- }
-
- weChatDto = smallWeChatDtos.get(0);
- smallWechatAttrDto = new SmallWechatAttrDto();
- smallWechatAttrDto.setCommunityId(communityMemberDto.getCommunityId());
- smallWechatAttrDto.setWechatId(weChatDto.getWeChatId());
- smallWechatAttrDto.setSpecCd(SmallWechatAttrDto.SPEC_CD_WECHAT_OA_WORKFLOW_AUDIT_FINISH_TEMPLATE);
- smallWechatAttrDtos = smallWechatAttrInnerServiceSMOImpl.querySmallWechatAttrs(smallWechatAttrDto);
- if (smallWechatAttrDtos == null || smallWechatAttrDtos.size() <= 0) {
- logger.info("鏈厤缃井淇″叕浼楀彿娑堟伅妯℃澘");
- return;
- }
-
- openId = staffAppAuthDtos.get(0).getOpenId();
- data = new Data();
- templateMessage = new PropertyFeeTemplateMessage();
- templateMessage.setTemplate_id(templateId);
- templateMessage.setTouser(openId);
- data.setFirst(new Content("鎮ㄥソ锛屾偍鏈夋柊鐨勬祦绋嬪緟澶勭悊閫氱煡"));
- data.setKeyword1(new Content(oaWorkflowDtos.get(0).getFlowName()));
- data.setKeyword2(new Content(oaWorkflowDataPo.getStaffName()));
- data.setRemark(new Content("璇峰強鏃舵煡鐪嬶紒"));
- templateMessage.setData(data);
- //鑾峰彇鍛樺伐鍏紬鍙峰湴鍧�
+ //todo 缁欑敵璇蜂汉鍙戞秷鎭�
+ content = new JSONObject();
+ content.put("flowName", oaWorkflowDtos.get(0).getFlowName());
+ content.put("staffName", oaWorkflowDataPo.getStaffName());
wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
- templateMessage.setUrl(wechatUrl);
- logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
- responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
- logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
+ content.put("url", wechatUrl);
+ MsgNotifyFactory.sendOaCreateStaffMsg(communityMemberDto.getCommunityId(), createUserId, content);
}
}
--
Gitblit v1.8.0