设备数据分析接入一体机柜

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);

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>