From ed145dd7ffcc83ac9ae9f6f3e5c0ae75321a8e04 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Mon, 26 Aug 2024 16:03:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E7=B3=BB=E7=BB=9F=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=BC=93=E6=85=A2=E9=97=AE=E9=A2=98=202.?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=BB=A3=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/system/service/impl/AuditServiceImpl.java | 3 +-- .../java/com/njcn/user/controller/PassWordRuleController.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java index 5898efc0e..fd1efc2df 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java @@ -111,8 +111,7 @@ public class AuditServiceImpl extends ServiceImpl implem QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper .between("sys_user_log.create_time", DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime())), - DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime()))) - .ne("sys_user_log.login_name", UNKNOWN_USER); + DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime()))); if (StrUtil.isNotBlank(auditParam.getLoginName())) { queryWrapper.eq("sys_user_log.login_name", auditParam.getLoginName()); } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/PassWordRuleController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/PassWordRuleController.java index ccc16fc61..b712e3c68 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/PassWordRuleController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/PassWordRuleController.java @@ -55,10 +55,10 @@ public class PassWordRuleController extends BaseController { } @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("获取密码规则") + @ApiOperation("获取用户策略") @RequestMapping(value = "/getUserStrategy", method = RequestMethod.POST) public HttpResult getUserStrategy() { - String methodDescribe = getMethodDescribe("getRule"); + String methodDescribe = getMethodDescribe("getUserStrategy"); UserStrategy userStrategy = passWordRuleService.getUserStrategy(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userStrategy, methodDescribe); From 49dd915e278998a91e89682bc7b94ac1f96711f8 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Tue, 27 Aug 2024 09:35:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pqs-gateway/src/main/resources/bootstrap.yml | 31 +++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pqs-gateway/src/main/resources/bootstrap.yml b/pqs-gateway/src/main/resources/bootstrap.yml index d01064dc1..ab95fc214 100644 --- a/pqs-gateway/src/main/resources/bootstrap.yml +++ b/pqs-gateway/src/main/resources/bootstrap.yml @@ -224,20 +224,23 @@ whitelist: - /system-boot/dictType/dictDataCache - /system-boot/file/** - /system-boot/area/** - #- /advance-boot/** - #- /device-boot/** - #- /system-boot/** - #- /harmonic-boot/** - #- /energy-boot/** - #- /event-boot/** - #- /quality-boot/** - #- /harmonic-prepare/** - #- /process-boot/** - #- /bpm-boot/** - #- /system-boot/** - #- /supervision-boot/** - #- /user-boot/** - #- /harmonic-boot/** + #开始 +# - /advance-boot/** +# - /device-boot/** +# - /system-boot/** +# - /harmonic-boot/** +# - /energy-boot/** +# - /event-boot/** +# - /quality-boot/** +# - /harmonic-prepare/** +# - /process-boot/** +# - /bpm-boot/** +# - /system-boot/** +# - /supervision-boot/** +# - /user-boot/** +# - /harmonic-boot/** +# - /cs-device-boot/** + #结束 - /user-boot/user/listAllUserByDeptId - /IndexAnalysis/** mqtt: From b766e77c424d63e3a516ce5998e681849e302b63 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 27 Aug 2024 11:44:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E8=A7=A3=E5=86=B3=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AE=A1=E7=90=86=E5=A1=AB=E6=8A=A5=E4=BA=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B9=B6=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/UserReportRenewalController.java | 2 +- .../survey/impl/SurveyPlanServiceImpl.java | 5 ++-- .../survey/impl/SurveyTestServiceImpl.java | 27 +++++++++++++------ 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java index 782967a61..650b8fbe6 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportRenewalController.java @@ -30,7 +30,7 @@ import com.njcn.web.controller.BaseController; */ @RestController @RequiredArgsConstructor -@RequestMapping("width = 30,height = 60Renewal") +@RequestMapping("/userReportRenewal") @Api(tags = "干扰源常态化管理信息更新") public class UserReportRenewalController extends BaseController { 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 f6c8b9a1f..214940346 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 @@ -235,8 +235,8 @@ public class SurveyPlanServiceImpl extends ServiceImpl surveyPlanLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -116,16 +115,19 @@ public class SurveyTestServiceImpl extends ServiceImpl(); } } - surveyTestVOQueryWrapper.in(CollUtil.isNotEmpty(deptIds), "supervision_survey_test.dept_id", deptIds); - if (Objects.nonNull(surveyTestQueryParam.getStatus())) { - surveyTestVOQueryWrapper.eq("supervision_survey_test.status", surveyTestQueryParam.getStatus()); - } + + }//筛选普测负责单位 + if (StrUtil.isNotBlank(surveyTestQueryParam.getDeptIndex())) { + deptIds = deptFeignClient.getDepSonIdtByDeptId(surveyTestQueryParam.getDeptIndex()).getData(); + } + surveyTestVOQueryWrapper.in(CollUtil.isNotEmpty(deptIds), "supervision_survey_test.dept_id", deptIds); + if (Objects.nonNull(surveyTestQueryParam.getStatus())) { + surveyTestVOQueryWrapper.eq("supervision_survey_test.status", surveyTestQueryParam.getStatus()); } //获取当前用户部门所有同事的id，查看该部门下所有的数据 surveyTestVOQueryWrapper .eq("supervision_survey_test.state", DataStateEnum.ENABLE.getCode()) .orderByDesc("supervision_survey_test.Update_Time"); - Page surveyTestVOPage = this.baseMapper.surveyTestPage(new Page<>(PageFactory.getPageNum(surveyTestQueryParam), PageFactory.getPageSize(surveyTestQueryParam)), surveyTestVOQueryWrapper); List records = surveyTestVOPage.getRecords(); if (CollectionUtil.isNotEmpty(records)) { @@ -261,11 +263,14 @@ public class SurveyTestServiceImpl extends ServiceImpl()); bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); - String processInstanceId = bpmProcessFeignClient.createProcessInstance(surveyTest.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); + String processInstanceId = bpmProcessFeignClient.createProcessInstance(RequestUtil.getUserIndex(), bpmProcessInstanceCreateReqDTO).getData(); // 将工作流的编号，更新到流程单中 surveyTest.setProcessInstanceId(processInstanceId); //保存历史流程id列表 surveyTest.setHistoryInstanceId(historyInstanceIds); + surveyTest.setCreateBy(RequestUtil.getUserIndex()); + surveyTest.setUpdateBy(RequestUtil.getUserIndex()); + surveyTest.setUpdateTime(LocalDateTimeUtil.now()); this.baseMapper.updateById(surveyTest); return surveyTest.getId(); } @@ -295,6 +300,9 @@ public class SurveyTestServiceImpl extends ServiceImpl Date: Wed, 28 Aug 2024 09:52:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=E7=BC=93=E6=85=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/upload/impl/REvaluationDataServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java index 4d174d215..b8b4796d4 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java @@ -114,7 +114,7 @@ public class REvaluationDataServiceImpl extends ServiceImpl getEvaluationData(UploadDataParam param) { LambdaQueryWrapper lambdaQueryWrapper = this.getDeptLevel(param); //默认按照省名称排序 - lambdaQueryWrapper.orderByDesc(RUploadEvaluationDataD::getProvinceName); + //lambdaQueryWrapper.orderByDesc(RUploadEvaluationDataD::getProvinceName); Page page = this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), lambdaQueryWrapper); List voList = BeanUtil.copyToList(page.getRecords(), UploadEvaluationDataVo.class); if (CollectionUtil.isNotEmpty(voList)) {