bug修改

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/GeneratrixAndPowerStationDTO.java

@@ -47,6 +47,9 @@ public class GeneratrixAndPowerStationDTO implements Serializable {
     @ApiModelProperty(name = "powerName", value = "变电站名称")
     private String powerName;
 
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName;
+
     /**
      * 变电站电压等级
      */

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PmsGeneratrixWireMapper.xml

@@ -9,6 +9,7 @@
         pm.Org_Name AS orgName,
         pm.Powerr_Id AS powerId,
         pm.Powerr_Name AS powerName,
+        pm.org_name as orgName,
         pg.Generatrix_Id AS generatrixId,
         pm.Generatrix_Name AS generatrixName,
         pm.Id AS monitorId,
@@ -16,7 +17,7 @@
         pg.Scale AS generatrixVoltageLevel
         FROM
         pms_generatrix_wire AS pg
-        LEFT JOIN pms_monitor AS pm ON pm.Generatrix_wire_Id = pg.id
+        LEFT JOIN pms_monitor AS pm ON pm.line_id = pg.id
         WHERE
         pm.`Status` = 1
         AND pg.`Status` =1
@@ -32,7 +33,7 @@
             </foreach>
         </if>
         <if test="pmsGeneratrixParam.generatrixName != null and pmsGeneratrixParam.generatrixName != ''">
-            AND pm.Generatrix_wire_Name LIKE CONCAT('%',#{pmsGeneratrixParam.generatrixName},'%')
+            AND pm.line_nmae LIKE CONCAT('%',#{pmsGeneratrixParam.generatrixName},'%')
         </if>
     </select>
 
@@ -76,6 +77,7 @@
         pg.Scale AS generatrixVoltageLevel,
         pss.Power_Id AS powerId,
         pss.Power_Name AS powerName,
+        pss.org_name,
         pss.Voltage_Level AS powerVoltageLevel
         FROM
         pms_generatrix_wire AS pg

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsSummaryStatisticsServiceImpl.java

@@ -2,9 +2,13 @@ package com.njcn.device.pms.service.majornetwork.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
 import com.njcn.device.pms.mapper.majornetwork.MonitorMapper;
+import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
 import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
+import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
 import com.njcn.device.pms.pojo.param.PmsSummaryStatisticsParam;
 import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import com.njcn.device.pms.pojo.po.Monitor;
@@ -34,15 +38,31 @@ public class PmsSummaryStatisticsServiceImpl implements PmsSummaryStatisticsServ
     private final DeptFeignClient deptFeignClient;
     private final MonitorMapper monitorMapper;
     private final IPwMonitorService iPwMonitorService;
+    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;
 
     @Override
     public List<PmsSummaryStatisticsVO.SummaryVO> getSeparate(PmsSummaryStatisticsParam param) {
         List<PmsSummaryStatisticsVO.SummaryVO> vos = new ArrayList<>();
         //获取当前部门下的子部门
-        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getOrgId(), WebUtil.filterDeptType()).getData();
+
+        if (param.getType().equals(0)) {
+            PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam();
+            pmsDeviceInfoParam.setDeptIndex(param.getOrgId());
+            pmsDeviceInfoParam.setStatisticalType(new SimpleDTO());
+            List<PmsGeneralDeviceDTO> deptData = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData();
+            deptData.forEach(item -> {
+                PmsSummaryStatisticsVO.SummaryVO vo = new PmsSummaryStatisticsVO.SummaryVO();
+                vo.setName(item.getName());
+                vo.setMonitorCount(item.getMonitorIdList().size());
+                vo.setTerminalCount(item.getTerminalIdList().size());
+                vos.add(vo);
+            });
+        } else {
+            //获取当前部门下的子部门
+            List<DeptDTO> data = deptFeignClient.getDepSonDetailByDeptId(param.getOrgId()).getData();
 
             List<String> deptIds = data.stream().map(DeptDTO::getCode).collect(Collectors.toList());
-        Map<String, String> deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, DeptDTO::getName));
+
 
             //获得部门下面的数据集合
             List<Monitor> monitors = monitorMapper.selectList(new LambdaQueryWrapper<Monitor>()
@@ -50,31 +70,6 @@ public class PmsSummaryStatisticsServiceImpl implements PmsSummaryStatisticsServ
                     .in(CollectionUtil.isNotEmpty(param.getMonitorTags()), Monitor::getMonitorTag, param.getMonitorTags())
                     .eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode())
             );
-        if (param.getType().equals(0)) {
-            //根据部门进行分组统计当前部门下有多少监测点
-            Map<String, List<Monitor>> monitorsMonitorCount = monitors.stream().collect(Collectors.groupingBy(Monitor::getOrgId));
-            //根据部门统计终端数量(数据去重)
-            ArrayList<Monitor> monitorsCount = monitors.stream().collect(Collectors.collectingAndThen
-                    (Collectors.toCollection(() ->
-                            new TreeSet<>(Comparator.comparing(o -> o.getOrgId() + ";" + o.getTerminalId()))), ArrayList::new));
-            Map<String, Long> monitorsTerminalCount = monitorsCount.stream().collect(Collectors.groupingBy(Monitor::getOrgId, Collectors.counting()));
-            deptMap.forEach((key, value) -> {
-                PmsSummaryStatisticsVO.SummaryVO vo = new PmsSummaryStatisticsVO.SummaryVO();
-                if (monitorsMonitorCount.containsKey(key)) {
-                    vo.setName(value);
-                    vo.setMonitorCount(monitorsMonitorCount.get(key).size());
-                    vo.setTerminalCount(Math.toIntExact(monitorsTerminalCount.get(key)));
-
-                } else {
-                    vo.setName(value);
-                    //监测点数量
-                    vo.setMonitorCount(0);
-                    //设备数量
-                    vo.setTerminalCount(0);
-                }
-                vos.add(vo);
-            });
-        } else {
             //根据干扰源类型进行分组统计当前部门下有多少监测点
             Map<String, List<Monitor>> monitorsMonitorCount = monitors.stream().collect(Collectors.groupingBy(Monitor::getMonitorTag));
             //根据部门统计终端数量

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java

@@ -68,13 +68,28 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
             if (CollUtil.isEmpty(dto.getGeneratrixIdList())) {
                 continue;
             }
+
+            PmsGeneratrixParam pmsGeneratrixParam = new PmsGeneratrixParam();
+            pmsGeneratrixParam.setGeneratrixIds(dto.getGeneratrixIdList());
+            pmsGeneratrixParam.setPowerStationVoltageLevel(param.getVoltageLevel());
+            List<GeneratrixAndPowerStationDTO> dtoS = generatrixWireService.getGeneratrixAndPowerStationInfo(pmsGeneratrixParam);
+
             // 通过母线id查询变电站背景谐波年表
             List<RStatBusbarHarmonicYPO> info = rStatBusbarHarmonicMapper.getRStatBusbarHarmonic(param.getStartTime(), param.getEndTime(), dto.getGeneratrixIdList());
 
-            for (RStatBusbarHarmonicYPO po : info) {
+
+
+            for (GeneratrixAndPowerStationDTO generatrixAndPowerStationDTO : dtoS) {
+                boolean flag = false;
                 RStatBusbarHarmonicYVO vo = new RStatBusbarHarmonicYVO();
-                vo.setDeptId(dto.getIndex());
+                vo.setBusbarName(generatrixAndPowerStationDTO.getGeneratrixName());
-                vo.setDeptName(dto.getName());
+                vo.setSubId(generatrixAndPowerStationDTO.getPowerId());
+                vo.setSubName(generatrixAndPowerStationDTO.getPowerName());
+                vo.setSubVoltageLevel(generatrixAndPowerStationDTO.getPowerVoltageLevel());
+                vo.setDeptName(generatrixAndPowerStationDTO.getOrgName());
+                for (RStatBusbarHarmonicYPO po : info) {
+                    if (generatrixAndPowerStationDTO.getGeneratrixId().equals(po.getBusbarId())){
+                        flag = true;
                         vo.setBusbarId(po.getBusbarId());
                         vo.setDataDate(po.getDataDate());
                         vo.setVEffectiveMax(po.getVEffectiveMax());
@@ -93,25 +108,21 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl<RStatBusbarHarmo
                         vo.setFlickerMin(po.getFlickerMin());
                         vo.setFlickerAvg(po.getFlickerAvg());
                         vo.setFlicker95(po.getFlicker95());
+                        break;
+                    }
+                }
+
+                if(!flag){
+
+                }
                 result.add(vo);
             }
         }
         // 取出母线id
-        List<String> busbarIds = result.stream().map(RStatBusbarHarmonicYVO::getBusbarId).collect(Collectors.toList());
+        //List<String> busbarIds = result.stream().map(RStatBusbarHarmonicYVO::getBusbarId).collect(Collectors.toList());
-        PmsGeneratrixParam pmsGeneratrixParam = new PmsGeneratrixParam();
+
-        pmsGeneratrixParam.setGeneratrixIds(busbarIds);
+
-        List<GeneratrixAndPowerStationDTO> dtoS = generatrixWireService.getGeneratrixAndPowerStationInfo(pmsGeneratrixParam);
 
-        for (GeneratrixAndPowerStationDTO dto : dtoS) {
-            for (RStatBusbarHarmonicYVO vo : result) {
-                if (dto.getGeneratrixId().equals(vo.getBusbarId())){
-                    vo.setBusbarName(dto.getGeneratrixName());
-                    vo.setSubId(dto.getPowerId());
-                    vo.setSubName(dto.getPowerName());
-                    vo.setSubVoltageLevel(dto.getPowerVoltageLevel());
-                }
-            }
-        }
 
         return result;
     }

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RmpEventDetailVO.java

@@ -1,5 +1,6 @@
 package com.njcn.event.pojo.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -71,6 +72,7 @@ public class RmpEventDetailVO implements Serializable {
      * 开始时间
      */
     @ApiModelProperty(name = "startTime",value = "开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS",timezone = "GMT+8")
     private Date startTime;
 
     /**

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/AnalyzeController.java

@@ -49,7 +49,7 @@ public class AnalyzeController extends BaseController {
 
     private final IHarmonicService harmonicService;
 
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+   /* @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/deptSubstationRelations")
     @ApiOperation("污区图-部门变电站关系")
     @ApiImplicitParam(name = "param", value = "实体参数", required = true)
@@ -81,7 +81,7 @@ public class AnalyzeController extends BaseController {
         List<PollutionLineDTO> list = pollutionService.getLineInfoById(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
-
+*/
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getLineRank")
     @ApiOperation("污区图-获取前十监测点排名")

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HarmonicController.java

@@ -1,100 +0,0 @@
-package com.njcn.harmonic.controller;//package com.njcn.harmonic.controller;
-//
-//import com.njcn.common.pojo.annotation.OperateInfo;
-//import com.njcn.common.pojo.enums.common.LogEnum;
-//import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-//import com.njcn.common.pojo.response.HttpResult;
-//import com.njcn.common.utils.HttpResultUtil;
-//import com.njcn.common.utils.LogUtil;
-//import com.njcn.harmonic.pojo.param.HarmonicPublicParam;
-//import com.njcn.harmonic.pojo.vo.HarmonicDeptVO;
-//import com.njcn.harmonic.pojo.vo.HarmonicLineVO;
-//import com.njcn.harmonic.pojo.vo.HarmonicSubstationVO;
-//import com.njcn.harmonic.pojo.vo.PollutionVO;
-//import com.njcn.harmonic.service.IHarmonicService;
-//import com.njcn.web.controller.BaseController;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiImplicitParam;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.AllArgsConstructor;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.validation.annotation.Validated;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.util.List;
-//import java.util.Objects;
-//
-///**
-// * 类的介绍：
-// *
-// * @author xuyang
-// * @version 1.0.0
-// * @createTime 2022/2/23 10:39
-// */
-//@Validated
-//@Slf4j
-//@RestController
-//@RequestMapping("/harmonic")
-//@Api(tags = "谐波统计")
-//@AllArgsConstructor
-//public class HarmonicController extends BaseController {
-//
-//    private final IHarmonicService harmonicService;
-//
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @PostMapping("/deptSubstationRelations")
-//    @ApiOperation("部门变电站关系")
-//    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-//    public HttpResult<List<PollutionVO>> deptSubstationRelations(@RequestBody HarmonicPublicParam param) {
-//        String methodDescribe = getMethodDescribe("deptSubstationRelations");
-//        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
-//        List<PollutionVO> list = harmonicService.getDeptSubstationRelations(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-//    }
-//
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @PostMapping("/deptInfo")
-//    @ApiOperation("部门列表")
-//    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-//    public HttpResult<List<HarmonicDeptVO>> deptInfo(@RequestBody HarmonicPublicParam param) {
-//        String methodDescribe = getMethodDescribe("deptInfo");
-//        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
-//        List<HarmonicDeptVO> list = harmonicService.getDeptInfo(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-//    }
-//
-//
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @PostMapping("/getSubstationInfoById")
-//    @ApiOperation("根据部门获取变电站详情")
-//    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-//    public HttpResult<List<HarmonicSubstationVO>> getSubstationInfoById(@RequestBody HarmonicPublicParam param) {
-//        String methodDescribe = getMethodDescribe("getSubstationInfoById");
-//        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
-//        List<HarmonicSubstationVO> list = harmonicService.getSubstationInfoById(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-//    }
-//
-//
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @PostMapping("/getLineInfoById")
-//    @ApiOperation("根据变电站获取监测点详情")
-//    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-//    public HttpResult<List<HarmonicLineVO>> getLineInfoById(@RequestBody HarmonicPublicParam param) {
-//        String methodDescribe = getMethodDescribe("getLineInfoById");
-//        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
-//        List<HarmonicLineVO> list = harmonicService.getLineInfoById(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-//    }
-//
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @PostMapping("/getLineRank")
-//    @ApiOperation("获取前十监测点排名")
-//    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-//    public HttpResult<List<HarmonicLineVO>> getLineRank(@RequestBody HarmonicPublicParam param) {
-//        String methodDescribe = getMethodDescribe("getLineRank");
-//        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
-//        List<HarmonicLineVO> list = harmonicService.getLineRank(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-//    }
-//}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionController.java

@@ -1,91 +0,0 @@
-package com.njcn.harmonic.controller;//package com.njcn.harmonic.controller;
-//
-//import com.njcn.common.pojo.annotation.OperateInfo;
-//import com.njcn.common.pojo.enums.common.LogEnum;
-//import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-//import com.njcn.common.pojo.response.HttpResult;
-//import com.njcn.common.utils.HttpResultUtil;
-//import com.njcn.common.utils.LogUtil;
-//import com.njcn.device.pq.pojo.dto.PollutionLineDTO;
-//import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO;
-//import com.njcn.harmonic.pojo.param.HarmonicPublicParam;
-//import com.njcn.harmonic.pojo.vo.PollutionVO;
-//import com.njcn.harmonic.service.IPollutionService;
-//import com.njcn.web.controller.BaseController;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiImplicitParam;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.AllArgsConstructor;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.validation.annotation.Validated;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import java.util.List;
-//
-///**
-// * 类的介绍：电能质量污区图
-// *
-// * @author xuyang
-// * @version 1.0.0
-// * @createTime 2022/2/21 15:59
-// */
-//@Validated
-//@Slf4j
-//@RestController
-//@RequestMapping("/pollution")
-//@Api(tags = "电能质量污区图")
-//@AllArgsConstructor
-//public class PollutionController extends BaseController {
-//
-//    private final IPollutionService pollutionService;
-//
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @PostMapping("/deptSubstationRelations")
-//    @ApiOperation("部门变电站关系")
-//    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-//    public HttpResult<List<PollutionVO>> deptSubstationRelations(@RequestBody HarmonicPublicParam param) {
-//        String methodDescribe = getMethodDescribe("deptSubstationRelations");
-//        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
-//        List<PollutionVO> list = pollutionService.getDeptSubstationRelations(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-//    }
-//
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @PostMapping("/getSubstationInfoById")
-//    @ApiOperation("根据部门获取变电站详情")
-//    @ApiImplicitParam(name = "param", value = "部门参数", required = true)
-//    public HttpResult<List<PollutionSubstationDTO>> getSubstationInfoById(@RequestBody HarmonicPublicParam param) {
-//        String methodDescribe = getMethodDescribe("getSubstationInfoById");
-//        LogUtil.njcnDebug(log, "{}，部门参数：{}", methodDescribe, param);
-//        List<PollutionSubstationDTO> list = pollutionService.getSubstationInfoById(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-//    }
-//
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @PostMapping("/getLineInfoById")
-//    @ApiOperation("根据变电站获取监测点详情")
-//    @ApiImplicitParam(name = "param", value = "变电站参数", required = true)
-//    public HttpResult<List<PollutionLineDTO>> getLineInfoById(@RequestBody HarmonicPublicParam param) {
-//        String methodDescribe = getMethodDescribe("getLineInfoById");
-//        LogUtil.njcnDebug(log, "{}，变电站参数：{}", methodDescribe, param);
-//        List<PollutionLineDTO> list = pollutionService.getLineInfoById(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-//    }
-//
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @PostMapping("/getLineRank")
-//    @ApiOperation("获取前十监测点排名")
-//    @ApiImplicitParam(name = "param", value = "实体参数", required = true)
-//    public HttpResult<List<PollutionLineDTO>> getLineRank(@RequestBody HarmonicPublicParam param) {
-//        String methodDescribe = getMethodDescribe("getLineRank");
-//        LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param);
-//        List<PollutionLineDTO> list = pollutionService.getLineRank(param);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-//    }
-//
-//
-//
-//}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/IPollutionService.java

@@ -20,7 +20,7 @@ public interface IPollutionService {
      * @author xy
      * @date 2022/2/21 16:48
      */
-    List<PollutionVO> getDeptSubstationRelations(HarmonicPublicParam param);
+   // List<PollutionVO> getDeptSubstationRelations(HarmonicPublicParam param);
 
     /**
      * 功能描述: 根据部门获取变电站详情
@@ -30,7 +30,7 @@ public interface IPollutionService {
      * @author xy
      * @date 2022/2/21 20:51
      */
-    List<PollutionSubstationDTO> getSubstationInfoById(HarmonicPublicParam param);
+    //List<PollutionSubstationDTO> getSubstationInfoById(HarmonicPublicParam param);
 
     /**
      * 功能描述: 根据变电站获取监测点详情
@@ -39,7 +39,7 @@ public interface IPollutionService {
      * @author xy
      * @date 2022/2/21 20:51
      */
-    List<PollutionLineDTO> getLineInfoById(HarmonicPublicParam param);
+   // List<PollutionLineDTO> getLineInfoById(HarmonicPublicParam param);
 
     /**
      * 功能描述:获取排名前10的监测点

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

@@ -63,7 +63,7 @@ public class PollutionServiceImpl implements IPollutionService {
 
     private final LineFeignClient lineFeignClient;
 
-    @Override
+  /*  @Override
     public List<PollutionVO> getDeptSubstationRelations(HarmonicPublicParam harmonicPublicParam) {
         //用于区分是pms 还是 pq
         List<PollutionVO> list = new ArrayList<>();
@@ -174,7 +174,7 @@ public class PollutionServiceImpl implements IPollutionService {
         }
         return list.stream().sorted(Comparator.comparing(PollutionLineDTO::getData).reversed().thenComparing(PollutionLineDTO::getName)).collect(Collectors.toList());
     }
-
+*/
     @Override
     public List<PollutionLineDTO> getLineRank(HarmonicPublicParam harmonicPublicParam) {
         harmonicPublicParam.setServerName(generalInfo.getMicroServiceName());