From 21be00a6af4344c6c36f69d6cfbfcf09debb672c Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Tue, 11 Nov 2025 13:06:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86=EF=BC=9A=E5=AF=B9?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hsz/controller/MentencePlanController.java | 2 -- .../controller/MentenceTemplateController.java | 2 -- .../gunshi/project/hsz/service/ByLogService.java | 1 + .../project/hsz/service/ForecastService.java | 15 ++++++++++++--- .../project/hsz/service/MentencePlanService.java | 6 +++++- .../hsz/service/MentenceTemplateService.java | 2 +- .../hsz/service/PrePlaceDetailService.java | 7 ++++--- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/gunshi/project/hsz/controller/MentencePlanController.java b/src/main/java/com/gunshi/project/hsz/controller/MentencePlanController.java index 327119e..70f22a9 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/MentencePlanController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/MentencePlanController.java @@ -48,9 +48,7 @@ public class MentencePlanController extends AbstractCommonFileController { throw new IllegalArgumentException("未登录"); } Long userId = sessionUser.getUserId(); - String userName = sessionUser.getUserName(); dto.setCreateId(userId.toString()); - dto.setCreateName(userName); boolean flag = mentencePlanService.saveData(dto); if(flag){ fileService.saveFile(dto.getFiles(),getGroupId(),dto.getId().toString()); diff --git a/src/main/java/com/gunshi/project/hsz/controller/MentenceTemplateController.java b/src/main/java/com/gunshi/project/hsz/controller/MentenceTemplateController.java index 07d3076..b3db68f 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/MentenceTemplateController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/MentenceTemplateController.java @@ -41,9 +41,7 @@ public class MentenceTemplateController extends AbstractCommonFileController { throw new IllegalArgumentException("未登录"); } Long userId = sessionUser.getUserId(); - String userName = sessionUser.getUserName(); dto.setCreateId(userId.toString()); - dto.setCreateName(userName); boolean result = mentenceTemplateService.saveDate(dto); if(result){ fileService.saveFile(dto.getFiles(),getGroupId(),dto.getId().toString()); diff --git a/src/main/java/com/gunshi/project/hsz/service/ByLogService.java b/src/main/java/com/gunshi/project/hsz/service/ByLogService.java index 51eace2..2ad03f5 100644 --- a/src/main/java/com/gunshi/project/hsz/service/ByLogService.java +++ b/src/main/java/com/gunshi/project/hsz/service/ByLogService.java @@ -63,6 +63,7 @@ public class ByLogService extends ServiceImpl { if(!StringUtils.isBlank(pageSo.getLogNmae())){ queryWrapper.like(ByLog::getLogName, pageSo.getLogNmae()); } + queryWrapper.orderByDesc(ByLog::getPreDate); Page byLogPage = this.baseMapper.selectPage(pageSo.getPageSo().toPage(), queryWrapper); List records = byLogPage.getRecords(); Iterator iterator = records.iterator(); diff --git a/src/main/java/com/gunshi/project/hsz/service/ForecastService.java b/src/main/java/com/gunshi/project/hsz/service/ForecastService.java index 302141b..06c627c 100644 --- a/src/main/java/com/gunshi/project/hsz/service/ForecastService.java +++ b/src/main/java/com/gunshi/project/hsz/service/ForecastService.java @@ -209,7 +209,10 @@ public class ForecastService { 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()); + return list.stream() + .sorted(Comparator.comparing(ForeRainVo::getH24, + Comparator.nullsFirst(Comparator.reverseOrder()))) + .collect(Collectors.toList()); } public List getData(ForeRainVo vo, List total,List detail) { @@ -222,8 +225,14 @@ public class ForecastService { //网格左下角经纬度 BigDecimal x11 = layer.getX1(); BigDecimal y11 = layer.getY1(); - BigDecimal lgtd = new BigDecimal(vo.getLgtd()); - BigDecimal lttd = new BigDecimal(vo.getLttd()); + BigDecimal lgtd = BigDecimal.ZERO; + BigDecimal lttd = BigDecimal.ZERO; + if(vo.getLgtd() != null){ + lgtd = new BigDecimal(vo.getLgtd()); + } + if(vo.getLttd() != null){ + lttd = new BigDecimal(vo.getLttd()); + } int rownum = 0; int colnum = 0; for(int i = 0;i < nw;i++){ diff --git a/src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java b/src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java index 4102263..c30bb77 100644 --- a/src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java +++ b/src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java @@ -51,6 +51,10 @@ public class MentencePlanService extends ServiceImpl mentencePlanPage = baseMapper.selectPage(pageSo.getPageSo().toPage(), queryWrapper); List records = mentencePlanPage.getRecords(); for (MentencePlan record : records) { diff --git a/src/main/java/com/gunshi/project/hsz/service/MentenceTemplateService.java b/src/main/java/com/gunshi/project/hsz/service/MentenceTemplateService.java index d8d8e1a..f14b223 100644 --- a/src/main/java/com/gunshi/project/hsz/service/MentenceTemplateService.java +++ b/src/main/java/com/gunshi/project/hsz/service/MentenceTemplateService.java @@ -36,7 +36,7 @@ public class MentenceTemplateService extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(PrePlaceDetail::getPreId, pageSo.getPreId()); + query.orderByAsc(PrePlaceDetail::getOrder); Page prePlaceDetailPage = this.baseMapper.selectPage(pageSo.getPageSo().toPage(), query); return prePlaceDetailPage; } @@ -47,7 +48,7 @@ public class PrePlaceDetailService extends ServiceImpl 0){ - throw new RuntimeException("该防治点在防治计划中已被选择，不能删除"); + throw new IllegalArgumentException("该防治点在防治计划中已被选择，不能删除"); } boolean b = removeById(id); return b; @@ -66,7 +67,7 @@ public class PrePlaceDetailService extends ServiceImpl 0){ - throw new RuntimeException("该防治点在防治计划中已被选择，不能编辑"); + throw new IllegalArgumentException("该防治点在防治计划中已被选择，不能编辑"); } boolean b = updateById(dto); return b;