From 907c2f429f2171178bfc4d2d754a40d56ede727c Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Tue, 31 Mar 2026 15:07:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/ss/controller/DocCenterController.java | 6 +----- .../project/ss/controller/ResPersonController.java | 10 ++++------ .../java/com/gunshi/project/ss/model/DocCenter.java | 2 ++ .../gunshi/project/ss/service/DocCenterService.java | 6 ++++-- .../com/gunshi/project/ss/service/JcskService.java | 2 ++ .../project/ss/service/ScreenMechanismsService.java | 5 +++-- .../project/ss/service/WaterDispatchService.java | 12 ++++++------ .../gunshi/project/ss/service/WholeCycleService.java | 8 ++++---- 8 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/gunshi/project/ss/controller/DocCenterController.java b/src/main/java/com/gunshi/project/ss/controller/DocCenterController.java index 9680ac9..97da290 100644 --- a/src/main/java/com/gunshi/project/ss/controller/DocCenterController.java +++ b/src/main/java/com/gunshi/project/ss/controller/DocCenterController.java @@ -1,22 +1,18 @@ package com.gunshi.project.ss.controller; -import com.gunshi.core.annotation.Get; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; import com.gunshi.project.ss.entity.so.DocCenterPageSo; import com.gunshi.project.ss.model.DocCenter; import com.gunshi.project.ss.model.FileAssociations; -import com.gunshi.project.ss.service.DocCategoryService; import com.gunshi.project.ss.service.DocCenterService; import com.gunshi.project.ss.service.FileAssociationsService; -import com.ruoyi.system.mapper.SysUserMapper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.util.Collections; import java.util.List; @Tag(name = "资料中心") diff --git a/src/main/java/com/gunshi/project/ss/controller/ResPersonController.java b/src/main/java/com/gunshi/project/ss/controller/ResPersonController.java index ad0a8c3..013e2b0 100644 --- a/src/main/java/com/gunshi/project/ss/controller/ResPersonController.java +++ b/src/main/java/com/gunshi/project/ss/controller/ResPersonController.java @@ -46,10 +46,9 @@ public class ResPersonController { public R insert(@Validated(Insert.class) @RequestBody ResPerson dto) { LambdaQueryChainWrapper query = service.lambdaQuery() - .eq(ResPerson::getType, dto.getType()) - .eq(ResPerson::getName, dto.getName()); + .eq(ResPerson::getType, dto.getType()); if (query.count() > 0){ - throw new IllegalArgumentException("当前责任类型名字重复"); + throw new IllegalArgumentException("当前责任类型已存在"); } dto.setCreateTime(new Date()); @@ -65,10 +64,9 @@ public class ResPersonController { LambdaQueryChainWrapper query = service.lambdaQuery() .ne(ResPerson::getId, dto.getId()) - .eq(ResPerson::getType, dto.getType()) - .eq(ResPerson::getName, dto.getName()); + .eq(ResPerson::getType, dto.getType()); if (query.count() > 0){ - throw new IllegalArgumentException("当前责任类型名字重复"); + throw new IllegalArgumentException("当前责任类型已存在"); } dto.setCreateTime(null); dto.setCreateBy(null); diff --git a/src/main/java/com/gunshi/project/ss/model/DocCenter.java b/src/main/java/com/gunshi/project/ss/model/DocCenter.java index 19ae53d..63906f5 100644 --- a/src/main/java/com/gunshi/project/ss/model/DocCenter.java +++ b/src/main/java/com/gunshi/project/ss/model/DocCenter.java @@ -34,6 +34,7 @@ public class DocCenter { @TableField("replace_id") @Schema(description = "替换档案id") + @JsonSerialize(using = ToStringSerializer.class) private Long replaceId; @TableField(exist = false) @@ -42,6 +43,7 @@ public class DocCenter { @TableField("doc_category_id") @Schema(description = "资料类别id") + @JsonSerialize(using = ToStringSerializer.class) private Long docCategoryId; diff --git a/src/main/java/com/gunshi/project/ss/service/DocCenterService.java b/src/main/java/com/gunshi/project/ss/service/DocCenterService.java index ba52e10..fd8dfdf 100644 --- a/src/main/java/com/gunshi/project/ss/service/DocCenterService.java +++ b/src/main/java/com/gunshi/project/ss/service/DocCenterService.java @@ -184,9 +184,11 @@ public class DocCenterService extends ServiceImpl { } //获取替换id LocalDateTime now = LocalDateTime.now(); - if(docCenter.getReplaceId() != null){ + Long oldReplaceId = one.getReplaceId(); + Long replaceId = docCenter.getReplaceId(); + if(replaceId != null && !Objects.equals(oldReplaceId, replaceId)){ //如果替换档案ID不为null，废弃原档案 - DocCenter replaceOne = lambdaQuery().eq(DocCenter::getId, docCenter.getReplaceId()).one(); + DocCenter replaceOne = lambdaQuery().eq(DocCenter::getId, replaceId).one(); if(replaceOne == null){ throw new IllegalArgumentException("对不起，被替换的档案ID不存在"); } diff --git a/src/main/java/com/gunshi/project/ss/service/JcskService.java b/src/main/java/com/gunshi/project/ss/service/JcskService.java index 6077521..c29049d 100644 --- a/src/main/java/com/gunshi/project/ss/service/JcskService.java +++ b/src/main/java/com/gunshi/project/ss/service/JcskService.java @@ -51,6 +51,7 @@ public class JcskService { } one.setLgtd(lgtd); one.setLttd(lttd); + one.setDm(dm); if(normal.getAddress() != null){ one.setAddress(normal.getAddress()); } @@ -87,6 +88,7 @@ public class JcskService { } one.setLgtd(lgtd); one.setLttd(lttd); + one.setDm(dm); if(normal.getAddress() != null){ one.setAddress(normal.getAddress()); } diff --git a/src/main/java/com/gunshi/project/ss/service/ScreenMechanismsService.java b/src/main/java/com/gunshi/project/ss/service/ScreenMechanismsService.java index 3758524..b80ce52 100644 --- a/src/main/java/com/gunshi/project/ss/service/ScreenMechanismsService.java +++ b/src/main/java/com/gunshi/project/ss/service/ScreenMechanismsService.java @@ -1,6 +1,7 @@ package com.gunshi.project.ss.service; +import com.gunshi.project.ss.common.model.StStbprpB; import com.gunshi.project.ss.entity.vo.ScreenEquipmentVo; import com.gunshi.project.ss.model.AttResBase; import com.gunshi.project.ss.model.AttResBuilding; @@ -19,7 +20,7 @@ public class ScreenMechanismsService { private AttResBaseService attResBaseService; @Autowired - private StStbprpBElemService stStbprpBElemService; + private StStbprpBService stStbprpBService; @Autowired private JcskSyBService jcskSyBService; @@ -46,7 +47,7 @@ public class ScreenMechanismsService { } //雨晴、水情、流量站总数量 - Long count = stStbprpBElemService.lambdaQuery().count(); + Long count = stStbprpBService.lambdaQuery().eq(StStbprpB::getStatus,1).count(); res.setRainWaterCount(count); //安全监测设备 diff --git a/src/main/java/com/gunshi/project/ss/service/WaterDispatchService.java b/src/main/java/com/gunshi/project/ss/service/WaterDispatchService.java index 38b3fa0..bc3dca9 100644 --- a/src/main/java/com/gunshi/project/ss/service/WaterDispatchService.java +++ b/src/main/java/com/gunshi/project/ss/service/WaterDispatchService.java @@ -29,12 +29,12 @@ public class WaterDispatchService extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(WaterDispatch::getName, dto.getName()); - WaterDispatch one = getOne(queryWrapper); - if(Objects.nonNull(one)){ - throw new IllegalArgumentException("该调度已存在"); - } +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(WaterDispatch::getName, dto.getName()); +// WaterDispatch one = getOne(queryWrapper); +// if(Objects.nonNull(one)){ +// throw new IllegalArgumentException("该调度已存在"); +// } if(dto.getIsDistribute() != null && dto.getIsDistribute() == 0){//如果选择下发 dto.setExeStatus(2);//状态改为下发中 }else{ diff --git a/src/main/java/com/gunshi/project/ss/service/WholeCycleService.java b/src/main/java/com/gunshi/project/ss/service/WholeCycleService.java index 987c15c..fdbea3c 100644 --- a/src/main/java/com/gunshi/project/ss/service/WholeCycleService.java +++ b/src/main/java/com/gunshi/project/ss/service/WholeCycleService.java @@ -80,21 +80,21 @@ public class WholeCycleService { } //调度规则 - ResPlanB dispatcher = resPlanBService.lambdaQuery().eq(ResPlanB::getType, 2).eq(ResPlanB::getIsAvailable, 1).orderByDesc(ResPlanB::getPrepTime).last("limit 1").one(); + ResPlanB dispatcher = resPlanBService.lambdaQuery().eq(ResPlanB::getType, 2).eq(ResPlanB::getIsAvailable, 1).orderByDesc(ResPlanB::getApprTime).last("limit 1").one(); if(dispatcher == null){ res.setDispatchTime(null); }else{ - res.setDispatchTime(dispatcher.getPrepTime()); + res.setDispatchTime(dispatcher.getApprTime()); } List dispatcherFile = fileService.getFiles("ResPlanB", dispatcher.getId().toString()); List dispatcherIds = dispatcherFile.stream().map(o -> o.getFileId().toString()).collect(Collectors.toList()); res.setDispatchFileIds(dispatcherIds); //应急预案 - ResPlanB emergency = resPlanBService.lambdaQuery().eq(ResPlanB::getType, 1).eq(ResPlanB::getIsAvailable, 1).orderByDesc(ResPlanB::getPrepTime).last("limit 1").one(); + ResPlanB emergency = resPlanBService.lambdaQuery().eq(ResPlanB::getType, 1).eq(ResPlanB::getIsAvailable, 1).orderByDesc(ResPlanB::getApprTime).last("limit 1").one(); if(emergency == null){ res.setEmergencyTime(null); }else{ - res.setEmergencyTime(emergency.getPrepTime()); + res.setEmergencyTime(emergency.getApprTime()); } List emergencyFile = fileService.getFiles("ResPlanB", emergency.getId().toString()); List emergencyFileIds = emergencyFile.stream().map(o -> o.getFileId().toString()).collect(Collectors.toList());