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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
xy
2024-09-13 13:55:01 +08:00
parent 0c87ebf825 183605e9d4
commit 06493c07c3
10 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
View File

@@ -175,7 +175,7 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
mapDetail.putAll(lineDetail.stream().collect(Collectors.toMap(LineDetailVO.Detail::getDevId, Function.identity(), (key1, key2) -> key1)));
}
quitRunningDeviceVOQueryWrapper
.and(w -> w.in("supervision_quit_running_device.status", Arrays.asList(BpmTaskStatusEnum.RUNNING.getStatus(), BpmTaskStatusEnum.APPROVE.getStatus()))
.and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()),w -> w.in("supervision_quit_running_device.status", InstanceUtil.filterTaskStatus())
.or()
.eq("supervision_quit_running_device.create_by", RequestUtil.getUserIndex())
);

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
View File

@@ -213,7 +213,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
queryWrapper.in("supervision_dev_main_report.org_id", data);
}
queryWrapper
.and(w -> w.in("supervision_dev_main_report.status", Arrays.asList(BpmTaskStatusEnum.RUNNING.getStatus(), BpmTaskStatusEnum.APPROVE.getStatus()))
.and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()),w -> w.in("supervision_dev_main_report.status", InstanceUtil.filterTaskStatus())
.or()
.eq("supervision_dev_main_report.create_by", RequestUtil.getUserIndex())
);

5
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
View File

@@ -32,7 +32,6 @@ import com.njcn.supervision.enums.UserNatureEnum;
import com.njcn.supervision.mapper.device.SupervisionTempLineDebugPOMapper;
import com.njcn.supervision.mapper.user.UserReportNormalMapper;
import com.njcn.supervision.pojo.param.device.SupervisionTempLineDebugParam;
import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO;
import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
@@ -225,7 +224,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
queryWrapper.in("supervision_temp_line_report.org_id", data);
}
queryWrapper
.and(w -> w.in("supervision_temp_line_debug.status", Arrays.asList(BpmTaskStatusEnum.RUNNING.getStatus(), BpmTaskStatusEnum.APPROVE.getStatus()))
.and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()),w -> w.in("supervision_temp_line_debug.status", InstanceUtil.filterTaskStatus())
.or()
.eq("supervision_temp_line_debug.create_by", RequestUtil.getUserIndex())
);
@@ -265,7 +264,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
queryWrapper.in("supervision_temp_line_report.org_id", data);
}
queryWrapper
.and(w -> w.in("supervision_temp_line_debug.status", Arrays.asList(BpmTaskStatusEnum.RUNNING.getStatus(), BpmTaskStatusEnum.APPROVE.getStatus()))
.and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()),w -> w.in("supervision_temp_line_debug.status", InstanceUtil.filterTaskStatus())
.or()
.eq("supervision_temp_line_debug.create_by", RequestUtil.getUserIndex())
);

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
View File

@@ -161,7 +161,7 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
queryWrapper.in("supervision_temp_line_report.org_id", data);
}
queryWrapper
.and(w -> w.in("supervision_temp_line_report.status", Arrays.asList(BpmTaskStatusEnum.RUNNING.getStatus(), BpmTaskStatusEnum.APPROVE.getStatus()))
.and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()),w -> w.in("supervision_temp_line_report.status", InstanceUtil.filterTaskStatus())
.or()
.eq("supervision_temp_line_report.create_by", RequestUtil.getUserIndex())
);

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java
View File

@@ -97,7 +97,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl<SurveyPlanMapper, SurveyP
surveyPlanVOQueryWrapper.in("supervision_survey_plan.dept_id", deptIds);
}
surveyPlanVOQueryWrapper
.and(w -> w.in("supervision_survey_plan.status", Arrays.asList(BpmTaskStatusEnum.RUNNING.getStatus(), BpmTaskStatusEnum.APPROVE.getStatus()))
.and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()),w -> w.in("supervision_survey_plan.status", InstanceUtil.filterTaskStatus())
.or()
.eq("supervision_survey_plan.create_by", RequestUtil.getUserIndex())
);

5
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java
View File

@@ -141,7 +141,10 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
//关联台账内的变电站名称
String substation = record.getSubstation();
if (StringUtils.isNotEmpty(substation)) {
record.setSubstationName(lineFeignClient.getSubstationInfo(substation).getData().getName());
PollutionSubstationDTO data = lineFeignClient.getSubstationInfo(substation).getData();
if(ObjectUtil.isNotNull(data)){
record.setSubstationName(data.getName());
}
}
} else {
record.setSubstationName(record.getSubstation());

12
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
View File

@@ -114,6 +114,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
if (Objects.equals(userReportParam.getSaveOrCheckflag(), "1")) {
userReportPO.setStatus(BpmTaskStatusEnum.WAIT.getStatus());
} else {
//常态化干扰源用户信息更新的用的
if (!Objects.equals(userReportParam.getSaveOrCheckflag(), "0")) {
userReportPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
}
@@ -121,7 +122,9 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
if (ObjectUtil.isNotNull(userReportParam.getDataType())) {
userReportPO.setDataType(userReportParam.getDataType());
if (userReportParam.getDataType() == 1) {
userReportPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
if (UserNatureEnum.SENSITIVE_USER.getCode().equals(userReportParam.getUserType())){
userReportPO.setStatus(BpmTaskStatusEnum.APPROVE.getStatus());
}
}
} else {
userReportPO.setDataType(0);
@@ -304,7 +307,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
userReportVOQueryWrapper.in("supervision_user_report.city", userReportQueryParam.getCity());
}
userReportVOQueryWrapper
.and(w -> w.in("supervision_user_report.status", Arrays.asList(BpmTaskStatusEnum.RUNNING.getStatus(), BpmTaskStatusEnum.APPROVE.getStatus()))
.and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()),w -> w.in("supervision_user_report.status", InstanceUtil.filterTaskStatus())
.or()
.eq("supervision_user_report.create_by", RequestUtil.getUserIndex())
);
@@ -447,7 +450,10 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
if (!allDataFlag) {
//台账不查询全部数据，需要排除敏感及重要用户
userReportVOQueryWrapper.ne("supervision_user_report.user_type", UserNatureEnum.SENSITIVE_USER.getCode())
.in("supervision_user_report.status", Arrays.asList(FlowStatusEnum.AUDIT.getCode(), FlowStatusEnum.APPROVE.getCode()));
.and(CollUtil.isNotEmpty(InstanceUtil.filterTaskStatus()),w -> w.in("supervision_user_report.status", InstanceUtil.filterTaskStatus())
.or()
.eq("supervision_user_report.create_by", RequestUtil.getUserIndex())
);
}else{
userReportVOQueryWrapper.eq("supervision_user_report.status", FlowStatusEnum.APPROVE.getCode());
}

18
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java
View File

@@ -3,10 +3,12 @@ package com.njcn.supervision.utils;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.StrPool;
import cn.hutool.core.util.StrUtil;
import com.njcn.bpm.enums.BpmTaskStatusEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.supervision.enums.SupervisionResponseEnum;
import com.njcn.web.utils.RequestUtil;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -83,4 +85,20 @@ public class InstanceUtil {
}
}
//过滤子集部门对象权限
public static List<Integer> filterTaskStatus() {
List<Integer> info =new ArrayList<>();
info.add(BpmTaskStatusEnum.RUNNING.getStatus());
info.add(BpmTaskStatusEnum.APPROVE.getStatus());
String userRole = RequestUtil.getUserRole();
String trimmedString = userRole.substring(1, userRole.length() - 1).replace("\"", "");
List<String> list = Arrays.asList(trimmedString.split(","));
List<String> delete = list.stream().filter(x -> "delete_info".equals(x)).collect(Collectors.toList());
//删除管理员默认能删除全部数据
if (CollUtil.isNotEmpty(delete)) {
info.clear();
}
return info;
}
}

1
pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/ConfigParam.java
View File

@@ -38,6 +38,7 @@ public class ConfigParam {
@ApiModelProperty("审计日志大小（MB）")
@NotNull(message = "审计日志大小不可为空")
@Min(value = 1024,message = "审计日志大小不能小于1024M")
@Max(value = 204800,message = "审计日志大小不能大于20G")
private BigDecimal logSize;
/**

4
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/PassWordRuleServiceImpl.java
View File

@@ -39,7 +39,7 @@ public class PassWordRuleServiceImpl implements PassWordRuleService {
.eq(UserStrategy::getState, DataStateEnum.ENABLE.getCode())
.set(UserStrategy::getLimitPwdTimes,passWordRuleParam.getErrorsCount())
.set(UserStrategy::getLimitPwdDate,passWordRuleParam.getPasswordExpirationMonth())
.set(UserStrategy::getLockPwdCheck,passWordRuleParam.getReleaseTime())
.set(UserStrategy::getLockPwdTime,passWordRuleParam.getReleaseTime())
.set(UserStrategy::getMaxNum,passWordRuleParam.getMaxUseUser())
.set(UserStrategy::getSleep,passWordRuleParam.getSleepDay())
.update();
@@ -57,7 +57,7 @@ public class PassWordRuleServiceImpl implements PassWordRuleService {
UserStrategy userStrategy = iUserStrategyService.getUserStrategy(1);
passWordRuleParam.setErrorsCount(userStrategy.getLimitPwdTimes());
passWordRuleParam.setReleaseTime(userStrategy.getLockPwdCheck());
passWordRuleParam.setReleaseTime(userStrategy.getLockPwdTime());
passWordRuleParam.setPasswordExpirationMonth(userStrategy.getLimitPwdDate());
passWordRuleParam.setMaxUseUser(userStrategy.getMaxNum());
passWordRuleParam.setSleepDay(userStrategy.getSleep());