1.冀北电网一张图bug修改

2.公共接口增加在线离线信息条件筛选

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/bo/DeviceType.java

@@ -34,4 +34,9 @@ public class DeviceType implements Serializable {
      * 数据类型（0：暂态系统；1：稳态系统；2：两个系统）
      */
     private List<Integer> dataType ;
+
+    /**
+     * 通讯状态（0：中断；1：正常）
+     */
+    private List<Integer> comFlag ;
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java

@@ -88,7 +88,12 @@ public class DeviceInfoParam implements Serializable {
     @ApiModelProperty("监测点等级")
     private String lineGrade;
 
-
+    /**
+     * 通讯状态（0：中断；1：正常）
+     */
+    @ApiModelProperty("通讯状态")
+    @Range(min = 0, max = 2, message = "通讯状态" + ValidMessage.PARAM_FORMAT_ERROR)
+    private Integer comFlag;
 
     /**
      * 默认全部监测点

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml

@@ -324,6 +324,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="deviceType.comFlag!=null and deviceType.comFlag.size()!=0">
+            AND t2.Com_Flag in
+            <foreach collection="deviceType.comFlag" open="(" close=")" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="manufacturer!=null and manufacturer.size()!=0">
             AND t2.manufacturer in
             <foreach collection="manufacturer" open="(" close=")" item="item" separator=",">

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java

@@ -3,6 +3,7 @@ package com.njcn.device.pq.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.njcn.common.pojo.dto.SimpleDTO;
@@ -319,6 +320,9 @@ public class GeneralDeviceService {
         } else {
             deviceType.setRunFlag(runFlag);
         }
+        if(ObjectUtil.isNotNull(deviceInfoParam.getComFlag())){
+            deviceType.setComFlag(Arrays.asList(deviceInfoParam.getComFlag()));
+        }
         filterDataType(deviceType, deviceInfoParam.getServerName());
 
         // 初始化部门筛选条件