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/hcIot/parkingArea/ModifyParkingAreaToIotAdapt.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/parkingArea/ModifyParkingAreaToIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/parkingArea/ModifyParkingAreaToIotAdapt.java
old mode 100644
new mode 100755
index 5aced21..b6ce38a
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/parkingArea/ModifyParkingAreaToIotAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/parkingArea/ModifyParkingAreaToIotAdapt.java
@@ -17,19 +17,13 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.communityLocation.CommunityLocationDto;
-import com.java110.dto.machine.MachineAttrDto;
-import com.java110.dto.machine.MachineDto;
import com.java110.dto.parking.ParkingAreaDto;
-import com.java110.entity.order.Business;
-import com.java110.intf.common.IMachineAttrInnerServiceSMO;
-import com.java110.intf.common.IMachineInnerServiceSMO;
-import com.java110.intf.community.ICommunityLocationInnerServiceSMO;
+import com.java110.dto.parking.ParkingAreaAttrDto;
+import com.java110.dto.system.Business;
+import com.java110.intf.community.IParkingAreaAttrInnerServiceSMO;
import com.java110.intf.community.IParkingAreaInnerServiceSMO;
-import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
-import com.java110.po.machine.MachinePo;
import com.java110.po.parking.ParkingAreaPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -54,6 +48,9 @@
@Autowired
private IParkingAreaInnerServiceSMO parkingAreaInnerServiceSMOImpl;
+ @Autowired
+ private IParkingAreaAttrInnerServiceSMO parkingAreaAttrInnerServiceSMOImpl;
+
@@ -72,11 +69,11 @@
@Override
public void execute(Business business, List<Business> businesses) {
JSONObject data = business.getData();
+ JSONArray businessParkingAreas = new JSONArray();
if (data.containsKey(ParkingAreaPo.class.getSimpleName())) {
Object bObj = data.get(ParkingAreaPo.class.getSimpleName());
- JSONArray businessParkingAreas = null;
if (bObj instanceof JSONObject) {
- businessParkingAreas = new JSONArray();
+
businessParkingAreas.add(bObj);
} else if (bObj instanceof List) {
businessParkingAreas = JSONArray.parseArray(JSONObject.toJSONString(bObj));
@@ -84,10 +81,15 @@
businessParkingAreas = (JSONArray) bObj;
}
//JSONObject businessParkingArea = data.getJSONObject("businessParkingArea");
- for (int bParkingAreaIndex = 0; bParkingAreaIndex < businessParkingAreas.size(); bParkingAreaIndex++) {
- JSONObject businessParkingArea = businessParkingAreas.getJSONObject(bParkingAreaIndex);
- doSendParkingArea(business, businessParkingArea);
+ }else {
+ if (data instanceof JSONObject) {
+
+ businessParkingAreas.add(data);
}
+ }
+ for (int bParkingAreaIndex = 0; bParkingAreaIndex < businessParkingAreas.size(); bParkingAreaIndex++) {
+ JSONObject businessParkingArea = businessParkingAreas.getJSONObject(bParkingAreaIndex);
+ doSendParkingArea(business, businessParkingArea);
}
}
@@ -102,11 +104,18 @@
Assert.listOnlyOne(parkingAreaDtos, "鏈壘鍒板仠杞﹀満");
+ //鏌ヨ灞炴��
+ ParkingAreaAttrDto parkingAreaAttrDto = new ParkingAreaAttrDto();
+ parkingAreaAttrDto.setPaId(parkingAreaDtos.get(0).getPaId());
+ parkingAreaAttrDto.setCommunityId(parkingAreaDtos.get(0).getCommunityId());
+ List<ParkingAreaAttrDto> parkingAreaAttrDtos = parkingAreaAttrInnerServiceSMOImpl.queryParkingAreaAttrs(parkingAreaAttrDto);
+
JSONObject postParameters = new JSONObject();
postParameters.put("num", parkingAreaDtos.get(0).getNum());
postParameters.put("extPaId", parkingAreaDtos.get(0).getPaId());
postParameters.put("extCommunityId", parkingAreaDtos.get(0).getCommunityId());
+ postParameters.put("attrs", parkingAreaAttrDtos);
hcParkingAreaAsynImpl.updateParkingArea(postParameters);
}
}
--
Gitblit v1.8.0