From 87298343ddc6f699cbca802ded881924deb9b018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Mon, 24 Jul 2023 19:23:26 +0800 Subject: [PATCH] =?UTF-8?q?pq=E5=8F=B0=E8=B4=A6=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pms/pojo/po/DistributionMonitor.java | 4 +++- .../device/pq/api/GeneralDeviceInfoClient.java | 12 +++++++++++- .../GeneralDeviceInfoClientFallbackFactory.java | 6 ++++++ .../com/njcn/device/pq/pojo/vo/AreaLineInfoVO.java | 3 +++ .../pq/controller/GeneralDeviceInfoController.java | 14 +++++++++++++- .../com/njcn/device/pq/mapper/DeptLineMapper.java | 2 +- .../device/pq/mapper/mapping/DeptLineMapper.xml | 6 +++++- .../njcn/device/pq/mapper/mapping/LineMapper.xml | 2 ++ .../njcn/device/pq/service/DeptLineService.java | 2 +- .../pq/service/impl/DeptLineServiceImpl.java | 4 ++-- .../pq/service/impl/GeneralDeviceService.java | 11 +++++++++-- 11 files changed, 56 insertions(+), 10 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java index 028066482..6e283f07a 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java @@ -2,6 +2,7 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.njcn.db.bo.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -26,12 +27,13 @@ public class DistributionMonitor extends BaseEntity { /** * 监测点类别(字典) */ + @MppMultiId private String monitorSort; /** * 监测点ID */ - @TableId + @MppMultiId private String monitorId; /** diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/GeneralDeviceInfoClient.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/GeneralDeviceInfoClient.java index fc0987855..a9f8be44b 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/GeneralDeviceInfoClient.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/GeneralDeviceInfoClient.java @@ -14,6 +14,7 @@ import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -116,10 +117,19 @@ public interface GeneralDeviceInfoClient { HttpResult> getOnlineRateByDevIds(@RequestBody OnlineRateParam param); /** - * + *根据单位获取投运监测点 * @author cdf * @date 2023/6/7 */ @PostMapping("/deptGetRunLine") HttpResult> deptGetRunLine(@RequestParam("deptId")String deptId); + + + /** + *根据单位获取投运监测点 + * @author cdf + * @date 2023/6/7 + */ + @GetMapping("/deptGetRunLineEvent") + HttpResult> deptGetRunLineEvent(@RequestParam("deptId")String deptId); } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/GeneralDeviceInfoClientFallbackFactory.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/GeneralDeviceInfoClientFallbackFactory.java index 3596d67f4..b8a9c401a 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/GeneralDeviceInfoClientFallbackFactory.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/GeneralDeviceInfoClientFallbackFactory.java @@ -92,6 +92,12 @@ public class GeneralDeviceInfoClientFallbackFactory implements FallbackFactory> deptGetRunLineEvent(String deptId) { + log.error("{}异常，降级处理，异常为：{}", "获取单位暂态系统投运监测点", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AreaLineInfoVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AreaLineInfoVO.java index f7b1ac159..fb13b0759 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AreaLineInfoVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AreaLineInfoVO.java @@ -17,6 +17,9 @@ public class AreaLineInfoVO implements Serializable { @ApiModelProperty(name = "lineId",value = "监测点id") private String lineId; + @ApiModelProperty(name = "num",value = "监测点线路编号") + private Integer num; + @ApiModelProperty(name = "lineName",value = "监测点名称") private String lineName; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java index 1ea373fcd..127a44140 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/GeneralDeviceInfoController.java @@ -279,13 +279,25 @@ public class GeneralDeviceInfoController extends BaseController { + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/deptGetRunLine") @ApiOperation("根据单位获取投运监测点") @ApiImplicitParam(name = "deptId", value = "单位部门索引", required = true) public HttpResult> deptGetRunLine(@RequestParam("deptId")String deptId) { String methodDescribe = getMethodDescribe("deptGetRunLine"); - List runLineIds = generalDeviceService.deptGetRunLine(deptId,Stream.of(0).collect(Collectors.toList())); + List runLineIds = generalDeviceService.deptGetRunLine(deptId,Stream.of(0).collect(Collectors.toList()),Stream.of(0,1,2).collect(Collectors.toList())); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,runLineIds,methodDescribe); + } + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/deptGetRunLineEvent") + @ApiOperation("根据单位获取暂态系统投运监测点") + @ApiImplicitParam(name = "deptId", value = "单位部门索引", required = true) + public HttpResult> deptGetRunLineEvent(@RequestParam("deptId")String deptId) { + String methodDescribe = getMethodDescribe("deptGetRunLineEvent"); + List runLineIds = generalDeviceService.deptGetRunLine(deptId,Stream.of(0).collect(Collectors.toList()),Stream.of(0,2).collect(Collectors.toList())); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,runLineIds,methodDescribe); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java index a2fd7056e..96476f0e0 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/DeptLineMapper.java @@ -75,5 +75,5 @@ public interface DeptLineMapper extends BaseMapper { List orgSubStationGet(@Param("list")List devType); - List getLineIdByDeptIds(@Param("deptIds")List deptIds,@Param("runFlag")List runFlag); + List getLineIdByDeptIds(@Param("deptIds")List deptIds,@Param("runFlag")List runFlag,@Param("dataType")List dataType); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml index 6e5d78116..0e69b2ddf 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml @@ -96,7 +96,11 @@ inner join pq_line voltage on point.pid = voltage.id inner join pq_line dev on voltage.pid = dev.id inner join pq_device device on dev.id = device.id - where Dev_Model = 1 + where device.Dev_Model = 1 + and device.Dev_Data_Type in + + #{item} + and device.run_flag in #{item} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 477b31ec0..7553bebcf 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -487,12 +487,14 @@ subscale.name subScale, pqdevice.IP ip, factory.`Name` manufacturer, + voltage.id voltageId, voltage.`Name` voltageName, scale.`Name` voltageScale, pqdevice.run_flag, pqdevice.com_flag, pqsubstation.Lng, pqsubstation.lat, + detail.num, detail.ct1, detail.ct2, detail.pt1, diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java index d2311f02a..dc02c655f 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/DeptLineService.java @@ -44,7 +44,7 @@ public interface DeptLineService extends IService { * @param ids 部门ids * @return 查询结果 */ - List getLineByDeptIds(List ids,List runFlag); + List getLineByDeptIds(List ids,List runFlag,List dataType); /** * 部门解除绑定监测点 diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java index 0dda45dc2..cf80609b4 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java @@ -61,8 +61,8 @@ public class DeptLineServiceImpl extends ServiceImpl i } @Override - public List getLineByDeptIds(List ids,List runFlag) { - return this.baseMapper.getLineIdByDeptIds(ids,runFlag); + public List getLineByDeptIds(List ids,List runFlag,List dataType) { + return this.baseMapper.getLineIdByDeptIds(ids,runFlag,dataType); } @Override diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java index 7fba854e0..83beefdc9 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java @@ -727,12 +727,19 @@ public class GeneralDeviceService { } - public List deptGetRunLine(String deptId,List runFlag) { + /** + * @param deptId 部门id + * @param runFlag 设备运行状态 0：投运 1.热备用 2.停运 + * @param dataType 系统 0：暂态系统；1：稳态系统；2：两个系统 + * @author cdf + * @date 2023/7/20 + */ + public List deptGetRunLine(String deptId,List runFlag,List dataType) { List deptDTOList = deptFeignClient.getDeptDescendantIndexes(deptId, Stream.of(0, 1).collect(Collectors.toList())).getData(); if (CollUtil.isNotEmpty(deptDTOList)) { List deptIds = deptDTOList.stream().map(DeptDTO::getId).distinct().collect(Collectors.toList()); - return deptLineService.getLineByDeptIds(deptIds,runFlag); + return deptLineService.getLineByDeptIds(deptIds,runFlag,dataType); } return new ArrayList<>(); }