yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

相关bug修改

master
wany 2026-03-31 15:07:12 +08:00
parent 3edcb6d035
commit 907c2f429f
8 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gunshi/project/ss/controller/DocCenterController.java
View File

@ -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 = "资料中心")

10
src/main/java/com/gunshi/project/ss/controller/ResPersonController.java
View File

@ -46,10 +46,9 @@ public class ResPersonController {
public R<ResPerson> insert(@Validated(Insert.class) @RequestBody ResPerson dto) {
LambdaQueryChainWrapper<ResPerson> 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<ResPerson> 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);

2
src/main/java/com/gunshi/project/ss/model/DocCenter.java
View File

@ -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;

6
src/main/java/com/gunshi/project/ss/service/DocCenterService.java
View File

@ -184,9 +184,11 @@ public class DocCenterService extends ServiceImpl<DocCenterMapper, DocCenter> {
}
//获取替换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不存在");
}

2
src/main/java/com/gunshi/project/ss/service/JcskService.java
View File

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

5
src/main/java/com/gunshi/project/ss/service/ScreenMechanismsService.java
View File

@ -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);
//安全监测设备

12
src/main/java/com/gunshi/project/ss/service/WaterDispatchService.java
View File

@ -29,12 +29,12 @@ public class WaterDispatchService extends ServiceImpl<WaterDispatchMapper, Water
private SysUserMapper sysUserMapper;
public boolean saveData(WaterDispatch dto) {
LambdaQueryWrapper<WaterDispatch> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(WaterDispatch::getName, dto.getName());
WaterDispatch one = getOne(queryWrapper);
if(Objects.nonNull(one)){
throw new IllegalArgumentException("该调度已存在");
}
// LambdaQueryWrapper<WaterDispatch> 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{

8
src/main/java/com/gunshi/project/ss/service/WholeCycleService.java
View File

@ -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<FileAssociations> dispatcherFile = fileService.getFiles("ResPlanB", dispatcher.getId().toString());
List<String> 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<FileAssociations> emergencyFile = fileService.getFiles("ResPlanB", emergency.getId().toString());
List<String> emergencyFileIds = emergencyFile.stream().map(o -> o.getFileId().toString()).collect(Collectors.toList());