From 25e98a9a3830c60231b44699753e9ec3ac024510 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Wed, 13 Nov 2024 17:19:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=BA=E6=9F=9C=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zc/business/controller/DcDeviceController.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
index 88b58a97..2e373453 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
@@ -1498,7 +1498,7 @@ private VideoController videoController;
         jsonObject.put("functions", functions);
       return batchInvokedFunction2(jsonObject);
     }
-    //一体机柜空调定时调用,采数据
+    //一体机柜定时调用,采数据
     //@PostMapping("/integratedCabinetAir")
     @Scheduled(cron = "0 11/10 * * * ?")
     public AjaxResult integratedCabinetAirConditioner() throws InterruptedException, IOException, HttpException {
@@ -1522,7 +1522,7 @@ private VideoController videoController;
         ArrayList functions = new ArrayList();
         for (int i = UniversalEnum.ONE.getNumber(); i <= UniversalEnum.FOUR.getNumber(); i++) {
             JSONObject function = new JSONObject();
-            if (i == 2 || i==1) {
+            if (i == 2 || i==1 ||i== 3) {
                 continue;
             }
             String valueOf = String.valueOf(i);
@@ -1535,6 +1535,7 @@ private VideoController videoController;
         jsonObject.put("functions", functions);
         return batchInvokedFunction2(jsonObject);
     }
+
     public AjaxResult batchInvokedFunction2(@RequestBody Map<String, Object> props) throws HttpException, IOException, InterruptedException {
         ArrayList<JSONObject> devices = (ArrayList<JSONObject>) props.get("devices");
         ArrayList<JSONObject> functions = (ArrayList<JSONObject>) props.get("functions");