Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.修改变压器代码

Browse Source 
2.优化策略,策略添加和修改的验证
This commit is contained in:
wurui
2023-03-24 16:30:21 +08:00
parent 73a09d2556
commit ba4f6124b6
16 changed files with 75 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java
View File

@@ -21,6 +21,7 @@ public enum ProcessResponseEnum {
QUERY_IS_EMPTY("A00554","当前未查询到当前策略信息，无法删除!"),
ENABLED_CANNOT_BE_DELETED("A00555","策略为启用状态不能删除!"),
THERE_IS_ONLY_ONE_STRATEGY("A00556","各个策略等级，通用策略只能有一条!"),
TERMINAL_ID_REPEAT("A00351","终端编号已存在"),
;
private final String code;

4
pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/TerminalParam.java
View File

@@ -89,7 +89,7 @@ public class TerminalParam {
private String installPlace;
@ApiModelProperty(value = "检测时间")
private String inspectionTime;
private LocalDate inspectionTime;
@ApiModelProperty(value = "送检单位")
private String inspectionUnit;
@@ -129,7 +129,7 @@ public class TerminalParam {
private String installPlace;
@ApiModelProperty(value = "检测时间")
private String inspectionTime;
private LocalDate inspectionTime;
@ApiModelProperty(value = "送检单位")
private String inspectionUnit;

2
pqs-process/process-boot/src/main/java/com/njcn/process/service/PmsTerminalDetectionService.java
View File

@@ -46,7 +46,7 @@ public interface PmsTerminalDetectionService extends IService<PmsTerminalDetecti
* @param param
* @return Boolean
*/
Boolean insertTerminal(TerminalParam.TerminalInsertParam param);
Boolean insertTerminal(TerminalParam.TerminalInsertParam param) ;
/***
* 终端检测监督批量新增
* @author wr

34
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/PmsTerminalDetectionServiceImpl.java
View File

@@ -20,6 +20,7 @@ import com.njcn.oss.enums.OssResponseEnum;
import com.njcn.oss.utils.FileStorageUtil;
import com.njcn.poi.excel.ExcelUtil;
import com.njcn.poi.util.PoiUtil;
import com.njcn.process.enums.ProcessResponseEnum;
import com.njcn.process.pojo.dto.excel.TerminalExcel;
import com.njcn.process.pojo.param.TerminalParam;
import com.njcn.process.pojo.po.PmsTerminalDetection;
@@ -110,24 +111,31 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertTerminal(TerminalParam.TerminalInsertParam param) {
public Boolean insertTerminal(TerminalParam.TerminalInsertParam param) {
Dept data = deptFeignClient.getDeptById(param.getOrgNo()).getData();
if (ObjectUtil.isNull(data)) {
throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
}
int count = this.count(new LambdaQueryWrapper<PmsTerminalDetection>()
List<PmsTerminalDetection> list = this.list(new LambdaQueryWrapper<PmsTerminalDetection>()
.eq(PmsTerminalDetection::getId, param.getId())
.or(wrapper ->
wrapper.eq(PmsTerminalDetection::getName, param.getName())
)
);
if (count > 0) {
throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT, "或终端编号已存在");
if (CollectionUtil.isNotEmpty(list)) {
List<String> collect = list.stream().map(PmsTerminalDetection::getName).collect(Collectors.toList());
if(collect.contains(param.getName())){
throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
}
throw new BusinessException(ProcessResponseEnum.TERMINAL_ID_REPEAT);
}
PmsTerminalDetection detection = BeanUtil.copyProperties(param, PmsTerminalDetection.class);
detection.setOriginalName(detection.getId() + "-原始数据报告.docx");
detection.setOrgNo(data.getCode());
detection.setOrgName(data.getName());
LocalDate inspectionTime = param.getInspectionTime();
detection.setNextInspectionTime(inspectionTime.plusYears(5));
detection.setTestResults(0);
detection.setStatus(1);
return this.save(detection);
@@ -160,17 +168,21 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateTerminal(TerminalParam.TerminalUpdateParam param) {
PmsTerminalDetection one = this.getOne(new LambdaQueryWrapper<PmsTerminalDetection>()
List<PmsTerminalDetection> list = this.list(new LambdaQueryWrapper<PmsTerminalDetection>()
.ne(PmsTerminalDetection::getId, param.getId())
.and(wrapper ->
wrapper.eq(PmsTerminalDetection::getName, param.getName())
)
);
if (ObjectUtil.isNotNull(one)) {
throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
if (CollectionUtil.isNotEmpty(list)) {
List<String> collect = list.stream().map(PmsTerminalDetection::getName).collect(Collectors.toList());
if(collect.contains(param.getName())){
throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
}
}
PmsTerminalDetection detection = BeanUtil.copyProperties(param, PmsTerminalDetection.class);
LocalDate inspectionTime = param.getInspectionTime();
detection.setNextInspectionTime(inspectionTime.plusYears(5));
boolean b = this.updateById(detection);
if (b) {
PmsTerminalDetection cc = this.getOne(new LambdaQueryWrapper<PmsTerminalDetection>()
@@ -243,7 +255,8 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
//文件上传的地址
String path = fileStorageUtil.uploadMultipart(files[i], OssPath.TEST_REPORT);
detection.setInspectionReport(path);
detection.setNextInspectionTime(LocalDate.parse(nextInspectionTime));
detection.setInspectionTime(LocalDate.parse(nextInspectionTime));
detection.setNextInspectionTime(LocalDate.parse(nextInspectionTime).plusYears(5));
detection.setInspectionName(originalFilename);
detection.setId(terminalIds);
data.add(detection);
@@ -424,6 +437,8 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
detection = BeanUtil.copyProperties(terminalExcel, PmsTerminalDetection.class);
detection.setOrgNo(deptList.get(0).getCode());
detection.setOrgName(deptList.get(0).getName());
LocalDate inspectionTime = detection.getInspectionTime();
detection.setNextInspectionTime(inspectionTime.plusYears(5));
detection.setTestResults(0);
detection.setStatus(1);
pmsTerminalDetections.add(detection);
@@ -452,5 +467,4 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl<PmsTerminalDete
msg.setMsg(content);
terminalExcelMsg.add(msg);
}
}

1
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java
View File

@@ -34,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
/**
* <p>