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 |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 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 1565c5c..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,21 +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.dto.parkingAreaAttr.ParkingAreaAttrDto;
-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;
@@ -77,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));
@@ -89,11 +81,16 @@
                 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);
+        }
     }
 
     private void doSendParkingArea(Business business, JSONObject businessParkingArea) {

--
Gitblit v1.8.0