From 1f96732d34ed52b2dba1501237cb2b606ff82fcc Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Sun, 29 Sep 2024 13:55:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=80=83=E6=A0=B8=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=EF=BC=9B=E8=A7=A3=E5=86=B3=E4=BD=8D=E7=A7=BB=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E6=97=A0=E6=95=B0=E6=8D=AE=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java | 1 + .../com/gunshi/project/xyt/service/OsmoticShiftRService.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java index c586277..3cae586 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java @@ -70,6 +70,7 @@ public interface AssessTeamRatingMapper extends BaseMapper { and t.rectify_status = #{obj.status} + order by t.rectify_status asc,t.rectify_last_date desc """) Page listPage(Page page,@Param("obj") AssessTaskPageSo page1); diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java index c095801..2640070 100644 --- a/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java +++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftRService.java @@ -1,6 +1,7 @@ package com.gunshi.project.xyt.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -249,6 +250,9 @@ public class OsmoticShiftRService extends ServiceImpl listValue() { List list = baseMapper.listValue(); + if(CollectionUtils.isEmpty(list)){ + return list; + } OsmoticQuerySo so = new OsmoticQuerySo(); List stationCodes = list.stream().map(OsmoticShiftListVo::getStationCode).collect(Collectors.toList()); String maxTm = list.stream().filter(o->o.getTm() != null).max(Comparator.comparing(OsmoticShiftListVo::getTm)).get().getTm(); From fa3a88bac6554e7123ed2ec6958962c2f747069f Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Sun, 29 Sep 2024 15:28:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=A9=E6=B0=94=E9=A2=84=E6=8A=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gunshi/project/xyt/service/ForecastService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/service/ForecastService.java b/src/main/java/com/gunshi/project/xyt/service/ForecastService.java index a7e4967..b98e05a 100644 --- a/src/main/java/com/gunshi/project/xyt/service/ForecastService.java +++ b/src/main/java/com/gunshi/project/xyt/service/ForecastService.java @@ -81,8 +81,8 @@ public class ForecastService { harry : for(ForeRainVo vo : rainLevelVos){ BigDecimal lgtd = new BigDecimal(vo.getLgtd()); BigDecimal lttd = new BigDecimal(vo.getLttd()); - for(int i = 0;i < nh;i++){ - for(int j=0;j< nw;j++){ + for(int i = 0;i < nw;i++){ + for(int j=0;j< nh;j++){ BigDecimal xMin = x11.add(dh.multiply(BigDecimal.valueOf(i))); BigDecimal xMax = x11.add(dh.multiply(BigDecimal.valueOf(i+1))); BigDecimal yMin = y11.add(dw.multiply(BigDecimal.valueOf(j))); @@ -219,8 +219,8 @@ public class ForecastService { BigDecimal lttd = new BigDecimal(vo.getLttd()); int rownum = 0; int colnum = 0; - for(int i = 0;i < nh;i++){ - for(int j=0;j< nw;j++){ + for(int i = 0;i < nw;i++){ + for(int j=0;j< nh;j++){ BigDecimal xMin = x11.add(dh.multiply(BigDecimal.valueOf(i))); BigDecimal xMax = x11.add(dh.multiply(BigDecimal.valueOf(i+1))); BigDecimal yMin = y11.add(dw.multiply(BigDecimal.valueOf(j))); From 7cc08a87914fe11e1f9fba39356c5f8cd0a3c0f8 Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Sun, 29 Sep 2024 15:45:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=A9=E6=B0=94=E9=A2=84=E6=8A=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gunshi/project/xyt/service/ForecastService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/service/ForecastService.java b/src/main/java/com/gunshi/project/xyt/service/ForecastService.java index b98e05a..d8fb54c 100644 --- a/src/main/java/com/gunshi/project/xyt/service/ForecastService.java +++ b/src/main/java/com/gunshi/project/xyt/service/ForecastService.java @@ -195,11 +195,11 @@ public class ForecastService { List resultList = getData(vo,total,detail); vo.setTimeRainVos(resultList); vo.setH1(resultList.get(0).getDrp()); - List list3=resultList.subList(0, Math.min(3, list.size())); + List list3=resultList.subList(0, Math.min(3, resultList.size())); vo.setH3(list3.stream().map(ForeRainTimeVo::getDrp).reduce(BigDecimal.ZERO, BigDecimal::add)); - List list6=resultList.subList(0, Math.min(6, list.size())); + List list6=resultList.subList(0, Math.min(6, resultList.size())); vo.setH6(list6.stream().map(ForeRainTimeVo::getDrp).reduce(BigDecimal.ZERO, BigDecimal::add)); - List list12=resultList.subList(0, Math.min(12, list.size())); + List list12=resultList.subList(0, Math.min(12, resultList.size())); vo.setH12(list12.stream().map(ForeRainTimeVo::getDrp).reduce(BigDecimal.ZERO, BigDecimal::add)); } return list.stream().sorted(Comparator.comparing(ForeRainVo::getH24).reversed()).collect(Collectors.toList());