From f87255c2e8aaeb809fe429293e73b75498a0dea0 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Fri, 13 Sep 2024 08:50:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/njcn/system/pojo/param/ConfigParam.java | 1 + .../com/njcn/user/service/impl/PassWordRuleServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/ConfigParam.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/ConfigParam.java index 44fafdbac..1665c5c77 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/ConfigParam.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/ConfigParam.java @@ -38,6 +38,7 @@ public class ConfigParam { @ApiModelProperty("审计日志大小（MB）") @NotNull(message = "审计日志大小不可为空") @Min(value = 1024,message = "审计日志大小不能小于1024M") + @Max(value = 204800,message = "审计日志大小不能大于20G") private BigDecimal logSize; /** diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/PassWordRuleServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/PassWordRuleServiceImpl.java index c422f30cd..70ebc566b 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/PassWordRuleServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/PassWordRuleServiceImpl.java @@ -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()); From 183605e9d437d34f2ccb74c51c5b7849a085a2eb Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 13 Sep 2024 11:41:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E5=B1=95=E7=A4=BA=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4=202.=E5=A2=9E=E5=8A=A0=E5=B9=B2=E6=89=B0?= =?UTF-8?q?=E6=BA=90=E5=8F=B0=E8=B4=A6=E5=BD=92=E6=A1=A3=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/QuitRunningDeviceServiceImpl.java | 2 +- .../SupervisionDevMainReportPOServiceImpl.java | 2 +- .../SupervisionTempLineDebugPOServiceImpl.java | 5 ++--- .../SupervisionTempLineReportServiceImpl.java | 2 +- .../survey/impl/SurveyPlanServiceImpl.java | 2 +- .../survey/impl/SurveyTestServiceImpl.java | 5 ++++- .../user/impl/UserReportPOServiceImpl.java | 12 +++++++++--- .../njcn/supervision/utils/InstanceUtil.java | 18 ++++++++++++++++++ 8 files changed, 37 insertions(+), 11 deletions(-) diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java index e4a11ba0e..e0ea3d3c5 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java @@ -175,7 +175,7 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl 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()) ); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java index dd48caa58..bde723f4d 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java @@ -213,7 +213,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl 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()) ); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java index f6de98c64..61fd88868 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java @@ -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 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 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()) ); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java index a8ce46b45..5053b3230 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java @@ -161,7 +161,7 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl 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()) ); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java index 9f3de8215..5ef375bf4 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java @@ -97,7 +97,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl 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()) ); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java index 263d27235..214540126 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java @@ -141,7 +141,10 @@ public class SurveyTestServiceImpl extends ServiceImpl 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 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()); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java index 25e83da44..4a9c81bf7 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/utils/InstanceUtil.java @@ -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 filterTaskStatus() { + List 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 list = Arrays.asList(trimmedString.split(",")); + List delete = list.stream().filter(x -> "delete_info".equals(x)).collect(Collectors.toList()); + //删除管理员默认能删除全部数据 + if (CollUtil.isNotEmpty(delete)) { + info.clear(); + } + return info; + } + } \ No newline at end of file