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

策略bug修改

Browse Source
This commit is contained in:
wurui
2023-03-23 18:49:35 +08:00
parent 96d6c09101
commit 084e05eb12
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ public enum ProcessResponseEnum {
PROCESS_ERROR("A00553","当前流程未审核通过，操作失败！"), PROCESS_ERROR("A00553","当前流程未审核通过，操作失败！"),
QUERY_IS_EMPTY("A00554","当前未查询到当前策略信息，无法删除!"), QUERY_IS_EMPTY("A00554","当前未查询到当前策略信息，无法删除!"),
ENABLED_CANNOT_BE_DELETED("A00555","策略为启用状态不能删除!"), ENABLED_CANNOT_BE_DELETED("A00555","策略为启用状态不能删除!"),
THERE_IS_ONLY_ONE_STRATEGY("A00556","自动策略或手动策略，通用策略只能有一条!"), THERE_IS_ONLY_ONE_STRATEGY("A00556","各个策略等级，通用策略只能有一条!"),
; ;
private final String code; private final String code;

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

@@ -116,6 +116,10 @@ public class StrategyParam {
@NotNull(message = "策略选择不能为空") @NotNull(message = "策略选择不能为空")
private Integer bigType; private Integer bigType;
@ApiModelProperty(value = "区分预警单还是告警单(0：预警单；1：告警单)")
@NotNull(message = "区分类别不能为空")
private Integer type;
@ApiModelProperty(value = "等级（0：一级；1：二级；2：三级）") @ApiModelProperty(value = "等级（0：一级；1：二级；2：三级）")
@NotNull(message = "等级不能为空") @NotNull(message = "等级不能为空")
private Integer grade; private Integer grade;

1
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java
View File

@@ -53,7 +53,6 @@ public class ThsWarnStrategy extends BaseEntity implements Serializable {
@ApiModelProperty(value = "0.删除 1.启用 2.关闭") @ApiModelProperty(value = "0.删除 1.启用 2.关闭")
@TableField("State") @TableField("State")
@TableLogic(value = "1",delval = "0")
private Integer state; private Integer state;
@TableField("Create_By") @TableField("Create_By")

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

@@ -79,16 +79,19 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
@Override @Override
@Transactional(rollbackFor = {Exception.class}) @Transactional(rollbackFor = {Exception.class})
public Boolean insertStrategy(StrategyParam.StrategyInsertParam param) { public Boolean insertStrategy(StrategyParam.StrategyInsertParam param) {
ThsWarnStrategy one = this.getOne(new LambdaQueryWrapper<ThsWarnStrategy>() List<ThsWarnStrategy> one = this.list(new LambdaQueryWrapper<ThsWarnStrategy>()
.ne(ThsWarnStrategy::getState, DataStateEnum.DELETED.getCode())
.eq(ThsWarnStrategy::getName, param.getName()) .eq(ThsWarnStrategy::getName, param.getName())
.or(wrapper -> .eq(ThsWarnStrategy::getType,param.getType())
.or(param.getBigType()==0,wrapper ->
wrapper.eq(ThsWarnStrategy::getGrade, param.getGrade()) wrapper.eq(ThsWarnStrategy::getGrade, param.getGrade())
.eq(ThsWarnStrategy::getBigType, 0) .eq(ThsWarnStrategy::getBigType, 0)
.eq(ThsWarnStrategy::getType,param.getType())
.ne(ThsWarnStrategy::getState, DataStateEnum.DELETED.getCode())
) )
); );
if (CollectionUtil.isNotEmpty(one)) {
if (ObjectUtil.isNotNull(one)) { if(one.size()>1||one.get(0).getName().equals(param.getName())){
if(one.getName().equals(param.getName())){
throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT); throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
} }
throw new BusinessException(ProcessResponseEnum.THERE_IS_ONLY_ONE_STRATEGY); throw new BusinessException(ProcessResponseEnum.THERE_IS_ONLY_ONE_STRATEGY);
@@ -127,19 +130,25 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
@Override @Override
public Boolean updateStrategy(StrategyParam.StrategyUpParam param) { public Boolean updateStrategy(StrategyParam.StrategyUpParam param) {
ThsWarnStrategy one = this.getOne(new LambdaQueryWrapper<ThsWarnStrategy>() List<ThsWarnStrategy> one = this.list(new LambdaQueryWrapper<ThsWarnStrategy>()
.ne(ThsWarnStrategy::getState, DataStateEnum.DELETED.getCode())
.ne(ThsWarnStrategy::getId, param.getId()) .ne(ThsWarnStrategy::getId, param.getId())
.and(wrapper -> .and(wrapper ->
wrapper.eq(ThsWarnStrategy::getName, param.getName()) wrapper.eq(ThsWarnStrategy::getName, param.getName())
.eq(ThsWarnStrategy::getType,param.getType())
) )
.or(wrapper -> .or(param.getBigType()==0,wrapper ->
wrapper.eq( ThsWarnStrategy::getGrade, param.getGrade()) wrapper.eq( ThsWarnStrategy::getGrade, param.getGrade())
.eq(ThsWarnStrategy::getBigType, 0) .eq(ThsWarnStrategy::getBigType, 0)
.eq(ThsWarnStrategy::getType,param.getType())
.ne(ThsWarnStrategy::getId, param.getId())
.ne(ThsWarnStrategy::getState, DataStateEnum.DELETED.getCode())
) )
); );
if (ObjectUtil.isNotNull(one)) { if (CollectionUtil.isNotEmpty(one)) {
if(one.getName().equals(param.getName())){ if(one.size()>1||one.get(0).getName().equals(param.getName())){
throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT); throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT);
} }
throw new BusinessException(ProcessResponseEnum.THERE_IS_ONLY_ONE_STRATEGY); throw new BusinessException(ProcessResponseEnum.THERE_IS_ONLY_ONE_STRATEGY);
@@ -235,8 +244,11 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl<ThsWarnStrategyMappe
if(byId.getState() == 1){ if(byId.getState() == 1){
throw new BusinessException(ProcessResponseEnum.ENABLED_CANNOT_BE_DELETED); throw new BusinessException(ProcessResponseEnum.ENABLED_CANNOT_BE_DELETED);
} }
thsWarnStrategyAssService.removeById(ids); // thsWarnStrategyAssService.removeById(ids);
return this.removeById(ids); ThsWarnStrategy thsWarnStrategy = new ThsWarnStrategy();
thsWarnStrategy.setId(ids);
thsWarnStrategy.setState(0);
return this.updateById(thsWarnStrategy);
} }
/*** /***