区域报表修改

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/MonitorCommLedgerInfoDTO.java

@@ -25,6 +25,9 @@ public class MonitorCommLedgerInfoDTO implements Serializable {
 
     private String busBarName;
 
+    private String objName;
+
+
     private String voltageLevel;
 
     private String shortCapacity;

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/DeptLineMapper.xml

@@ -88,7 +88,9 @@
         voltage.name busBarname,
         pq_voltage.scale voltageLevel,
         bd.name bdName,
-        gd.name gdName
+        gd.name gdName,
+        supervision_user_report.project_name objName
+
         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
@@ -98,6 +100,7 @@
         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
+        left join supervision_user_report on lineDetail.Obj_Id = supervision_user_report.id
         where device.Dev_Model = 1
         and point.state = 1
         and device.Dev_Data_Type in

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/report/AreaHarmReportParam.java

@@ -17,4 +17,6 @@ public class AreaHarmReportParam {
 
     private String deptId;
 
+    private String scale;
+
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/report/impl/AreaHarmonicServiceImpl.java

@@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
@@ -132,7 +133,7 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
         tableList.add(new ArrayList<>());
 
         // 1. 台账表格
-        List<String[]> ledgerTable = buildLedgerTable(param.getDeptId());
+        List<String[]> ledgerTable = buildLedgerTable(param.getDeptId(),param.getScale());
         if(CollUtil.isEmpty(ledgerTable)){
             throw new BusinessException(CommonResponseEnum.FAIL,"当前部门不存在在运监测点");
         }
@@ -145,7 +146,7 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
         List<OverAreaLimitVO> qualityData = getPowerQualityData(param);
         if (CollUtil.isNotEmpty(qualityData)) {
             // 构建监控点名称映射
-            Map<String, String> monitorNameMap = buildMonitorNameMap(param.getDeptId());
+            Map<String, String> monitorNameMap = buildMonitorNameMap(param.getDeptId(),param.getScale());
 
             // 过滤有效数据（在线监控数>0）
             List<OverAreaLimitVO> validData = qualityData.stream()
@@ -176,8 +177,8 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
     /**
      * 构建台账表格
      */
-    private List<String[]> buildLedgerTable(String deptId) {
+    private List<String[]> buildLedgerTable(String deptId, String scale) {
-        List<MonitorCommLedgerInfoDTO> ledgerList = getLedgerInfo(deptId);
+        List<MonitorCommLedgerInfoDTO> ledgerList = getLedgerInfo(deptId,scale);
         if (CollUtil.isEmpty(ledgerList)) {
             return new ArrayList<>();
         }
@@ -190,7 +191,7 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
                     MonitorCommLedgerInfoDTO ledger = ledgerList.get(i);
                     return new String[]{
                             String.valueOf(i + 1),
-                            ledger.getMonitorName(),
+                            StringUtils.hasText(ledger.getObjName())? ledger.getObjName()+"_"+ledger.getMonitorName():ledger.getMonitorName(),
                             ledger.getBdName(),
                             ledger.getBusBarName(),
                             voltageLevelMap.getOrDefault(ledger.getVoltageLevel(), ""),
@@ -750,10 +751,14 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
     /**
      * 获取台账信息
      */
-    private List<MonitorCommLedgerInfoDTO> getLedgerInfo(String deptId) {
+    private List<MonitorCommLedgerInfoDTO> getLedgerInfo(String deptId, String scale) {
         DeptGetLineParam param = new DeptGetLineParam();
         param.setDeptId(deptId);
-        return commTerminalGeneralClient.deptGetLineInfo(param).getData();
+        List<MonitorCommLedgerInfoDTO> data = commTerminalGeneralClient.deptGetLineInfo(param).getData();
+        if(StringUtils.hasText(scale)){
+            data=data.stream().filter(temp->Objects.equals(scale,temp.getVoltageLevel())).collect(Collectors.toList());
+        }
+        return data;
     }
 
     /**
@@ -770,13 +775,14 @@ public class AreaHarmonicServiceImpl implements AreaHarmonicService {
     /**
      * 构建监控点名称映射
      */
-    private Map<String, String> buildMonitorNameMap(String deptId) {
+    private Map<String, String> buildMonitorNameMap(String deptId, String scale) {
-        List<MonitorCommLedgerInfoDTO> ledgerList = getLedgerInfo(deptId);
+        List<MonitorCommLedgerInfoDTO> ledgerList = getLedgerInfo(deptId, scale);
         return ledgerList.stream()
                 .collect(Collectors.toMap(
-                        MonitorCommLedgerInfoDTO::getMonitorId,
+                                MonitorCommLedgerInfoDTO::getMonitorId,
-                        MonitorCommLedgerInfoDTO::getMonitorName
+                            temp-> StringUtils.hasText(temp.getObjName())? temp.getObjName()+"_"+temp.getMonitorName():temp.getMonitorName()
-                ));
+
+                        ));
     }
 
     /**