优化databus bug

service-job/src/main/java/com/java110/job/adapt/hcIot/car/AddCarBlackWhiteToIotAdapt.java

@@ -67,23 +67,30 @@ public class AddCarBlackWhiteToIotAdapt extends DatabusAdaptImpl {
     @Override
     public void execute(Business business, List<Business> businesses) {
         JSONObject data = business.getData();
+        JSONArray businessCarBlackWhites = new JSONArray();
         if (data.containsKey(CarBlackWhitePo.class.getSimpleName())) {
             Object bObj = data.get(CarBlackWhitePo.class.getSimpleName());
-            JSONArray businessCarBlackWhites = null;
+
             if (bObj instanceof JSONObject) {
-                businessCarBlackWhites = new JSONArray();
+
                 businessCarBlackWhites.add(bObj);
             } else if (bObj instanceof List) {
                 businessCarBlackWhites = JSONArray.parseArray(JSONObject.toJSONString(bObj));
             } else {
                 businessCarBlackWhites = (JSONArray) bObj;
             }
-            //JSONObject businessCarBlackWhite = data.getJSONObject("businessCarBlackWhite");
-            for (int bCarBlackWhiteIndex = 0; bCarBlackWhiteIndex < businessCarBlackWhites.size(); bCarBlackWhiteIndex++) {
-                JSONObject businessCarBlackWhite = businessCarBlackWhites.getJSONObject(bCarBlackWhiteIndex);
-                doSendCarBlackWhite(business, businessCarBlackWhite);
+
+        }else {
+            if (data instanceof JSONObject) {
+                businessCarBlackWhites.add(data);
             }
         }
+
+        //JSONObject businessCarBlackWhite = data.getJSONObject("businessCarBlackWhite");
+        for (int bCarBlackWhiteIndex = 0; bCarBlackWhiteIndex < businessCarBlackWhites.size(); bCarBlackWhiteIndex++) {
+            JSONObject businessCarBlackWhite = businessCarBlackWhites.getJSONObject(bCarBlackWhiteIndex);
+            doSendCarBlackWhite(business, businessCarBlackWhite);
+        }
     }
 
     private void doSendCarBlackWhite(Business business, JSONObject businessCarBlackWhite) {

service-job/src/main/java/com/java110/job/adapt/hcIot/car/AddCarOwnerToIotAdapt.java

@@ -89,23 +89,28 @@ public class AddCarOwnerToIotAdapt extends DatabusAdaptImpl {
     @Override
     public void execute(Business business, List<Business> businesses) {
         JSONObject data = business.getData();
+        JSONArray businessOwnerCars = new JSONArray();
         if (data.containsKey(OwnerCarPo.class.getSimpleName())) {
             Object bObj = data.get(OwnerCarPo.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);
-                doSendOwnerCar(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);
+            doSendOwnerCar(business, businessOwnerCar);
+        }
     }
 
     private void doSendOwnerCar(Business business, JSONObject businessOwnerCar) {

service-job/src/main/java/com/java110/job/adapt/hcIot/car/AddCarToIotAdapt.java

@@ -75,23 +75,29 @@ public class AddCarToIotAdapt extends DatabusAdaptImpl {
     @Override
     public void execute(Business business, List<Business> businesses) {
         JSONObject data = business.getData();
+        JSONArray businessOwnerCars = new JSONArray();
         if (data.containsKey(OwnerCarPo.class.getSimpleName())) {
             Object bObj = data.get(OwnerCarPo.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);
-                doSendOwnerCar(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);
+            doSendOwnerCar(business, businessOwnerCar);
+        }
     }
 
     private void doSendOwnerCar(Business business, JSONObject businessOwnerCar) {

service-job/src/main/java/com/java110/job/adapt/hcIot/car/DeleteCarBlackWhiteToIotAdapt.java

@@ -65,23 +65,27 @@ public class DeleteCarBlackWhiteToIotAdapt extends DatabusAdaptImpl {
     @Override
     public void execute(Business business, List<Business> businesses) {
         JSONObject data = business.getData();
+        JSONArray  businessCarBlackWhites = new JSONArray();
         if (data.containsKey(CarBlackWhitePo.class.getSimpleName())) {
             Object bObj = data.get(CarBlackWhitePo.class.getSimpleName());
-            JSONArray businessCarBlackWhites = null;
             if (bObj instanceof JSONObject) {
-                businessCarBlackWhites = new JSONArray();
                 businessCarBlackWhites.add(bObj);
             } else if (bObj instanceof List) {
                 businessCarBlackWhites = JSONArray.parseArray(JSONObject.toJSONString(bObj));
             } else {
                 businessCarBlackWhites = (JSONArray) bObj;
             }
-            //JSONObject businessCarBlackWhite = data.getJSONObject("businessCarBlackWhite");
-            for (int bCarBlackWhiteIndex = 0; bCarBlackWhiteIndex < businessCarBlackWhites.size(); bCarBlackWhiteIndex++) {
-                JSONObject businessCarBlackWhite = businessCarBlackWhites.getJSONObject(bCarBlackWhiteIndex);
-                doSendCarBlackWhite(business, businessCarBlackWhite);
+        }else {
+            if (data instanceof JSONObject) {
+                businessCarBlackWhites.add(data);
             }
         }
+
+        //JSONObject businessCarBlackWhite = data.getJSONObject("businessCarBlackWhite");
+        for (int bCarBlackWhiteIndex = 0; bCarBlackWhiteIndex < businessCarBlackWhites.size(); bCarBlackWhiteIndex++) {
+            JSONObject businessCarBlackWhite = businessCarBlackWhites.getJSONObject(bCarBlackWhiteIndex);
+            doSendCarBlackWhite(business, businessCarBlackWhite);
+        }
     }
 
     private void doSendCarBlackWhite(Business business, JSONObject businessCarBlackWhite) {

service-job/src/main/java/com/java110/job/adapt/hcIot/car/DeleteCarOwnerToIotAdapt.java

@@ -36,7 +36,6 @@ import com.java110.po.car.OwnerCarPo;
 import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -84,23 +83,30 @@ public class DeleteCarOwnerToIotAdapt extends DatabusAdaptImpl {
     @Override
     public void execute(Business business, List<Business> businesses) {
         JSONObject data = business.getData();
+        JSONArray businessOwnerCars = new JSONArray();
         if (data.containsKey(OwnerCarPo.class.getSimpleName())) {
             Object bObj = data.get(OwnerCarPo.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);
-                doSendOwnerCar(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);
+            doSendOwnerCar(business, businessOwnerCar);
+        }
     }
 
     private void doSendOwnerCar(Business business, JSONObject businessOwnerCar) {

service-job/src/main/java/com/java110/job/adapt/hcIot/car/DeleteCarToIotAdapt.java

@@ -70,23 +70,27 @@ public class DeleteCarToIotAdapt extends DatabusAdaptImpl {
     @Override
     public void execute(Business business, List<Business> businesses) {
         JSONObject data = business.getData();
+        JSONArray businessOwnerCars = new JSONArray();
         if (data.containsKey(OwnerCarPo.class.getSimpleName())) {
             Object bObj = data.get(OwnerCarPo.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);
-                doSendOwnerCar(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);
+            doSendOwnerCar(business, businessOwnerCar);
+        }
     }
 
     private void doSendOwnerCar(Business business, JSONObject businessOwnerCar) {

service-job/src/main/java/com/java110/job/adapt/hcIot/car/ModifyCarOwnerToIotAdapt.java

@@ -85,23 +85,29 @@ public class ModifyCarOwnerToIotAdapt extends DatabusAdaptImpl {
     @Override
     public void execute(Business business, List<Business> businesses) {
         JSONObject data = business.getData();
+        JSONArray  businessOwnerCars = new JSONArray();
         if (data.containsKey(OwnerCarPo.class.getSimpleName())) {
             Object bObj = data.get(OwnerCarPo.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);
-                doSendOwnerCar(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);
+            doSendOwnerCar(business, businessOwnerCar);
+        }
     }
 
     private void doSendOwnerCar(Business business, JSONObject businessOwnerCar) {

service-job/src/main/java/com/java110/job/adapt/hcIot/car/ModifyCarToIotAdapt.java

@@ -74,23 +74,28 @@ public class ModifyCarToIotAdapt extends DatabusAdaptImpl {
     @Override
     public void execute(Business business, List<Business> businesses) {
         JSONObject data = business.getData();
+        JSONArray businessOwnerCars = new JSONArray();
         if (data.containsKey(OwnerCarPo.class.getSimpleName())) {
             Object bObj = data.get(OwnerCarPo.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);
-                doSendOwnerCar(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);
+            doSendOwnerCar(business, businessOwnerCar);
+        }
     }
 
     private void doSendOwnerCar(Business business, JSONObject businessOwnerCar) {

service-job/src/main/java/com/java110/job/adapt/hcIot/machine/AddMachineToIotAdapt.java

@@ -93,23 +93,27 @@ public class AddMachineToIotAdapt extends DatabusAdaptImpl {
     @Override
     public void execute(Business business, List<Business> businesses) {
         JSONObject data = business.getData();
+        JSONArray  businessMachines = new JSONArray();
         if (data.containsKey(MachinePo.class.getSimpleName())) {
             Object bObj = data.get(MachinePo.class.getSimpleName());
-            JSONArray businessMachines = null;
             if (bObj instanceof JSONObject) {
-                businessMachines = new JSONArray();
                 businessMachines.add(bObj);
             } else if (bObj instanceof List) {
                 businessMachines = JSONArray.parseArray(JSONObject.toJSONString(bObj));
             } else {
                 businessMachines = (JSONArray) bObj;
             }
-            //JSONObject businessMachine = data.getJSONObject("businessMachine");
-            for (int bMachineIndex = 0; bMachineIndex < businessMachines.size(); bMachineIndex++) {
-                JSONObject businessMachine = businessMachines.getJSONObject(bMachineIndex);
-                doSendMachine(business, businessMachine);
+
+        }else {
+            if (data instanceof JSONObject) {
+                businessMachines.add(data);
             }
         }
+        //JSONObject businessMachine = data.getJSONObject("businessMachine");
+        for (int bMachineIndex = 0; bMachineIndex < businessMachines.size(); bMachineIndex++) {
+            JSONObject businessMachine = businessMachines.getJSONObject(bMachineIndex);
+            doSendMachine(business, businessMachine);
+        }
     }
 
     private void doSendMachine(Business business, JSONObject businessMachine) {

service-job/src/main/java/com/java110/job/adapt/hcIot/machine/DeleteMachineToIotAdapt.java

@@ -58,11 +58,10 @@ public class DeleteMachineToIotAdapt extends DatabusAdaptImpl {
     @Override
     public void execute(Business business, List<Business> businesses) {
         JSONObject data = business.getData();
+        JSONArray businessMachines = new JSONArray();
         if (data.containsKey(MachinePo.class.getSimpleName())) {
             Object bObj = data.get(MachinePo.class.getSimpleName());
-            JSONArray businessMachines = null;
             if (bObj instanceof JSONObject) {
-                businessMachines = new JSONArray();
                 businessMachines.add(bObj);
             } else if (bObj instanceof List) {
                 businessMachines = JSONArray.parseArray(JSONObject.toJSONString(bObj));
@@ -70,11 +69,16 @@ public class DeleteMachineToIotAdapt extends DatabusAdaptImpl {
                 businessMachines = (JSONArray) bObj;
             }
             //JSONObject businessMachine = data.getJSONObject("businessMachine");
-            for (int bMachineIndex = 0; bMachineIndex < businessMachines.size(); bMachineIndex++) {
-                JSONObject businessMachine = businessMachines.getJSONObject(bMachineIndex);
-                doSendMachine(business, businessMachine);
+
+        }else {
+            if (data instanceof JSONObject) {
+                businessMachines.add(data);
             }
         }
+        for (int bMachineIndex = 0; bMachineIndex < businessMachines.size(); bMachineIndex++) {
+            JSONObject businessMachine = businessMachines.getJSONObject(bMachineIndex);
+            doSendMachine(business, businessMachine);
+        }
     }
 
     private void doSendMachine(Business business, JSONObject businessMachine) {

service-job/src/main/java/com/java110/job/adapt/hcIot/machine/ModifyMachineToIotAdapt.java

@@ -70,23 +70,27 @@ public class ModifyMachineToIotAdapt extends DatabusAdaptImpl {
     @Override
     public void execute(Business business, List<Business> businesses) {
         JSONObject data = business.getData();
+        JSONArray businessMachines = new JSONArray();
         if (data.containsKey(MachinePo.class.getSimpleName())) {
             Object bObj = data.get(MachinePo.class.getSimpleName());
-            JSONArray businessMachines = null;
             if (bObj instanceof JSONObject) {
-                businessMachines = new JSONArray();
                 businessMachines.add(bObj);
             } else if (bObj instanceof List) {
                 businessMachines = JSONArray.parseArray(JSONObject.toJSONString(bObj));
             } else {
                 businessMachines = (JSONArray) bObj;
             }
-            //JSONObject businessMachine = data.getJSONObject("businessMachine");
-            for (int bMachineIndex = 0; bMachineIndex < businessMachines.size(); bMachineIndex++) {
-                JSONObject businessMachine = businessMachines.getJSONObject(bMachineIndex);
-                doSendMachine(business, businessMachine);
+
+        }else {
+            if (data instanceof JSONObject) {
+                businessMachines.add(data);
             }
         }
+        //JSONObject businessMachine = data.getJSONObject("businessMachine");
+        for (int bMachineIndex = 0; bMachineIndex < businessMachines.size(); bMachineIndex++) {
+            JSONObject businessMachine = businessMachines.getJSONObject(bMachineIndex);
+            doSendMachine(business, businessMachine);
+        }
     }
 
     private void doSendMachine(Business business, JSONObject businessMachine) {