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/floor/AddFloorToHcGovAdapt.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 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 b76944f..a0b0fae 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
@@ -17,11 +17,10 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.core.kafka.KafkaConsumerConfig;
-import com.java110.dto.UnitDto;
+import com.java110.dto.unit.UnitDto;
import com.java110.dto.community.CommunityAttrDto;
import com.java110.dto.community.CommunityDto;
-import com.java110.entity.order.Business;
+import com.java110.dto.system.Business;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.community.IUnitInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
@@ -29,16 +28,12 @@
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;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.PayUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
-import java.util.UUID;
/**
* 鏂板妤兼爧鍚屾HC鏀垮姟鎺ュ彛
@@ -66,24 +61,27 @@
@Override
public void execute(Business business, List<Business> businesses) {
JSONObject data = business.getData();
+ JSONArray businessOwnerCars = new JSONArray();
if (data.containsKey(FloorPo.class.getSimpleName())) {
Object bObj = data.get(FloorPo.class.getSimpleName());
- JSONArray businessOwnerCars = null;
if (bObj instanceof JSONObject) {
- businessOwnerCars = new JSONArray();
businessOwnerCars.add(bObj);
} else if (bObj instanceof List) {
businessOwnerCars = JSONArray.parseArray(JSONObject.toJSONString(bObj));
} else {
businessOwnerCars = (JSONArray) bObj;
}
- //JSONObject businessOwnerCar = data.getJSONObject("businessOwnerCar");
- for (int bOwnerCarIndex = 0; bOwnerCarIndex < businessOwnerCars.size(); bOwnerCarIndex++) {
- JSONObject businessOwnerCar = businessOwnerCars.getJSONObject(bOwnerCarIndex);
- if ("TRUE".equals(MappingCache.getValue(HcGovConstant.GOV_DOMAIN, HcGovConstant.GOV_SWITCH))) {
- doAddFloor(business, businessOwnerCar);
- }
+ }else {
+ if (data instanceof JSONObject) {
+ businessOwnerCars.add(data);
}
+ }
+
+ //JSONObject businessOwnerCar = data.getJSONObject("businessOwnerCar");
+ for (int bOwnerCarIndex = 0; bOwnerCarIndex < businessOwnerCars.size(); bOwnerCarIndex++) {
+ JSONObject businessOwnerCar = businessOwnerCars.getJSONObject(bOwnerCarIndex);
+ doAddFloor(business, businessOwnerCar);
+
}
}
@@ -94,7 +92,7 @@
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();
@@ -125,7 +123,7 @@
body.put("layerCount", layerCount);
body.put("unitCount", floorUse);
body.put("floorUse", tmpCommunityDto.getName() + "_浣忓畢");
- body.put("personName", "HC灏忓尯绠＄悊绯荤粺");
+ body.put("personName", "灏忓尯绠＄悊绯荤粺");
body.put("personLink", "18909711234");
JSONObject kafkaData = baseHcGovSendAsynImpl.createHeadersOrBody(body, extCommunityId, HcGovConstant.ADD_FLOOR_ACTION, HcGovConstant.COMMUNITY_SECURE);
--
Gitblit v1.8.0