Merge remote-tracking branch 'origin/develop' into develop

zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java

@@ -1460,6 +1460,7 @@ public class DcDeviceController extends BaseController {
       return batchInvokedFunction2(jsonObject);
     }
     //一体机柜空调定时调用,采数据
+    //@PostMapping("/integratedCabinetAir")
     @Scheduled(cron = "0 11/10 * * * ?")
     public AjaxResult integratedCabinetAirConditioner() throws InterruptedException, IOException, HttpException {
         DcDevice dcDevice = new DcDevice();
@@ -1480,9 +1481,9 @@ public class DcDeviceController extends BaseController {
             }
         }
         ArrayList functions = new ArrayList();
-        for (int i = UniversalEnum.ONE.getNumber(); i <= UniversalEnum.THREE.getNumber(); i++) {
+        for (int i = UniversalEnum.ONE.getNumber(); i <= UniversalEnum.FOUR.getNumber(); i++) {
             JSONObject function = new JSONObject();
-            if (i == 2) {
+            if (i == 2 || i==1) {
                 continue;
             }
             String valueOf = String.valueOf(i);