From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-job/src/main/java/com/java110/job/adapt/hcGov/floor/AddFloorToHcGovAdapt.java | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcGov/floor/AddFloorToHcGovAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcGov/floor/AddFloorToHcGovAdapt.java
index 4e022bd..a0a305e 100644
--- a/service-job/src/main/java/com/java110/job/adapt/hcGov/floor/AddFloorToHcGovAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcGov/floor/AddFloorToHcGovAdapt.java
@@ -26,6 +26,7 @@
import com.java110.intf.community.IUnitInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.job.adapt.hcGov.HcGovConstant;
+import com.java110.job.adapt.hcGov.asyn.BaseHcGovSendAsyn;
import com.java110.po.floor.FloorPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.kafka.KafkaFactory;
@@ -37,6 +38,7 @@
import org.springframework.stereotype.Component;
import java.util.List;
+import java.util.UUID;
/**
* 鏂板妤兼爧鍚屾HC鏀垮姟鎺ュ彛
@@ -53,10 +55,11 @@
@Autowired
private IUnitInnerServiceSMO unitInnerServiceSMOImpl;
+ @Autowired
+ private BaseHcGovSendAsyn baseHcGovSendAsynImpl;
/**
- *
* @param business 褰撳墠澶勭悊涓氬姟
* @param businesses 鎵�鏈変笟鍔′俊鎭�
*/
@@ -78,6 +81,7 @@
for (int bOwnerCarIndex = 0; bOwnerCarIndex < businessOwnerCars.size(); bOwnerCarIndex++) {
JSONObject businessOwnerCar = businessOwnerCars.getJSONObject(bOwnerCarIndex);
doAddFloor(business, businessOwnerCar);
+
}
}
}
@@ -89,9 +93,11 @@
communityDto.setCommunityId(floorPo.getCommunityId());
List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
- Assert.listOnlyOne(communityDtos, "鏈寘鍚皬鍖轰俊鎭�");
+ Assert.listNotNull(communityDtos, "鏈寘鍚皬鍖轰俊鎭�");
CommunityDto tmpCommunityDto = communityDtos.get(0);
String extCommunityId = "";
+ String communityId = tmpCommunityDto.getCommunityId();
+ String floorId = floorPo.getFloorId();
for (CommunityAttrDto communityAttrDto : tmpCommunityDto.getCommunityAttrDtos()) {
if (HcGovConstant.EXT_COMMUNITY_ID.equals(communityAttrDto.getSpecCd())) {
@@ -102,34 +108,27 @@
unitDto.setFloorId(floorPo.getFloorId());
unitDto.setCommunityId(floorPo.getCommunityId());
List<UnitDto> unitDtos = unitInnerServiceSMOImpl.queryUnits(unitDto);
- Assert.listOnlyOne(unitDtos, "鏈寘鍚崟鍏冧俊鎭�");
+ String layerCount = "0";
+ String floorUse = "0";
+ if (unitDtos != null && unitDtos.size() > 0) {
+ layerCount = unitDtos.get(0).getLayerCount();
+ floorUse = unitDtos.size() + "";
+ }
JSONObject body = new JSONObject();
body.put("floorNum", floorPo.getFloorNum());
body.put("floorName", floorPo.getName());
- body.put("floorType", MappingCache.getValue(HcGovConstant.GOV_DOMAIN,HcGovConstant.FLOOR_TYPE));
+ body.put("floorType", MappingCache.getValue(HcGovConstant.GOV_DOMAIN, HcGovConstant.FLOOR_TYPE));
body.put("floorArea", floorPo.getFloorArea());
- body.put("layerCount", unitDtos.get(0).getLayerCount());
- body.put("unitCount", unitDtos.size());
- body.put("floorUse", tmpCommunityDto.getName()+"_浣忓畢");
- body.put("personName", "HC灏忓尯绠＄悊绯荤粺");
+ body.put("layerCount", layerCount);
+ body.put("unitCount", floorUse);
+ body.put("floorUse", tmpCommunityDto.getName() + "_浣忓畢");
+ body.put("personName", "灏忓尯绠＄悊绯荤粺");
body.put("personLink", "18909711234");
- JSONObject heard = new JSONObject();
- heard.put("serviceCode",HcGovConstant.ADD_FLOOR_ACTION);
- heard.put("extCommunityId",extCommunityId);
- heard.put("tranId", PayUtil.makeUUID(15));
- heard.put("reqTime",DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- HcGovConstant.generatorProducerSign(heard,body,HcGovConstant.COMMUNITY_SECURE);
- JSONObject kafkaData = new JSONObject();
- kafkaData.put("header",heard);
- kafkaData.put("body",body);
- try {
- KafkaFactory.sendKafkaMessage(HcGovConstant.GOV_TOPIC,kafkaData.toJSONString());
- } catch (Exception e) {
- e.printStackTrace();
- }
+ JSONObject kafkaData = baseHcGovSendAsynImpl.createHeadersOrBody(body, extCommunityId, HcGovConstant.ADD_FLOOR_ACTION, HcGovConstant.COMMUNITY_SECURE);
+ baseHcGovSendAsynImpl.sendKafka(HcGovConstant.GOV_TOPIC, kafkaData, communityId, floorId, HcGovConstant.COMMUNITY_SECURE);
}
}
--
Gitblit v1.8.0