监测点台账信息优化

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceMapper.java

@@ -37,10 +37,12 @@ public interface DeviceMapper extends BaseMapper<Device> {
      * 获取监测点台账信息
      * @param list 监测点集合
      * @param comFlag 状态
-     * @param runFlag 状态
+     * @param searchValue
      * @return 结果
      */
-    List<RunManageVO> getRunManageList(@Param("list") List<String> list, @Param("comFlag")List<Integer> comFlag, @Param("runFlag")List<Integer> runFlag);
+    List<RunManageVO> getRunManageList(@Param("list") List<String> list,
+                                       @Param("comFlag") List<Integer> comFlag,
+                                       @Param("searchValue") String searchValue);
 
     /**
      * 获取监测点台账信息
@@ -57,12 +59,6 @@ public interface DeviceMapper extends BaseMapper<Device> {
                                         @Param("manufacturers") List<String> manufacturer,
                                         @Param("searchValue") String searchValue);
 
-    /**
-     * 获取指定等级的装置
-     * @author cdf
-     * @date 2023/2/10
-     */
-   List<String> getDevByGrade(@Param("devId")List<String> devIds,@Param("lineGrade") String lineGrade);
 
     List<LineInfluxDbOnlineVO> getOnlineEvaluate(@Param("list") List<String> devIndexes,
                                                  @Param("begin") String searchBeginTime,

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

@@ -82,8 +82,7 @@
                 over.Iharm_25 as iharm25,
                 over.InUharm_1 as inUharm,
                 over.InUharm_16 as inUharm16
-        FROM
+        FROM    pq_line line
-        pq_line line
         INNER JOIN pq_line vol ON vol.Id = line.Pid
         INNER JOIN pq_line dev ON dev.Id = vol.Pid
         INNER JOIN pq_line sub ON sub.Id = dev.Pid
@@ -102,18 +101,18 @@
         <foreach item="item" collection="list" open="(" separator="," close=")">
             #{item}
         </foreach>
-        <if test="runFlag == '' and type !=null">
+        <if test="comFlag.size()!=0">
-            and device.Run_Flag in
-            <foreach item="item1" collection="runFlag" open="(" separator="," close=")">
-                #{item1}
-            </foreach>
-        </if>
-        <if test="comFlag == '' and type !=null">
             and device.Com_Flag in
             <foreach item="item2" collection="comFlag" open="(" separator="," close=")">
                 #{item2}
             </foreach>
         </if>
+        <if test="searchValue != '' and searchValue != null ">
+            <bind name="searchValueLike" value="'%'+searchValue+'%'"/>
+            AND sub.NAME LIKE #{searchValueLike}
+            OR dev.name LIKE #{searchValueLike}
+            OR line.NAME LIKE #{searchValueLike}
+        </if>
         ORDER BY
         areaId.NAME
     </select>

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

@@ -68,8 +68,6 @@ public class RunManageServiceImpl implements RunManageService {
 
     private final LineDetailMapper lineDetailMapper;
 
-    private final InfluxDbUtils influxDbUtils;
-
     @Override
     public List<RunManageVO> getLineLedger(RunManageParam runManageParam) {
         DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
@@ -77,8 +75,8 @@ public class RunManageServiceImpl implements RunManageService {
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, runManageParam.getRunFlag(), Stream.of(1).collect(Collectors.toList()));
         List<String> lineIndexes = generalDeviceDTOList.stream().flatMap(list->list.getLineIndexes().stream()).collect(Collectors.toList());
         if (!CollectionUtils.isEmpty(lineIndexes)) {
-            return deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(), runManageParam.getRunFlag());
+            return deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(),runManageParam.getSearchValue());
-        }else {
+        } else {
             throw new BusinessException(CommonResponseEnum.FAIL);
         }
     }