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/adapt/hcGov/visit/AddVisitAdapt.java | 307 ++++++++++++++++++++++++++++----------------------
1 files changed, 171 insertions(+), 136 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcGov/visit/AddVisitAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcGov/visit/AddVisitAdapt.java
index 28e3c29..21a7f71 100644
--- a/service-job/src/main/java/com/java110/job/adapt/hcGov/visit/AddVisitAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcGov/visit/AddVisitAdapt.java
@@ -5,34 +5,32 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.WechatFactory;
import com.java110.core.log.LoggerFactory;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.privilege.BasePrivilegeDto;
import com.java110.dto.community.CommunityDto;
-import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.dto.ownerCarAttr.OwnerCarAttrDto;
import com.java110.dto.parking.ParkingAreaDto;
import com.java110.dto.parking.ParkingSpaceDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
-import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
-import com.java110.dto.staffAppAuth.StaffAppAuthDto;
+import com.java110.dto.wechat.SmallWeChatDto;
+import com.java110.dto.wechat.SmallWechatAttrDto;
+import com.java110.dto.user.StaffAppAuthDto;
import com.java110.dto.user.UserDto;
import com.java110.dto.visit.VisitDto;
-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.intf.community.ICommunityInnerServiceSMO;
-import com.java110.intf.community.IParkingAreaInnerServiceSMO;
-import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
-import com.java110.intf.community.IVisitInnerServiceSMO;
+import com.java110.dto.visit.VisitSettingDto;
+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.*;
import com.java110.intf.order.IPrivilegeInnerServiceSMO;
import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
import com.java110.intf.user.*;
import com.java110.job.adapt.DatabusAdaptImpl;
-import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
import com.java110.po.owner.VisitPo;
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.StringUtil;
@@ -42,7 +40,6 @@
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
-import java.text.SimpleDateFormat;
import java.util.List;
/**
@@ -55,19 +52,7 @@
public class AddVisitAdapt extends DatabusAdaptImpl {
@Autowired
- private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
-
- @Autowired
- private IIotSendAsyn hcOwnerVisitAsynImpl;
-
- @Autowired
private IVisitInnerServiceSMO visitInnerServiceSMOImpl;
-
- @Autowired
- private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
-
- @Autowired
- private IOwnerCarAttrInnerServiceSMO ownerCarAttrInnerServiceSMOImpl;
@Autowired
private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
@@ -96,6 +81,15 @@
@Autowired
private RestTemplate outRestTemplate;
+ @Autowired
+ private IOwnerInnerServiceSMO ownerInnerServiceSMO;
+
+ @Autowired
+ private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMO;
+
+ @Autowired
+ private IVisitSettingV1InnerServiceSMO visitSettingV1InnerServiceSMOImpl;
+
private static Logger logger = LoggerFactory.getLogger(AddVisitAdapt.class);
//妯℃澘淇℃伅鎺ㄩ�佸湴鍧�
@@ -123,13 +117,11 @@
businessVisits.add(data);
}
}
-
for (int bVisitIndex = 0; bVisitIndex < businessVisits.size(); bVisitIndex++) {
JSONObject businessVisit = businessVisits.getJSONObject(bVisitIndex);
- if (businessVisit.containsKey("state") && !StringUtil.isEmpty(businessVisit.getString("state")) && businessVisit.getString("state").equals("0")) {
- publishMsg(business, businessVisit);
+ if (businessVisit.containsKey("carNum") && !StringUtil.isEmpty(businessVisit.getString("carNum"))) { //鏈夎溅杈�
+// publishMsg(business, businessVisit); //璁垮鐧昏缁欐湁棰勭害杞﹀鏍告潈闄愮殑鍛樺伐鎺ㄩ�佹秷鎭�
}
- doAddVisit(business, businessVisit);
}
}
@@ -140,17 +132,117 @@
* @param businessVisit
*/
private void publishMsg(Business business, JSONObject businessVisit) {
- VisitPo visitPo = BeanConvertUtil.covertBean(businessVisit, VisitPo.class);
+ VisitDto visitDto = new VisitDto();
+ visitDto.setvId(businessVisit.getString("vId"));
+ //鏌ヨ璁垮淇℃伅
+ List<VisitDto> visitDtos = visitInnerServiceSMOImpl.queryVisits(visitDto);
+ if (!StringUtil.isEmpty(visitDtos.get(0).getState()) && visitDtos.get(0).getState().equals("1")) { //璁垮瀹℃牳鐘舵�� 0琛ㄧず鏈鏍革紱1琛ㄧず瀹℃牳閫氳繃锛�2琛ㄧず瀹℃牳鎷掔粷锛�3琛ㄧず瀹℃牳涓�
+ return;
+ }
+ //鏌ヨ璁垮閰嶇疆淇℃伅
+ VisitSettingDto visitSettingDto = new VisitSettingDto();
+ visitSettingDto.setCommunityId(businessVisit.getString("communityId"));
+ List<VisitSettingDto> visitSettingDtos = visitSettingV1InnerServiceSMOImpl.queryVisitSettings(visitSettingDto);
+ if (visitSettingDtos == null || visitSettingDtos.size() != 1 || StringUtil.isEmpty(visitSettingDtos.get(0).getCarNumWay())
+ || !visitSettingDtos.get(0).getCarNumWay().equals("Y") || StringUtil.isEmpty(visitSettingDtos.get(0).getAuditWay())
+ || visitSettingDtos.get(0).getAuditWay().equals("Y")) { //璁垮閰嶇疆淇℃伅涓嶅瓨鍦紝鎴栬�呰瀹㈤厤缃俊鎭噷闈㈢殑杞﹁締涓嶅悓姝ワ紝鎴栬�呰瀹㈤厤缃瀹㈣褰曢渶瑕佹祦绋嬩汉瀹℃牳锛屽氨涓嶆帹閫佷俊鎭�
+ return;
+ }
+ //杞﹁締寰呭鏍哥姸鎬侊紝缁欐湁瀹℃牳鏉冮檺鐨勫憳宸ユ帹閫佹秷鎭�
+ if (!StringUtil.isEmpty(visitDtos.get(0).getCarState()) &&
+ (visitDtos.get(0).getCarState().equals("0") || visitDtos.get(0).getCarState().equals("3"))) { //杞﹁締瀹℃牳鐘舵�� 0琛ㄧず鏈鏍革紱1琛ㄧず瀹℃牳閫氳繃锛�2琛ㄧず瀹℃牳鎷掔粷锛�3瀹℃牳涓�
+ VisitPo visitPo = BeanConvertUtil.covertBean(businessVisit, VisitPo.class);
+ //鏌ヨ灏忓尯淇℃伅
+ CommunityDto communityDto = new CommunityDto();
+ communityDto.setCommunityId(visitPo.getCommunityId());
+ List<CommunityDto> communityDtos = communityInnerServiceSMO.queryCommunitys(communityDto);
+ Assert.listOnlyOne(communityDtos, "鏌ヨ灏忓尯閿欒锛�");
+ //鏌ヨ鍏紬鍙烽厤缃�
+ SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
+ smallWeChatDto.setWeChatType("1100");
+ smallWeChatDto.setObjType(SmallWeChatDto.OBJ_TYPE_COMMUNITY);
+ smallWeChatDto.setObjId(visitPo.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(visitPo.getCommunityId());
+ smallWechatAttrDto.setWechatId(weChatDto.getWeChatId());
+ smallWechatAttrDto.setSpecCd(SmallWechatAttrDto.SPEC_CD_WECHAT_PROCESS_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;
+ }
+ // 鏍规嵁鐗瑰畾鏉冮檺鏌ヨ 鏈夎鏉冮檺鐨� 鍛樺伐(棰勭害杞﹀鏍告潈闄�)
+ BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
+ basePrivilegeDto.setResource("/reviewVisitJurisdiction");
+ List<UserDto> userDtos = privilegeInnerServiceSMO.queryPrivilegeUsers(basePrivilegeDto);
+ String url = sendMsgUrl + accessToken;
+ //鏌ヨ涓氫富淇℃伅
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setOwnerId(visitPo.getOwnerId());
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
+ Assert.listOnlyOne(ownerDtos, "鏌ヨ涓氫富淇℃伅閿欒锛�");
+ for (UserDto userDto : userDtos) {
+ //鏍规嵁 userId 鏌ヨ鍒皁penId
+ StaffAppAuthDto staffAppAuthDto = new StaffAppAuthDto();
+ staffAppAuthDto.setStaffId(userDto.getUserId());
+ staffAppAuthDto.setAppType("WECHAT");
+ List<StaffAppAuthDto> staffAppAuthDtos = staffAppAuthInnerServiceSMO.queryStaffAppAuths(staffAppAuthDto);
+ 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(visitPo.getvId()));
+ data.setKeyword2(new Content("璁垮棰勭害杞﹁締-瀹℃牳"));
+ data.setKeyword3(new Content(ownerDtos.get(0).getName()));
+ data.setKeyword4(new Content(ownerDtos.get(0).getName() + "鎻愪氦鐨勮瀹㈤绾﹁溅杈�-" + visitPo.getCarNum() + "锛岄渶瑕佽繘琛岃溅杈嗗鏍搞��"));
+ data.setKeyword5(new Content("寰呭鏍�"));
+ data.setRemark(new Content("璇峰強鏃跺鐞嗭紒"));
+ templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
+ //鑾峰彇鍛樺伐鍏紬鍙峰湴鍧�
+ 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);
+ }
+ }
+ } else if (!StringUtil.isEmpty(visitDtos.get(0).getCarState()) && (visitDtos.get(0).getCarState().equals("1") || visitDtos.get(0).getCarState().equals("2"))) { //杞﹁締涓嶉渶瑕佸鏍革紝姝ゆ椂缁欎笟涓诲彂淇℃伅
+// sendMessage(visitDtos); //缁欎笟涓绘帹閫佹秷鎭�
+ }
+ }
+
+ /**
+ * 缁欎笟涓绘帹閫佹秷鎭�
+ *
+ * @param visitDtos
+ */
+ private void sendMessage(List<VisitDto> visitDtos) {
//鏌ヨ灏忓尯淇℃伅
CommunityDto communityDto = new CommunityDto();
- communityDto.setCommunityId(visitPo.getCommunityId());
+ communityDto.setCommunityId(visitDtos.get(0).getCommunityId());
List<CommunityDto> communityDtos = communityInnerServiceSMO.queryCommunitys(communityDto);
Assert.listOnlyOne(communityDtos, "鏌ヨ灏忓尯閿欒锛�");
//鏌ヨ鍏紬鍙烽厤缃�
SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
smallWeChatDto.setWeChatType("1100");
smallWeChatDto.setObjType(SmallWeChatDto.OBJ_TYPE_COMMUNITY);
- smallWeChatDto.setObjId(visitPo.getCommunityId());
+ smallWeChatDto.setObjId(visitDtos.get(0).getCommunityId());
List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
if (smallWeChatDto == null || smallWeChatDtos.size() <= 0) {
logger.info("鏈厤缃井淇″叕浼楀彿淇℃伅,瀹氭椂浠诲姟鎵ц缁撴潫");
@@ -158,9 +250,9 @@
}
SmallWeChatDto weChatDto = smallWeChatDtos.get(0);
SmallWechatAttrDto smallWechatAttrDto = new SmallWechatAttrDto();
- smallWechatAttrDto.setCommunityId(visitPo.getCommunityId());
+ smallWechatAttrDto.setCommunityId(visitDtos.get(0).getCommunityId());
smallWechatAttrDto.setWechatId(weChatDto.getWeChatId());
- smallWechatAttrDto.setSpecCd(SmallWechatAttrDto.SPEC_CD_WECHAT_PROCESS_TEMPLATE);
+ smallWechatAttrDto.setSpecCd(SmallWechatAttrDto.SPEC_CD_WECHAT_ROOM_STATE_TEMPLATE);
List<SmallWechatAttrDto> smallWechatAttrDtos = smallWechatAttrInnerServiceSMOImpl.querySmallWechatAttrs(smallWechatAttrDto);
if (smallWechatAttrDtos == null || smallWechatAttrDtos.size() <= 0) {
logger.info("鏈厤缃井淇″叕浼楀彿娑堟伅妯℃澘");
@@ -172,115 +264,58 @@
logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}", accessToken);
return;
}
- // 鏍规嵁鐗瑰畾鏉冮檺鏌ヨ 鏈夎鏉冮檺鐨� 鍛樺伐(棰勭害杞﹀鏍告潈闄�)
- BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
- basePrivilegeDto.setResource("/reviewVisitJurisdiction");
- List<UserDto> userDtos = privilegeInnerServiceSMO.queryPrivilegeUsers(basePrivilegeDto);
- String url = sendMsgUrl + accessToken;
- //鏌ヨ涓氫富淇℃伅
OwnerDto ownerDto = new OwnerDto();
- ownerDto.setOwnerId(visitPo.getOwnerId());
- List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
- Assert.listOnlyOne(ownerDtos, "鏌ヨ涓氫富淇℃伅閿欒锛�");
- for (UserDto userDto : userDtos) {
- //鏍规嵁 userId 鏌ヨ鍒皁penId
- StaffAppAuthDto staffAppAuthDto = new StaffAppAuthDto();
- staffAppAuthDto.setStaffId(userDto.getUserId());
- staffAppAuthDto.setAppType("WECHAT");
- List<StaffAppAuthDto> staffAppAuthDtos = staffAppAuthInnerServiceSMO.queryStaffAppAuths(staffAppAuthDto);
- 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(visitPo.getvId()));
- data.setKeyword2(new Content("璁垮棰勭害杞﹁締-瀹℃牳"));
- data.setKeyword3(new Content(ownerDtos.get(0).getName()));
- data.setKeyword4(new Content(ownerDtos.get(0).getName() + "鎻愪氦鐨勮瀹㈤绾﹁溅杈�-" + visitPo.getCarNum() + "锛岄渶瑕佽繘琛岃溅杈嗗鏍搞��"));
- data.setKeyword5(new Content("寰呭鏍�"));
- 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);
- }
- }
- }
-
- /**
- * 瀹℃牳閫氳繃棰勭害杞︿笅鍙�
- *
- * @param business
- * @param businessVisit
- */
- private void doAddVisit(Business business, JSONObject businessVisit) {
- VisitPo visitPo = BeanConvertUtil.covertBean(businessVisit, VisitPo.class);
- CommunityDto communityDto = new CommunityDto();
- communityDto.setCommunityId(visitPo.getCommunityId());
- List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
- Assert.listNotNull(communityDtos, "鏈寘鍚皬鍖轰俊鎭�");
-
- if (!StringUtil.isEmpty(visitPo.getState()) && visitPo.getState().equals("1")) { //鐘舵�佷负瀹℃牳閫氳繃
- VisitDto visitDto = new VisitDto();
- visitDto.setvId(visitPo.getvId());
- List<VisitDto> visits = visitInnerServiceSMOImpl.queryVisits(visitDto);
- Assert.listOnlyOne(visits, "璁垮淇℃伅涓嶅瓨鍦ㄦ垨瀛樺湪澶氭潯");
- if (!StringUtil.isEmpty(visits.get(0).getPsId())) {
+ ownerDto.setOwnerId(visitDtos.get(0).getOwnerId());
+ //1001 涓氫富鏈汉 1002 瀹跺涵鎴愬憳
+ ownerDto.setOwnerTypeCd("1001");
+ //鏌ヨ涓氫富
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMO.queryOwners(ownerDto);
+ Assert.listOnlyOne(ownerDtos, "涓氫富涓嶅瓨鍦紒");
+ //鑾峰緱鎴愬憳id
+ String memberId = ownerDtos.get(0).getMemberId();
+ OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+ ownerAppUserDto.setMemberId(memberId);
+ ownerAppUserDto.setAppType("WECHAT");
+ //鏌ヨ缁戝畾涓氫富
+ List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMO.queryOwnerAppUsers(ownerAppUserDto);
+ if (ownerAppUserDtos.size() > 0) {
+ //鑾峰彇openId
+ String openId = ownerAppUserDtos.get(0).getOpenId();
+ String url = sendMsgUrl + accessToken;
+ Data data = new Data();
+ PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
+ templateMessage.setTemplate_id(templateId);
+ templateMessage.setTouser(openId);
+ data.setFirst(new Content("鎮ㄦ彁浜ょ殑璁垮棰勭害杞﹁締-" + visitDtos.get(0).getCarNum() + "锛岀敵璇风粨鏋滃涓嬶細"));
+ data.setKeyword1(new Content("璁垮棰勭害杞﹁締-瀹℃牳"));
+ if (!StringUtil.isEmpty(visitDtos.get(0).getCarState()) && visitDtos.get(0).getCarState().equals("1")) { //瀹℃牳閫氳繃
+ data.setKeyword2(new Content("瀹℃牳閫氳繃"));
//鏌ヨ鍋滆溅浣�
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
- parkingSpaceDto.setPsId(visits.get(0).getPsId());
+ parkingSpaceDto.setPsId(visitDtos.get(0).getPsId());
List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
- Assert.listOnlyOne(parkingSpaceDtos, "璁垮鐧昏閫傞厤鍣�,鏌ヨ鍋滆溅浣嶉敊璇紒");
+ Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ鍋滆溅浣嶉敊璇紒");
//鏌ヨ鍋滆溅鍦�
ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
parkingAreaDto.setPaId(parkingSpaceDtos.get(0).getPaId());
List<ParkingAreaDto> parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
Assert.listOnlyOne(parkingAreaDtos, "鏌ヨ鍋滆溅鍦洪敊璇紒");
-
- //鏌ヨ杞﹁締淇℃伅
- OwnerCarDto ownerCarDto = new OwnerCarDto();
- ownerCarDto.setCarNum(visitPo.getCarNum());
- ownerCarDto.setCommunityId(visitPo.getCommunityId());
- List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
- Assert.listOnlyOne(ownerCarDtos, "鏈壘鍒拌溅杈�,鎴栧瓨鍦ㄥ鏉★紒");
-
- //鏌ヨ灞炴��
- OwnerCarAttrDto ownerCarAttrDto = new OwnerCarAttrDto();
- ownerCarAttrDto.setCarId(ownerCarDtos.get(0).getCarId());
- ownerCarAttrDto.setCommunityId(ownerCarDtos.get(0).getCommunityId());
- List<OwnerCarAttrDto> parkingAreaAttrDtos = ownerCarAttrInnerServiceSMOImpl.queryOwnerCarAttrs(ownerCarAttrDto);
-
- SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- JSONObject body = new JSONObject();
- body.put("vId", visits.get(0).getvId());
- body.put("vName", visits.get(0).getvName());
- body.put("visitGender", visits.get(0).getVisitGender());
- body.put("phoneNumber", visits.get(0).getPhoneNumber());
- body.put("userId", visits.get(0).getUserId());
- body.put("communityId", visits.get(0).getCommunityId());
- body.put("ownerId", visits.get(0).getOwnerId());
- body.put("visitCase", visits.get(0).getVisitCase());
- body.put("visitTime", df.format(ownerCarDtos.get(0).getStartTime()));
- body.put("departureTime", df.format(ownerCarDtos.get(0).getEndTime()));
- body.put("carNum", visits.get(0).getCarNum());
- body.put("entourage", visits.get(0).getEntourage());
- body.put("reasonType", visits.get(0).getReasonType());
- body.put("state", visits.get(0).getState());
- body.put("stateRemark", visits.get(0).getStateRemark());
- body.put("stateName", visits.get(0).getStateName());
- body.put("paId", parkingAreaDtos.get(0).getPaId());
- body.put("psId", parkingSpaceDtos.get(0).getPsId());
- body.put("extCarId", ownerCarDtos.get(0).getCarId());
- body.put("attrs", parkingAreaAttrDtos);
- body.put("extCommunityId", visits.get(0).getCommunityId());
- hcOwnerVisitAsynImpl.addVisit(body);
+ data.setKeyword3(new Content("璇峰皢杞﹁締(" + visitDtos.get(0).getCarNum() + ")鍋滄斁浜�" +
+ parkingAreaDtos.get(0).getNum() + "-" + parkingSpaceDtos.get(0).getNum() + "鍙峰仠杞︿綅锛�" + "鍋滆溅鍏嶈垂鏃堕棿鎴嚦鍒�" + visitDtos.get(0).getFreeTime()));
+ data.setRemark(new Content("璁垮棰勭害杞﹁締瀹℃牳宸查�氳繃锛岃鎮ㄥ悎鐞嗗畨鎺掑嚭琛岋紒"));
+ } else { //瀹℃牳涓嶉�氳繃
+ data.setKeyword2(new Content("瀹℃牳涓嶉�氳繃"));
+ data.setKeyword3(new Content(visitDtos.get(0).getStateRemark()));
+ data.setRemark(new Content("璁垮棰勭害杞﹁締瀹℃牳鏈�氳繃锛岃鎮ㄥ悎鐞嗗畨鎺掑嚭琛岋紒"));
}
+ templateMessage.setData(BeanConvertUtil.beanCovertJson(data));
+
+ //鑾峰彇涓氫富鍏紬鍙峰湴鍧�
+ String wechatUrl = UrlCache.getOwnerUrl();
+ templateMessage.setUrl(wechatUrl);
+ logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
+ ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
+ logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
}
}
-
}
--
Gitblit v1.8.0