diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/api/LineFeignClient.java b/pqs-device/device-api/src/main/java/com/njcn/device/api/LineFeignClient.java index 2fd3da825..54c8598ad 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/api/LineFeignClient.java +++ b/pqs-device/device-api/src/main/java/com/njcn/device/api/LineFeignClient.java @@ -219,6 +219,15 @@ public interface LineFeignClient { @PostMapping("getDeviceList") HttpResult> getDeviceList(); + /** + * 功能描述: 获取指定条件的监测点id(实际装置、投运、稳态或者双系统) + * @author xy + * @date 2022/7/8 14:24 + * @return 装置id集合 + */ + @PostMapping("getRunLineIdsList") + HttpResult> getRunLineIdsList(); + /** * 获取当前状态在线的监测点数量 * @param lineIds 监测点集合 @@ -239,4 +248,14 @@ public interface LineFeignClient { @PostMapping("getOnOrUnLine") HttpResult> getOnOrUnLine(@RequestBody LineBaseQueryParam lineBaseQueryParam); + /** + * 获取监测点设备id + * @param lineIds 监测点集合 + * @return 监测点设备id + * @author cdf + * @date 2022/8/1 + */ + @PostMapping("getOnLineDevLine") + HttpResult> getOnLineDevLine(@RequestBody List lineIds); + } diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/api/fallback/LineFeignClientFallbackFactory.java b/pqs-device/device-api/src/main/java/com/njcn/device/api/fallback/LineFeignClientFallbackFactory.java index d95b25540..73d168869 100644 --- a/pqs-device/device-api/src/main/java/com/njcn/device/api/fallback/LineFeignClientFallbackFactory.java +++ b/pqs-device/device-api/src/main/java/com/njcn/device/api/fallback/LineFeignClientFallbackFactory.java @@ -168,6 +168,12 @@ public class LineFeignClientFallbackFactory implements FallbackFactory> getRunLineIdsList() { + log.error("{}异常,降级处理,异常为:{}", "获取监测点Id集合: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + @Override public HttpResult getOnLineCount(List lineIds) { log.error("{}异常,降级处理,异常为:{}", "获取在线监测点数量异常: ", throwable.toString()); @@ -180,6 +186,12 @@ public class LineFeignClientFallbackFactory implements FallbackFactory> getOnLineDevLine(List lineIds) { + log.error("{}异常,降级处理,异常为:{}", "获取监测点设备id异常: ", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } + }; } diff --git a/pqs-device/device-api/src/main/java/com/njcn/device/pojo/dto/OnlineLineDTO.java b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/dto/OnlineLineDTO.java new file mode 100644 index 000000000..d977b9a2a --- /dev/null +++ b/pqs-device/device-api/src/main/java/com/njcn/device/pojo/dto/OnlineLineDTO.java @@ -0,0 +1,17 @@ +package com.njcn.device.pojo.dto; + +import lombok.Data; + +/** + * pqs + * + * @author cdf + * @date 2022/9/23 + */ +@Data +public class OnlineLineDTO { + + private String lineId; + + private String devId; +} diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/controller/LineController.java b/pqs-device/device-boot/src/main/java/com/njcn/device/controller/LineController.java index 3068114fa..453b790a3 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/controller/LineController.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/controller/LineController.java @@ -306,6 +306,14 @@ public class LineController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, lineMapper.getDeviceList(), methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getRunLineIdsList") + @ApiOperation("获取生成在线率的监测点Id") + public HttpResult> getRunLineIdsList() { + String methodDescribe = getMethodDescribe("getRunLineIdsList"); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, lineMapper.getRunLineIdsList(), methodDescribe); + } + /** * 获取当前状态在线的监测点数量 @@ -343,6 +351,21 @@ public class LineController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,idsRes, methodDescribe); } + /** + * 获取监测点设备id + * @param lineIds 监测点集合 + * @return 监测点设备id + * @author cdf + * @date 2022/8/1 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getOnLineDevLine") + @ApiOperation("获取当前状态在线的监测点数量") + @ApiImplicitParam(name = "lineIds", value = "监测点集合", required = true) + public HttpResult> getOnLineDevLine(@RequestBody List lineIds) { + String methodDescribe = getMethodDescribe("getOnLineDevLine"); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, lineMapper.getOnLineDevLine(lineIds), methodDescribe); + } } diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/LineMapper.java b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/LineMapper.java index bb6a9b00a..72be9b972 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/LineMapper.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/LineMapper.java @@ -7,13 +7,10 @@ import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.device.pojo.bo.BaseLineInfo; import com.njcn.device.pojo.bo.DeviceType; import com.njcn.device.pojo.bo.excel.TerminalBaseExcel; -import com.njcn.device.pojo.dto.OverLimitLineDTO; -import com.njcn.device.pojo.dto.PollutionLineDTO; -import com.njcn.device.pojo.dto.WarningSubstationDTO; +import com.njcn.device.pojo.dto.*; import com.njcn.device.pojo.param.DeviceInfoParam; import com.njcn.device.pojo.po.*; import com.njcn.device.pojo.vo.*; -import com.njcn.device.pojo.dto.PollutionSubstationDTO; import com.njcn.web.pojo.vo.LineDataVO; import org.apache.ibatis.annotations.Param; @@ -319,15 +316,32 @@ public interface LineMapper extends BaseMapper { */ List getDeviceList(); + /** + * 获取生成在线率的监测点Id + * @return 监测点Id + */ + List getRunLineIdsList(); + + /** * 获取当前状态在线的监测点数量 * @return Integer 在线监测点数量 */ Integer getOnLineCount(@Param("lineIds")List lineIds); + /** + * 获取监测点设备id + * @return Integer 监测点设备id + */ + List getOnLineDevLine(@Param("lineIds")List lineIds); + + /** * 获取当前状态在线和离线的监测点 * @return 在线或离线监测点ids */ List getOnOrUnLine(@Param("list")List lineIds,@Param("comFlag")Integer comFlag); + + + } diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineMapper.xml b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineMapper.xml index 6b58bbe1c..f71b75fb9 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineMapper.xml +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/LineMapper.xml @@ -902,6 +902,19 @@ FROM SELECT Id FROM pq_device WHERE Dev_Model = 1 AND Dev_Data_Type IN (1,2) AND Run_Flag = 0 + + + + + +