From 0fbbb426a0d6e5cf53aa183739258353c07044bf Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 20 Sep 2023 15:36:38 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E7=BB=BC=E5=90=88=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=EF=BC=8C=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/RMpPollutionDPOMapper.java | 27 ++++++------------- .../mapper/mapping/RMpPollutionDPOMapper.xml | 24 +++++++++++++++++ .../impl/PollutionSubstationServiceImpl.java | 18 +++---------- 3 files changed, 35 insertions(+), 34 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPollutionDPOMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPollutionDPOMapper.java index a4cb4932f..aea191517 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPollutionDPOMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpPollutionDPOMapper.java @@ -24,24 +24,13 @@ public interface RMpPollutionDPOMapper extends BaseMapper { int insertOrUpdateSelective(RMpPollutionDPO record); - @Select({"" + List selectMaxList(@Param("ids") List line, + @Param("pollutionType") String pollutionType, + @Param("statTime") String statTime, + @Param("endTime") String endTime); - }) - List selectMaxList(@Param("items") List line, @Param("pollutionType") String pollutionType, @Param("searchBeginTime") String searchBeginTime); - - List getTop10Line(@Param("list") List lineList, @Param("start") DateTime searchBeginTime, @Param("end") DateTime searchEndTime, @Param("pollutionType") String id); + List getTop10Line(@Param("list") List lineList, + @Param("start") DateTime searchBeginTime, + @Param("end") DateTime searchEndTime, + @Param("pollutionType") String id); } \ No newline at end of file diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPollutionDPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPollutionDPOMapper.xml index 6980a4dc7..fcd50a972 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPollutionDPOMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpPollutionDPOMapper.xml @@ -43,6 +43,30 @@ ORDER BY data DESC LIMIT 0,10 + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java index 445ed69f2..f1eb7330a 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java @@ -505,18 +505,6 @@ public class PollutionSubstationServiceImpl extends ServiceImpl list = new ArrayList<>(); String pollutionType = harmonicPublicParam.getStatisticalType ( ).getId (); - String code = harmonicPublicParam.getStatisticalType ( ).getCode (); - String searchBeginTime = ""; - if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_YEAR) ){ - searchBeginTime = harmonicPublicParam.getSearchBeginTime ( ).substring (0, 4)+"%"; - - }else if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_MONTH)){ - searchBeginTime = harmonicPublicParam.getSearchBeginTime ( ).substring (0, 7)+"%"; - - - }else if(Objects.equals (harmonicPublicParam.getReportFlag (),BizParamConstant.STAT_BIZ_DAY)) { - searchBeginTime = harmonicPublicParam.getSearchBeginTime ( ).substring (0, 10)+"%"; - } PollutionParamDTO paramDTO = new PollutionParamDTO(); if (StringUtils.isBlank(RequestUtil.getDeptIndex())){ return list; @@ -528,7 +516,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl data = statationStatClient.getStatationStatInfo(param).getData(); if(CollectionUtil.isNotEmpty(data)){ List monitorId = data.stream().map(PmsStatationStatInfoDTO::getMonitorId).collect(Collectors.toList()); - List lineData = rMpPollutionDPOMapper.selectMaxList ( monitorId,pollutionType,searchBeginTime); + List lineData = rMpPollutionDPOMapper.selectMaxList ( monitorId,pollutionType,harmonicPublicParam.getSearchBeginTime(),harmonicPublicParam.getSearchEndTime()); Map lineMap = lineData.stream().collect(Collectors.toMap(RMpPollutionDPO::getLineId, RMpPollutionDPO::getValue)); PollutionLineDTO dto; for (PmsStatationStatInfoDTO power : data) { @@ -559,7 +547,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl lineData = rMpPollutionDPOMapper.selectMaxList ( line,pollutionType,searchBeginTime); + List lineData = rMpPollutionDPOMapper.selectMaxList ( line,pollutionType,harmonicPublicParam.getSearchBeginTime(),harmonicPublicParam.getSearchEndTime()); if (!CollectionUtils.isEmpty(lineData)){ list.stream().map(list1->lineData.stream().filter(list2-> Objects.equals(list1.getId(),list2.getLineId ())).findAny().map(m->{ list1.setData (m.getValue ()); @@ -621,7 +609,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl lineData = rMpPollutionDPOMapper.selectMaxList ( monitorIdList,pollutionType,param.getSearchBeginTime()); + List lineData = rMpPollutionDPOMapper.selectMaxList ( monitorIdList,pollutionType,param.getSearchBeginTime(),param.getSearchEndTime()); if(CollectionUtil.isEmpty(lineData)){ return list;