diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java index e9c9ff062..740e489e5 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java @@ -18,7 +18,7 @@ import com.njcn.device.pms.pojo.vo.MonitorVO; import com.njcn.device.pms.pojo.vo.PmsMonitorVO; import com.njcn.device.pms.service.majornetwork.IMonitorService; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/OverlimitMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/OverlimitMapper.java index f4b07066c..0f78c93bc 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/OverlimitMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/OverlimitMapper.java @@ -2,7 +2,7 @@ package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java index 1f4c1901e..6de0bfde8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java @@ -282,53 +282,29 @@ public class CommTerminalServiceImpl implements CommTerminalService { @Override public LineDevGetBandDTO substationGetLine(String substationId) { LineDevGetBandDTO result = new LineDevGetBandDTO(); - - //电压等级 - List voltageDic = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); - Map mapVoltage = voltageDic.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); List monitorList = monitorMapper.selectList(new LambdaQueryWrapper().eq(Monitor::getStatus,1).eq(Monitor::getPowerrId,substationId)); - List pmsMonitorBaseDTOList =distributionMonitorMapper.getDisMonitorAllList(substationId,1); - - - if(CollectionUtil.isNotEmpty(monitorList)){ - List temZw = new ArrayList<>(); - monitorList.forEach(item->{ - LineDevGetDTO lineDevGetDTO = new LineDevGetDTO(); - lineDevGetDTO.setPointId(item.getId()); - lineDevGetDTO.setType(1); - lineDevGetDTO.setDevId(item.getTerminalId()); - lineDevGetDTO.setVoltageLevel(mapVoltage.get(item.getVoltageLevel()).getValue()); - temZw.add(lineDevGetDTO); - }); - result.setZwList(temZw); - } - - if(CollectionUtil.isNotEmpty(pmsMonitorBaseDTOList)){ - List temPw = new ArrayList<>(); - pmsMonitorBaseDTOList.forEach(item->{ - LineDevGetDTO lineDevGetDTO = new LineDevGetDTO(); - lineDevGetDTO.setPointId(item.getMonitorId()); - lineDevGetDTO.setType(1); - lineDevGetDTO.setDevId(item.getTerminalId()); - lineDevGetDTO.setVoltageLevel(mapVoltage.get(item.getVoltageLevel()).getValue()); - temPw.add(lineDevGetDTO); - }); - result.setPwList(temPw); - } + assLineDev(result,monitorList,pmsMonitorBaseDTOList); return result; } @Override public LineDevGetBandDTO busBarGetLine(String busBarId) { LineDevGetBandDTO result = new LineDevGetBandDTO(); - //电压等级 + List pmsMonitorBaseDTOList =distributionMonitorMapper.getDisMonitorAllList(busBarId,1); + List monitorList = monitorMapper.selectList(new LambdaQueryWrapper().eq(Monitor::getStatus,1).eq(Monitor::getLineId,busBarId)); + assLineDev(result,monitorList,pmsMonitorBaseDTOList); + return result; + } + + + /** + * 组装信息 + */ + private void assLineDev(LineDevGetBandDTO result,List monitorList,List pmsMonitorBaseDTOList){ List voltageDic = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); Map mapVoltage = voltageDic.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); - List pmsMonitorBaseDTOList =distributionMonitorMapper.getDisMonitorAllList(busBarId,1); - - List monitorList = monitorMapper.selectList(new LambdaQueryWrapper().eq(Monitor::getStatus,1).eq(Monitor::getLineId,busBarId)); if(CollectionUtil.isNotEmpty(monitorList)){ List temZw = new ArrayList<>(); @@ -355,7 +331,6 @@ public class CommTerminalServiceImpl implements CommTerminalService { }); result.setPwList(temPw); } - return result; } @@ -367,10 +342,6 @@ public class CommTerminalServiceImpl implements CommTerminalService { - - - - /*-------------------------------------------------------------------------------------*/ /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java index ee7685a74..472f4f8b1 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java @@ -12,7 +12,7 @@ import com.njcn.device.pms.pojo.param.*; import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.device.pms.pojo.vo.MonitorVO; import com.njcn.device.pms.pojo.vo.PmsMonitorVO; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import java.util.List; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index a1fa5131a..54a9ebff3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -26,7 +26,7 @@ import com.njcn.device.pms.service.majornetwork.IMonitorService; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.user.api.DeptFeignClient; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.SystemResponseEnum; import com.njcn.system.pojo.po.DictData; diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java index c2e9e1e77..2c2b0e7bd 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java @@ -8,7 +8,7 @@ import com.njcn.device.pq.pojo.param.LineBaseQueryParam; import com.njcn.device.pq.pojo.param.OnlineRateParam; import com.njcn.device.pq.pojo.po.Line; import com.njcn.device.pq.pojo.po.LineDetail; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.pojo.vo.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java index d717e0865..223878114 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java @@ -9,7 +9,7 @@ import com.njcn.device.pq.pojo.param.LineBaseQueryParam; import com.njcn.device.pq.pojo.param.OnlineRateParam; import com.njcn.device.pq.pojo.po.Line; import com.njcn.device.pq.pojo.po.LineDetail; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.pojo.vo.*; import com.njcn.device.biz.utils.DeviceEnumUtil; import feign.hystrix.FallbackFactory; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java index 28eb84336..d8f7646d4 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineController.java @@ -8,6 +8,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.device.biz.enums.DeviceResponseEnum; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.mapper.*; import com.njcn.device.pq.pojo.dto.*; import com.njcn.device.pq.pojo.param.DeviceInfoParam; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java index 8cedbe032..5e5aa6f0a 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java @@ -23,7 +23,7 @@ import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.*; import com.njcn.device.pq.pojo.po.Line; import com.njcn.device.pq.pojo.po.LineDetail; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.pojo.po.Voltage; import com.njcn.device.pq.pojo.vo.TerminalBaseVO; import com.njcn.device.pq.pojo.vo.TerminalVO; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java index 437c83dc6..894de7deb 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LineMapper.java @@ -3,10 +3,10 @@ package com.njcn.device.pq.mapper; import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.device.biz.pojo.dto.LineDevGetDTO; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.pojo.bo.BaseLineInfo; import com.njcn.device.pq.pojo.bo.DeviceType; import com.njcn.device.pq.pojo.bo.excel.TerminalBaseExcel; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/OverlimitMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/OverlimitMapper.java index bd0b18ec9..db5d4b6ed 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/OverlimitMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/OverlimitMapper.java @@ -2,7 +2,7 @@ package com.njcn.device.pq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; /** *

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java index 6453fa6de..5662a3d64 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LineService.java @@ -7,7 +7,7 @@ import com.njcn.device.pq.pojo.dto.PollutionSubstationDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.PqsParam; import com.njcn.device.pq.pojo.po.Line; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.pojo.po.TopMsgPO; import com.njcn.device.pq.pojo.vo.*; import java.util.List; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java index 8b62aa833..30439a4cc 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java @@ -14,6 +14,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.utils.EnumUtils; import com.njcn.common.utils.PubUtils; import com.njcn.device.biz.enums.DeviceResponseEnum; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.enums.LineBaseEnum; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.dto.PollutionLineDTO; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index 33feea0d9..fe4106c4d 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -19,6 +19,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.LogUtil; import com.njcn.common.utils.PubUtils; import com.njcn.device.biz.enums.DeviceResponseEnum; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.enums.LineBaseEnum; import com.njcn.device.pq.mapper.*; import com.njcn.device.pq.pojo.bo.BaseLineInfo; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/influxdb/impl/RStatWorkOrderCreateServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/influxdb/impl/RStatWorkOrderCreateServiceImpl.java index 68d027578..91af30e69 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/influxdb/impl/RStatWorkOrderCreateServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/influxdb/impl/RStatWorkOrderCreateServiceImpl.java @@ -1,7 +1,7 @@ package com.njcn.prepare.harmonic.service.influxdb.impl; import com.njcn.device.pms.api.MonitorClient; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.influxdb.param.InfluxDBPublicParam; import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.prepare.harmonic.pojo.dto.OverLimitFlagDTO; @@ -75,13 +75,13 @@ public class RStatWorkOrderCreateServiceImpl implements RStatWorkOrderCreateServ }); rStatWorkOrderFeignClient.createProblem (overLimitFlagDTOList); } - /** + /** * @Description: 对比监测一天的电流是否越限，越限返回1，未越限返回0 - * @Param: [dataI, overlimit] - * @return: java.util.List + * @Param: [dataI, overlimit] + * @return: java.util.List * @Author: clam - * @Date: 2023/2/13 - */ + * @Date: 2023/2/13 + */ private List checkOverLimitI(List dataI, Overlimit overlimit) { List result = new ArrayList<> (); dataI.stream ().forEach (datai ->{ @@ -140,11 +140,11 @@ public class RStatWorkOrderCreateServiceImpl implements RStatWorkOrderCreateServ /** * @Description: 对比监测一天的电压是否越限，越限返回1，未越限返回0 - * @Param: [dataV, overlimit] - * @return: java.lang.String[] + * @Param: [dataV, overlimit] + * @return: java.lang.String[] * @Author: clam - * @Date: 2023/2/13 - */ + * @Date: 2023/2/13 + */ private List checkOverLimitV(List dataV, Overlimit overlimit) { List result = new ArrayList<> (); dataV.stream ().forEach (datav ->{ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DistortionRateServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DistortionRateServiceImpl.java index 92cbed50a..a41e5f68c 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DistortionRateServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DistortionRateServiceImpl.java @@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.device.pq.api.LineFeignClient; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.harmonic.pojo.po.RMpVThd; import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.prepare.harmonic.constant.AlgorithmParam; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java index 99af562bc..f5b6ae9f0 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicGeneralServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.device.pq.api.LineFeignClient; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.harmonic.pojo.po.day.RStatComassesDPO; import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.prepare.harmonic.mapper.mysql.day.RStatComassesDMapper; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java index e3cec45c1..1702345c4 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/HarmonicMetricServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.device.pq.api.LineFeignClient; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.harmonic.pojo.po.day.RStatAssesDPO; import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.prepare.harmonic.mapper.mysql.day.RStatAssesDMapper; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java index debc71fbd..80be0d8b6 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java @@ -5,7 +5,7 @@ import cn.hutool.core.date.DateUtil; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.pojo.po.LineDetail; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.pq.pojo.po.RStatIntegrityD; import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.prepare.harmonic.mapper.mysql.day.RStatIntegrityDMapper; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java index f989a2030..530bd230b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java @@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.utils.NjcnBeanUtil; import com.njcn.device.pq.api.LineFeignClient; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.harmonic.pojo.po.LimitRate; import com.njcn.harmonic.pojo.po.LimitRatePO; import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/NormalLimitServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/NormalLimitServiceImpl.java index 15c58abb5..f0aca222b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/NormalLimitServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/NormalLimitServiceImpl.java @@ -1,9 +1,6 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.line; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.date.LocalDateTimeUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.enums.common.ServerEnum; @@ -11,23 +8,20 @@ import com.njcn.device.pq.api.GeneralDeviceInfoClient; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.influxdb.param.InfluxDBPublicParam; import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.prepare.harmonic.mapper.mysql.line.AbnormalMapper; import com.njcn.prepare.harmonic.pojo.mysql.po.line.MpSurplusAbnormalD; import com.njcn.prepare.harmonic.pojo.param.LineParam; -import com.njcn.prepare.harmonic.pojo.vo.AbnormalVO; import com.njcn.prepare.harmonic.service.mysql.line.NormalLimitService; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.po.Dept; import lombok.AllArgsConstructor; -import org.influxdb.dto.QueryResult; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java index 19103af71..73bdd53ee 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java @@ -11,19 +11,18 @@ import com.njcn.common.pojo.constant.BizParamConstant; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.LogUtil; -import com.njcn.device.biz.commApi.DeptLineGeneralClient; +import com.njcn.device.biz.commApi.CommTerminalGeneralClient; import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO; import com.njcn.device.biz.pojo.param.DeptGetLineParam; import com.njcn.device.pq.api.DeptLineFeignClient; import com.njcn.device.pq.api.LineFeignClient; -import com.njcn.device.pq.pojo.po.Overlimit; +import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.harmonic.pojo.dto.PublicDTO; import com.njcn.harmonic.pojo.po.*; import com.njcn.harmonic.pojo.po.day.*; import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.prepare.harmonic.mapper.mysql.line.*; import com.njcn.prepare.harmonic.pojo.dto.PollutionDTO; -import com.njcn.prepare.harmonic.pojo.influxdb.po.*; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.day.*; import com.njcn.prepare.harmonic.service.mysql.line.PollutionService; @@ -34,8 +33,6 @@ import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.po.Dept; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.influxdb.dto.QueryResult; -import org.influxdb.impl.InfluxDBResultMapper; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -86,7 +83,7 @@ public class PollutionServiceImpl implements PollutionService { private final RMpPollutionDMapper rMpPollutionDMapper; - private final DeptLineGeneralClient deptLineGeneralClient; + private final CommTerminalGeneralClient commTerminalGeneralClient; private final DeptFeignClient deptFeignClient; @@ -187,7 +184,7 @@ public class PollutionServiceImpl implements PollutionService { DeptGetLineParam deptGetLineParam = new DeptGetLineParam(); deptGetLineParam.setDeptId(dept.getId()); deptGetLineParam.setServerName(ServerInfo.HARMONIC); - List deptGetChildrenDTOList = deptLineGeneralClient.deptGetLineList(deptGetLineParam).getData(); + List deptGetChildrenDTOList = commTerminalGeneralClient.deptGetLineList(deptGetLineParam).getData(); Map> substationMap = substationOut.getData(); diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java index 9d2127e77..6223fb3a3 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java @@ -182,35 +182,36 @@ public enum DicDataEnum { * @date 2023/3/24 */ - KV01("0.1kV", "0.1"), - V022("0.22kV", "0.22"), - KV038("0.38kV", "0.38"), - V380("380V", "0.38"), - KV04("0.4kV", "0.4"), - KV06("0.6kV", "0.6"), - V400("400V", "0.4"), - KV6("6kV", "6"), - KV10("10kV", "10"), - KV20("20kV", "20"), - KV30("30kV", "30"), - KV35("35kV", "35"), - KV50("50kV", "50"), - KV66("66kV", "66"), - KV72_5("72.5kV", "725"), - KV110("110kV", "110"), - KV120("120kV", "120"), - KV125("125kV", "125"), - KV200("200kV", "200"), - KV220("220kV", "220"), - KV320("320kV", "320"), - KV330("330kV", "330"), - KV400("400kV", "400"), - KV500("500kV", "500"), - KV600("600kV", "600"), - KV660("660kV", "660"), - KV750("750kV", "750"), - KV1000("1000kV", "1000"), - KV1100("1100kV", "1100"), + V100("100V", "0.1",0.1f), + V220("220V", "0.22",0.22f), + KV038("0.38kV", "0.38",0.38f), + V380("380V", "0.38",0.38f), + KV04("0.4kV", "0.4",0.4f), + KV06("0.6kV", "0.6",0.6f), + V400("400V", "0.4",0.4f), + KV1("1kV", "1",1.0f), + KV6("6kV", "6",6.0f), + KV10("10kV", "10",10.0f), + KV20("20kV", "20",20.0f), + KV30("30kV", "30",30.0f), + KV35("35kV", "35",35.0f), + KV50("50kV", "50",50.0f), + KV66("66kV", "66",66.0f), + KV72_5("72.5kV", "725",725.0f), + KV110("110kV", "110",110.0f), + KV120("120kV", "120",120.0f), + KV125("125kV", "125",125.0f), + KV200("200kV", "200",200.0f), + KV220("220kV", "220",220.0f), + KV320("320kV", "320",320.0f), + KV330("330kV", "330",330.0f), + KV400("400kV", "400",400.0f), + KV500("500kV", "500",500.0f), + KV600("600kV", "600",600.0f), + KV660("660kV", "660",660.0f), + KV750("750kV", "750",750.0f), + KV1000("1000kV", "1000",1000.0f), + KV1100("1100kV", "1100",1100.0f), /** * 计划采取实施 @@ -344,10 +345,18 @@ public enum DicDataEnum { private final String name; private final String code; + private final Float value; + + DicDataEnum(String name, String code,Float value) { + this.name = name; + this.code = code; + this.value = value; + } DicDataEnum(String name, String code) { this.name = name; this.code = code; + this.value = null; } }