1.新增稳态区域报告功能

2026-01-08 13:52:09 +08:00
parent ed029139d3
commit b3ab5d2587
19 changed files with 1715 additions and 89 deletions
--- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java
+++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/CommTerminalGeneralClient.java
@@ -51,6 +51,10 @@ public interface CommTerminalGeneralClient {
    @PostMapping("deptGetLine")
    HttpResult<List<DeptGetChildrenMoreDTO>> deptGetLine(@RequestBody @Validated DeptGetLineParam deptGetLineParam);

+    @PostMapping("deptGetLineInfo")
+    HttpResult<List<MonitorCommLedgerInfoDTO>> deptGetLineInfo(@RequestBody @Validated DeptGetLineParam deptGetLineParam);
+
+
    @PostMapping("deptGetAllLine")
    HttpResult<List<DeptGetChildrenMoreDTO>> deptGetAllLine(@RequestBody @Validated DeptGetLineParam deptGetLineParam);

--- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java
+++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java
@@ -15,6 +15,7 @@ import com.njcn.device.biz.utils.DeviceEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;

 import java.util.List;
@@ -50,6 +51,13 @@ public class CommTerminalGeneralClientFallbackFactory implements FallbackFactory
                throw new BusinessException(finalExceptionEnum);
            }

+
+            @Override
+            public HttpResult<List<MonitorCommLedgerInfoDTO>> deptGetLineInfo(DeptGetLineParam deptGetLineParam) {
+                log.error("{}异常，降级处理，异常为：{}", "根据部门获取监测点信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
            @Override
            public HttpResult<List<DeptGetChildrenMoreDTO>> deptGetAllLine(DeptGetLineParam deptGetLineParam) {
                log.error("{}异常，降级处理，异常为：{}", "根据单位获取all监测点信息", throwable.toString());
--- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/MonitorCommLedgerInfoDTO.java
+++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/MonitorCommLedgerInfoDTO.java
@@ -0,0 +1,40 @@
+package com.njcn.device.biz.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2026-01-06
+ * @Description:
+ */
+@Data
+public class MonitorCommLedgerInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    private String monitorId;
+
+    private String monitorName;
+
+    private String gdName;
+
+    private String bdName;
+
+    private String busBarName;
+
+    private String voltageLevel;
+
+    private String shortCapacity;
+
+    private String devCapacity;
+
+    private String dealCapacity;
+
+    private String standardCapacity;
+
+    private Integer timeInterval;
+
+}
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java
@@ -15,6 +15,7 @@ import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
 import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.line.service.LineService;
 import com.njcn.device.line.mapper.LineDetailMapper;
+import com.njcn.device.biz.pojo.dto.MonitorCommLedgerInfoDTO;
 import com.njcn.device.pq.service.CommTerminalService;
 import com.njcn.device.pq.service.IPqsDeviceUnitService;
 import com.njcn.web.controller.BaseController;
@@ -108,6 +109,23 @@ public class CommTerminalController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
    }

+
+    /**
+     * 根据部门id获取部门监测点台账信息
+     * @param deptGetLineParam
+     * @return
+     */
+    @PostMapping("deptGetLineInfo")
+    @ApiOperation("根据部门id获取部门监测点台账信息")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiImplicitParam(name = "deptGetLineParam", value = "请求体", required = true)
+    public HttpResult<List<MonitorCommLedgerInfoDTO>> deptGetLineInfo(@RequestBody @Validated DeptGetLineParam deptGetLineParam) {
+        String methodDescribe = getMethodDescribe("deptGetLineInfo");
+        List<MonitorCommLedgerInfoDTO> result = commTerminalService.deptGetLineInfo(deptGetLineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
    @PostMapping("deptGetAllLine")
    @ApiOperation("根据单位获取监测点信息(all line)")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java
@@ -3,8 +3,8 @@ package com.njcn.device.pq.service;
 import com.njcn.device.biz.pojo.dto.*;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.device.biz.pojo.param.SubstationParam;
+import com.njcn.device.biz.pojo.dto.MonitorCommLedgerInfoDTO;
 import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam;
-import org.springframework.web.bind.annotation.RequestParam;

 import java.util.List;
 import java.util.Map;
@@ -40,6 +40,9 @@ public interface CommTerminalService {
     */
    List<DeptGetChildrenMoreDTO> deptGetLine(DeptGetLineParam deptGetLineParam);

+
+    List<MonitorCommLedgerInfoDTO> deptGetLineInfo(DeptGetLineParam deptGetLineParam);
+
    List<DeptGetChildrenMoreDTO> deptGetAllLine(DeptGetLineParam deptGetLineParam);

    List<LineDevGetDTO> deptGetLineByIdList(List<String> monitorIds);
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
@@ -11,9 +11,10 @@ import com.njcn.common.utils.EnumUtils;
 import com.njcn.device.biz.pojo.dto.*;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.device.biz.pojo.param.SubstationParam;
+import com.njcn.device.line.mapper.DeptLineMapper;
 import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.line.service.DeptLineService;
-import com.njcn.device.pq.enums.RunFlagEnum;
+import com.njcn.device.biz.pojo.dto.MonitorCommLedgerInfoDTO;
 import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam;
 import com.njcn.device.pq.service.CommTerminalService;
 import com.njcn.redis.utils.RedisUtil;
@@ -49,6 +50,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
    private final RedisUtil redisUtil;

    private final LineMapper lineMapper;
+    private final DeptLineMapper deptLineMapper;


    /**
@@ -59,10 +61,6 @@ public class CommTerminalServiceImpl implements CommTerminalService {
     */
    @Override
    public List<DeptGetBase> getDeptChildrenByParent(DeptGetLineParam deptGetLineParam) {
-        /*List<DeptGetBase> redisResult = (List<DeptGetBase>) redisUtil.getObjectByKey(commTerminal + deptGetLineParam.getDeptId());
-        if (CollectionUtil.isNotEmpty(redisResult)) {
-            return redisResult;
-        }*/
        List<DeptGetBase> result = new ArrayList<>();
        List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(deptGetLineParam.getDeptId(), Stream.of(0, 1).collect(Collectors.toList())).getData();
        deptDTOList.forEach(it -> {
@@ -119,6 +117,13 @@ public class CommTerminalServiceImpl implements CommTerminalService {
        return result;
    }

+    @Override
+    public List<MonitorCommLedgerInfoDTO> deptGetLineInfo(DeptGetLineParam deptGetLineParam) {
+        List<String> deptIds = deptFeignClient.getDepSonIdtByDeptId(deptGetLineParam.getDeptId()).getData();
+        List<MonitorCommLedgerInfoDTO> ledgerList = deptLineMapper.getMonitorByDeptIds(Stream.of(2).collect(Collectors.toList()),deptIds);
+        return ledgerList;
+    }
+
    @Override
    public List<DeptGetChildrenMoreDTO> deptGetAllLine(DeptGetLineParam deptGetLineParam) {
        List<DeptGetChildrenMoreDTO> result = new ArrayList<>();
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/DeptLineMapper.java
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/DeptLineMapper.java
@@ -6,6 +6,7 @@ import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
 import com.njcn.device.biz.pojo.dto.SubGetBase;
 import com.njcn.device.biz.pojo.dto.TerminalGetBase;
 import com.njcn.device.biz.pojo.param.SubstationParam;
+import com.njcn.device.biz.pojo.dto.MonitorCommLedgerInfoDTO;
 import com.njcn.device.pq.pojo.po.DeptLine;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -74,6 +75,9 @@ public interface DeptLineMapper extends BaseMapper<DeptLine> {

    List<LineDevGetDTO> lineDevGet(@Param("list")List<Integer> devType,@Param("type")Integer type,@Param("lineRunFlag") Integer lineRunFlag);

+    List<MonitorCommLedgerInfoDTO> getMonitorByDeptIds(@Param("list")List<Integer> devType,@Param("deptIds")List<String> deptIds);
+
+
    List<LineDevGetDTO> lineDevAllGet(@Param("list")List<Integer> devType,@Param("type")Integer type,@Param("lineRunFlag") Integer lineRunFlag, @Param("lineType") Integer lineType);

    List<TerminalGetBase> orgSubStationGet(@Param("list")List<Integer> devType);
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/DeptLineMapper.xml
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/DeptLineMapper.xml
@@ -74,6 +74,44 @@

    </select>

+
+
+    <select id="getMonitorByDeptIds" resultType="com.njcn.device.biz.pojo.dto.MonitorCommLedgerInfoDTO">
+        select
+        point.id monitorId,
+        point.name monitorName,
+        lineDetail.Time_Interval timeInterval,
+        lineDetail.Dev_Capacity devCapacity,
+        lineDetail.Short_Capacity shortCapacity,
+        lineDetail.Standard_Capacity standardCapacity,
+        lineDetail.Deal_Capacity dealCapacity,
+        voltage.name busBarname,
+        pq_voltage.scale voltageLevel,
+        bd.name bdName,
+        gd.name gdName
+        from pq_dept_line pq_dept_line
+        inner join pq_line point on pq_dept_line.line_id = point.id
+        inner join pq_line_detail lineDetail on point.id = lineDetail.id
+        inner join pq_line voltage on point.pid = voltage.id
+        inner join pq_voltage pq_voltage on voltage.id = pq_voltage.id
+        inner join pq_line dev on voltage.pid = dev.id
+        inner join pq_device device on dev.id = device.id
+        inner join pq_line bd on dev.pid = bd.id
+        inner join pq_line gd on bd.pid = gd.id
+        where device.Dev_Model = 1
+        and point.state = 1
+        and device.Dev_Data_Type in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and device.Run_Flag = 0
+        and pq_dept_line.id in
+        <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
+
    <select id="lineDevAllGet" resultType="com.njcn.device.biz.pojo.dto.LineDevGetDTO">
        select
        <!--监测点-->