新增了：对时间的排序

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());

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());

src/main/java/com/gunshi/project/hsz/service/ByLogService.java

@@ -63,6 +63,7 @@ public class ByLogService  extends ServiceImpl<ByLogMapper, ByLog> {
         if(!StringUtils.isBlank(pageSo.getLogNmae())){
             queryWrapper.like(ByLog::getLogName, pageSo.getLogNmae());
         }
+        queryWrapper.orderByDesc(ByLog::getPreDate);
         Page<ByLog> byLogPage = this.baseMapper.selectPage(pageSo.getPageSo().toPage(), queryWrapper);
         List<ByLog> records = byLogPage.getRecords();
         Iterator<ByLog> iterator = records.iterator();

src/main/java/com/gunshi/project/hsz/service/ForecastService.java

@@ -209,7 +209,10 @@ public class ForecastService {
             List<ForeRainTimeVo> 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<ForeRainTimeVo> getData(ForeRainVo vo, List<RainGrib2Layer> total,List<RainGrib2Layer> detail) {
@@ -222,8 +225,14 @@ public class ForecastService {
         //网格左下角经纬度
         BigDecimal x11 = layer.getX1();
         BigDecimal y11 = layer.getY1();
-        BigDecimal lgtd = new BigDecimal(vo.getLgtd());
+        BigDecimal lgtd = BigDecimal.ZERO;
-        BigDecimal lttd = new BigDecimal(vo.getLttd());
+        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++){

src/main/java/com/gunshi/project/hsz/service/MentencePlanService.java

@@ -51,6 +51,10 @@ public class MentencePlanService  extends ServiceImpl<MentencePlanMapper, Menten
         }
         dto.setId(IdWorker.getId());
         dto.setCreateDate(new Date());
+        SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(dto.getCreateId()));
+        if(sysUser != null){
+            dto.setCreateName(sysUser.getNickName());
+        }
         dto.setPlanStatus(0);
         save(dto);
         //保存细节
@@ -116,7 +120,7 @@ public class MentencePlanService  extends ServiceImpl<MentencePlanMapper, Menten
         if(Objects.nonNull(pageSo.getStatus())){
             queryWrapper.eq(MentencePlan::getPlanStatus,pageSo.getStatus());
         }
-        queryWrapper.orderByAsc(MentencePlan::getCreateDate);
+        queryWrapper.orderByDesc(MentencePlan::getCreateDate);
         Page<MentencePlan> mentencePlanPage = baseMapper.selectPage(pageSo.getPageSo().toPage(), queryWrapper);
         List<MentencePlan> records = mentencePlanPage.getRecords();
         for (MentencePlan record : records) {

src/main/java/com/gunshi/project/hsz/service/MentenceTemplateService.java

@@ -36,7 +36,7 @@ public class MentenceTemplateService extends ServiceImpl<MentenceTemplateMapper,
         if(dto.getCreateId() != null){
             SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(dto.getCreateId()));
             if(sysUser != null){
-                dto.setCreateName(sysUser.getUserName());
+                dto.setCreateName(sysUser.getNickName());
             }
         }
         save(dto);

src/main/java/com/gunshi/project/hsz/service/PrePlaceDetailService.java

@@ -37,6 +37,7 @@ public class PrePlaceDetailService extends ServiceImpl<PrePlaceDetailMapper, Pre
         }
         LambdaQueryWrapper<PrePlaceDetail> query = new LambdaQueryWrapper<>();
         query.eq(PrePlaceDetail::getPreId, pageSo.getPreId());
+        query.orderByAsc(PrePlaceDetail::getOrder);
         Page<PrePlaceDetail> prePlaceDetailPage = this.baseMapper.selectPage(pageSo.getPageSo().toPage(), query);
         return prePlaceDetailPage;
     }
@@ -47,7 +48,7 @@ public class PrePlaceDetailService extends ServiceImpl<PrePlaceDetailMapper, Pre
         Long preId = dto.getPreId();
         PrePlace prePlace = prePlaceMapper.selectById(preId);
         if(prePlace == null) {
-            throw new RuntimeException("防治点不存在，请检查");
+            throw new IllegalArgumentException("防治点不存在，请检查");
         }
         boolean save = save(dto);
         return save;
@@ -57,7 +58,7 @@ public class PrePlaceDetailService extends ServiceImpl<PrePlaceDetailMapper, Pre
         //先在防治计划中查看是否被引用
         int count = byPlanDetailMapper.selectByPPDI(id);
         if(count > 0){
-            throw new RuntimeException("该防治点在防治计划中已被选择，不能删除");
+            throw new IllegalArgumentException("该防治点在防治计划中已被选择，不能删除");
         }
         boolean b = removeById(id);
         return b;
@@ -66,7 +67,7 @@ public class PrePlaceDetailService extends ServiceImpl<PrePlaceDetailMapper, Pre
     public boolean update(PrePlaceDetail dto) {
         int count = byPlanDetailMapper.selectByPPDI(dto.getId());
         if(count > 0){
-            throw new RuntimeException("该防治点在防治计划中已被选择，不能编辑");
+            throw new IllegalArgumentException("该防治点在防治计划中已被选择，不能编辑");
         }
         boolean b = updateById(dto);
         return b;