From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-job/src/main/java/com/java110/job/adapt/applyRoomDiscount/MachineAdoptApplyRoomDiscountAdapt.java | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/applyRoomDiscount/MachineAdoptApplyRoomDiscountAdapt.java b/service-job/src/main/java/com/java110/job/adapt/applyRoomDiscount/MachineAdoptApplyRoomDiscountAdapt.java
index ad08da7..a916946 100755
--- a/service-job/src/main/java/com/java110/job/adapt/applyRoomDiscount/MachineAdoptApplyRoomDiscountAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/applyRoomDiscount/MachineAdoptApplyRoomDiscountAdapt.java
@@ -30,7 +30,7 @@
import com.java110.utils.cache.MappingCache;
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;
@@ -160,7 +160,7 @@
logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}", accessToken);
return;
}
- // 鏍规嵁鐗瑰畾鏉冮檺鏌ヨ 鏈夎鏉冮檺鐨� 鍛樺伐
+ // 鏍规嵁鐗瑰畾鏉冮檺鏌ヨ 鏈夎鏉冮檺鐨勫憳宸�
BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
basePrivilegeDto.setResource("/wechatHousingApproval");
List<UserDto> userDtos = privilegeInnerServiceSMO.queryPrivilegeUsers(basePrivilegeDto);
@@ -171,24 +171,27 @@
staffAppAuthDto.setStaffId(userDto.getUserId());
staffAppAuthDto.setAppType("WECHAT");
List<StaffAppAuthDto> staffAppAuthDtos = staffAppAuthInnerServiceSMO.queryStaffAppAuths(staffAppAuthDto);
- 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("绌虹疆鎴垮鐢宠锛屽鎵逛俊鎭涓嬶細"));
- data.setKeyword1(new Content(paramIn.getString("ardId")));
- data.setKeyword2(new Content("绌虹疆鎴跨敵璇�-瀹℃壒"));
- data.setKeyword3(new Content(paramIn.getString("createUserName")));
- data.setKeyword4(new Content(paramIn.getString("createUserName") + "鎻愪氦绌虹疆鎴跨敵璇烽渶瀹℃壒"));
- data.setKeyword5(new Content(paramIn.getString("stateName")));
- data.setRemark(new Content("璇峰強鏃跺鐞嗭紒"));
- templateMessage.setData(data);
- String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL");
- templateMessage.setUrl(wechatUrl);
- logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
- ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
- logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
+ if (staffAppAuthDtos != null && staffAppAuthDtos.size() > 0) {
+ 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("绌虹疆鎴垮鐢宠锛屽鎵逛俊鎭涓嬶細"));
+ data.setKeyword1(new Content(paramIn.getString("ardId")));
+ data.setKeyword2(new Content("绌虹疆鎴跨敵璇�-瀹℃壒"));
+ data.setKeyword3(new Content(paramIn.getString("createUserName")));
+ data.setKeyword4(new Content(paramIn.getString("createUserName") + "鎻愪氦绌虹疆鎴跨敵璇烽渶瀹℃壒"));
+ data.setKeyword5(new Content(paramIn.getString("stateName")));
+ data.setRemark(new Content("璇峰強鏃跺鐞嗭紒"));
+ templateMessage.setData(data);
+ //鑾峰彇鍛樺伐鍏紬鍙峰湴鍧�
+ 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);
+ logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
+ }
}
}
@@ -260,6 +263,7 @@
data.setKeyword3(new Content(paramIn.getString("checkRemark")));
data.setRemark(new Content("绌虹疆鎴跨敵璇烽獙鎴垮凡閫氳繃锛岀郴缁熷凡涓烘偍瀹夋帓涓嬩竴姝ュ鏍告祦绋嬶紝璇疯�愬績绛夊緟锛�"));
templateMessage.setData(data);
+ //鑾峰彇涓氫富鍏紬鍙峰湴鍧�
String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL");
templateMessage.setUrl(wechatUrl);
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
@@ -336,6 +340,7 @@
data.setKeyword3(new Content(paramIn.getString("checkRemark")));
data.setRemark(new Content("鎰熻阿鎮ㄧ殑浣跨敤锛屽鏈夌枒闂鑱旂郴鐩稿叧鐗╀笟浜哄憳銆�"));
templateMessage.setData(data);
+ //鑾峰彇涓氫富鍏紬鍙峰湴鍧�
String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL");
templateMessage.setUrl(wechatUrl);
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
--
Gitblit v1.8.0