diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceMapper.java index f5f283b7f..fae5c7785 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeviceMapper.java +++ b/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 { * 获取监测点台账信息 * @param list 监测点集合 * @param comFlag 状态 - * @param runFlag 状态 + * @param searchValue * @return 结果 */ - List getRunManageList(@Param("list") List list, @Param("comFlag")List comFlag, @Param("runFlag")List runFlag); + List getRunManageList(@Param("list") List list, + @Param("comFlag") List comFlag, + @Param("searchValue") String searchValue); /** * 获取监测点台账信息 @@ -57,12 +59,6 @@ public interface DeviceMapper extends BaseMapper { @Param("manufacturers") List manufacturer, @Param("searchValue") String searchValue); - /** - * 获取指定等级的装置 - * @author cdf - * @date 2023/2/10 - */ - List getDevByGrade(@Param("devId")List devIds,@Param("lineGrade") String lineGrade); List getOnlineEvaluate(@Param("list") List devIndexes, @Param("begin") String searchBeginTime, diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml index a019471aa..6a1ba250f 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml @@ -18,72 +18,71 @@ diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java index a228c5ec8..5bd425928 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java +++ b/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 getLineLedger(RunManageParam runManageParam) { DeviceInfoParam deviceInfoParam = new DeviceInfoParam(); @@ -77,8 +75,8 @@ public class RunManageServiceImpl implements RunManageService { List generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, runManageParam.getRunFlag(), Stream.of(1).collect(Collectors.toList())); List lineIndexes = generalDeviceDTOList.stream().flatMap(list->list.getLineIndexes().stream()).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(lineIndexes)) { - return deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(), runManageParam.getRunFlag()); - }else { + return deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(),runManageParam.getSearchValue()); + } else { throw new BusinessException(CommonResponseEnum.FAIL); } }