From 0554d05a846e57bc83d49c83c545dfa0a260e32e Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Wed, 30 Oct 2024 17:46:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=95=B0=E6=8D=AE=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E6=8E=A5=E5=85=A5=E4=B8=80=E4=BD=93=E6=9C=BA=E6=9F=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zc/business/controller/DcDeviceController.java    | 3 ++-
 .../src/main/resources/mapper/business/DcDeviceMapper.xml      | 2 +-
 2 files 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 284807b8..15399965 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
@@ -1338,7 +1338,8 @@ public class DcDeviceController extends BaseController {
                     resultsMap.put("results", results);
                 }
                 if (UniversalEnum.THREE.getValue().equals(type) || UniversalEnum.SEVENTEEN.getValue().equals(type) ||
-                        UniversalEnum.FIFTEEN.getValue().equals(type)) { //气象预警/ups设备/太阳能板
+                        UniversalEnum.FIFTEEN.getValue().equals(type)||UniversalEnum.SEVENTEEN.getValue().equals(type)) {
+                    //气象预警/ups设备/太阳能板/一体机柜
                     JSONObject data = (JSONObject) ajaxResult.get("data");
                     JSONArray dataValue = (JSONArray) data.get("data");
                     List<JSONObject> jsonObjectList = dataValue.toJavaList(JSONObject.class);
diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
index 4a408d2a..86178157 100644
--- a/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml
@@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceName != null  and deviceName != ''">and device_name like concat('%', #{deviceName}, '%')</if>
             <if test="deviceType != null  and deviceType != ''">and device_type = #{deviceType} and iot_device_id is not null</if>
             <if test="deviceType == null  || deviceType == ''">
-            and (device_type=3||device_type=13||device_type=15||device_type=16) and iot_device_id is not null
+            and (device_type=3||device_type=13||device_type=15||device_type=16||device_type=17) and iot_device_id is not null
             </if>
         </where>
     </select>