From 32362f86aff6b987963343821d7775224c564fc4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 20 一月 2022 21:56:39 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-job/src/main/java/com/java110/job/adapt/Repair/MachineAddOwnerRepairAdapt.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/Repair/MachineAddOwnerRepairAdapt.java b/service-job/src/main/java/com/java110/job/adapt/Repair/MachineAddOwnerRepairAdapt.java
old mode 100644
new mode 100755
index ee05ef5..22779be
--- a/service-job/src/main/java/com/java110/job/adapt/Repair/MachineAddOwnerRepairAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/Repair/MachineAddOwnerRepairAdapt.java
@@ -3,6 +3,7 @@
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.basePrivilege.BasePrivilegeDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.repair.RepairDto;
@@ -22,9 +23,10 @@
import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
@@ -129,9 +131,17 @@
logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}", accessToken);
return;
}
+ //鏌ヨ灏忓尯鐗╀笟鍏徃
+ CommunityMemberDto communityMemberDto = new CommunityMemberDto();
+ communityMemberDto.setCommunityId(communityDto.getCommunityId());
+ communityMemberDto.setAuditStatusCd(CommunityMemberDto.AUDIT_STATUS_NORMAL);
+ communityMemberDto.setMemberTypeCd(CommunityMemberDto.MEMBER_TYPE_PROPERTY);
+ List<CommunityMemberDto> communityMemberDtos = communityInnerServiceSMO.getCommunityMembers(communityMemberDto);
+ Assert.listOnlyOne(communityMemberDtos, "灏忓尯娌℃湁 鐗╀笟鍏徃");
// 鏍规嵁鐗瑰畾鏉冮檺鏌ヨ 鏈夎鏉冮檺鐨� 鍛樺伐
BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
basePrivilegeDto.setResource("/wechatRepairRegistration");
+ basePrivilegeDto.setStoreId(communityMemberDtos.get(0).getMemberId());
List<UserDto> userDtos = privilegeInnerServiceSMO.queryPrivilegeUsers(basePrivilegeDto);
String url = sendMsgUrl + accessToken;
for (UserDto userDto : userDtos) {
@@ -140,7 +150,7 @@
staffAppAuthDto.setStaffId(userDto.getUserId());
staffAppAuthDto.setAppType("WECHAT");
List<StaffAppAuthDto> staffAppAuthDtos = staffAppAuthInnerServiceSMO.queryStaffAppAuths(staffAppAuthDto);
- if(staffAppAuthDtos == null || staffAppAuthDtos.size()<1){
+ if (staffAppAuthDtos == null || staffAppAuthDtos.size() < 1) {
continue;
}
String openId = staffAppAuthDtos.get(0).getOpenId();
@@ -158,7 +168,8 @@
data.setKeyword3(new Content(paramIn.getString("context")));
data.setRemark(new Content("璇锋偍鍙婃椂纭淇℃伅锛屽苟瀹夋帓鐩稿叧浜哄憳杩涜澶勭悊锛屾劅璋㈡偍鐨勪娇鐢紒"));
templateMessage.setData(data);
- String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL");
+ //鑾峰彇鍛樺伐鍏紬鍙峰湴鍧�
+ String wechatUrl = MappingCache.getValue("STAFF_WECHAT_URL");
templateMessage.setUrl(wechatUrl);
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
--
Gitblit v1.8.0