diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index a620b1b15..f3c91ea97 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -1646,7 +1646,6 @@ AND device.id = deviceDetail.id AND line.id = lineDetail.id AND vg.Id = voltage.id - AND line.id IN @@ -1655,16 +1654,16 @@ and ( - lineName like CONCAT('%', #{searchValue}, '%') - or subName like CONCAT('%', #{searchValue}, '%') + line.NAME like CONCAT('%', #{searchValue}, '%') + or substation.NAME like CONCAT('%', #{searchValue}, '%') + ) + + + and ( + device.NAME like CONCAT('%', #{searchValue}, '%') + or substation.NAME like CONCAT('%', #{searchValue}, '%') ) - - and ( - devName like CONCAT('%', #{searchValue}, '%') - or subName like CONCAT('%', #{searchValue}, '%') - ) - diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java index f1cafa563..7b35271e3 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java @@ -59,7 +59,7 @@ public class UserReportManageController extends BaseController { } @PostMapping("/update") - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.UPDATE) + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE) @Operation(summary = "重新发起") @ApiImplicitParam(name = "userReportParam", value = "实体参数", required = true) public HttpResult updateUserReport(@RequestBody @Validated UserReportParam.UserReportUpdate userReportParam) { @@ -69,7 +69,7 @@ public class UserReportManageController extends BaseController { } - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) @PostMapping("/auditUserReport") @ApiOperation("修改干扰源用户") @ApiImplicitParam(name = "userReportUpdate", value = "实体参数", required = true) @@ -143,7 +143,7 @@ public class UserReportManageController extends BaseController { @ApiImplicitParam(name = "userReportQueryParam", value = "参数", required = true) public HttpResult> getNormalUserPage(@RequestBody @Validated UserReportParam.UserReportQueryParam userReportQueryParam) { String methodDescribe = getMethodDescribe("getInterferenceUserPage"); - Page out = userReportPOService.getInterferenceUserPage(userReportQueryParam,true); + Page out = userReportPOService.getInterferenceUserPage(userReportQueryParam, true); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); } @@ -153,7 +153,7 @@ public class UserReportManageController extends BaseController { @ApiImplicitParam(name = "userReportQueryParam", value = "参数", required = true) public HttpResult> getInterferenceUserPage(@RequestBody @Validated UserReportParam.UserReportQueryParam userReportQueryParam) { String methodDescribe = getMethodDescribe("getInterferenceUserPage"); - Page out = userReportPOService.getInterferenceUserPage(userReportQueryParam,false); + Page out = userReportPOService.getInterferenceUserPage(userReportQueryParam, false); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); } @@ -168,9 +168,6 @@ public class UserReportManageController extends BaseController { } - - - @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) @PostMapping("/cancel") @ApiOperation("取消") @@ -183,11 +180,13 @@ public class UserReportManageController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @GetMapping(value ="/downloadSensitiveReportTemplate", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) + @GetMapping(value = "/downloadSensitiveReportTemplate", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) @ApiOperation("下载干扰源用户台账模板") public void downloadSensitiveReportTemplate() { userReportPOService.downloadSensitiveReportTemplate(); } + + @PostMapping(value = "/importSensitiveReportData", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) @ApiOperation("批量导入干扰源用户") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) @@ -199,9 +198,8 @@ public class UserReportManageController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @GetMapping(value ="/downloadSensitiveUserTemplate", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) + @GetMapping(value = "/downloadSensitiveUserTemplate", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) @ApiOperation("下载敏感及重要用户模板") public void downloadSensitiveUserTemplate() { userReportPOService.downloadSensitiveUserTemplate(); 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 9ce262296..7129ad891 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 @@ -145,6 +145,9 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl lineDetail = lineFeignClient.getDeptDeviceDetailData(param).getData(); + if(CollUtil.isEmpty(lineDetail)){ + return new Page<>(); + } Map mapDetail=new HashMap<>(); QueryWrapper quitRunningDeviceVOQueryWrapper = new QueryWrapper<>(); if (Objects.nonNull(quitRunningDeviceQueryParam)) { diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java index 5498d2de3..176956dd9 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/UserReportPOService.java @@ -36,7 +36,7 @@ public interface UserReportPOService extends IBpmService { List getUserReportList(); - Page getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam,Boolean allDataFlag); + Page getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam, Boolean allDataFlag); String cancelUserReport(BpmProcessInstanceCancelParam cancelReqVO); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index 392ed3259..72084b1b9 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -101,21 +101,21 @@ public class UserReportPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.BUILD_USER_INFO.getKey()); @@ -290,9 +290,9 @@ public class UserReportPOServiceImpl extends ServiceImplx.between("supervision_user_report.expected_production_date", + userReportVOQueryWrapper.and(x -> x.between("supervision_user_report.expected_production_date", DateUtil.beginOfDay(DateUtil.parse(userReportQueryParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(userReportQueryParam.getSearchEndTime()))).or().isNull("supervision_user_report.expected_production_date")); } @@ -377,7 +377,7 @@ public class UserReportPOServiceImpl extends ServiceImpl list = this.lambdaQuery() .eq(UserReportPO::getStatus, 2) - .eq(UserReportPO::getDataType,0) + .eq(UserReportPO::getDataType, 0) .in(CollectionUtil.isNotEmpty(data), UserReportPO::getOrgId, data) .list(); List collect = list.stream().map(temp -> { @@ -393,13 +393,13 @@ public class UserReportPOServiceImpl extends ServiceImpl getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam,Boolean allDataFlag) { + public Page getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam, Boolean allDataFlag) { QueryWrapper userReportVOQueryWrapper = new QueryWrapper<>(); List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); userReportVOQueryWrapper.in("supervision_user_report.create_by", colleaguesIds) .eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode()) .eq("supervision_user_report.status", FlowStatusEnum.APPROVE.getCode()); - if(!allDataFlag){ + if (!allDataFlag) { //台账不查询全部数据，需要排除敏感及重要用户 userReportVOQueryWrapper.ne("supervision_user_report.user_type", UserNatureEnum.SENSITIVE_USER.getCode()); } @@ -412,7 +412,7 @@ public class UserReportPOServiceImpl extends ServiceImpl !x.getName().equals("风光储")&&!x.getName().equals("超高压")).map(DictData::getName).collect(Collectors.toList())); + pullDown.setStrings(jiBeiArea.stream().filter(x -> !x.getName().equals("风光储") && !x.getName().equals("超高压")).map(DictData::getName).collect(Collectors.toList())); pullDowns.add(pullDown); pullDown = new PullDown(); @@ -656,7 +656,7 @@ public class UserReportPOServiceImpl extends ServiceImpl !"风光储".equals(x.getName())&&!"超高压".equals(x.getName())).map(DictData::getName).collect(Collectors.toList())); + pullDown.setStrings(jiBeiArea.stream().filter(x -> !"风光储".equals(x.getName()) && !"超高压".equals(x.getName())).map(DictData::getName).collect(Collectors.toList())); pullDowns.add(pullDown); pullDown = new PullDown(); @@ -874,10 +874,10 @@ public class UserReportPOServiceImpl extends ServiceImpl getTreeString(String name, List treeVOS) { - Map info = new LinkedHashMap<>(); + public Map getTreeString(String name, List treeVOS) { + Map info = new LinkedHashMap<>(); for (SysDicTreePO sysMenuDtoChild : treeVOS) { if (sysMenuDtoChild.getLevel() == 3) { - name = sysMenuDtoChild.getId()+"-"+sysMenuDtoChild.getName(); + name = sysMenuDtoChild.getId() + "-" + sysMenuDtoChild.getName(); } if (CollUtil.isNotEmpty(sysMenuDtoChild.getChildren())) { info.putAll(getTreeString(name, sysMenuDtoChild.getChildren())); } else { - info.put(name.split("-")[1],name.split("-")[0]); + info.put(name.split("-")[1], name.split("-")[0]); } } return info; @@ -976,7 +976,7 @@ public class UserReportPOServiceImpl extends ServiceImpl userReportPOLambdaQueryWrapper = new LambdaQueryWrapper<>(); userReportPOLambdaQueryWrapper .eq(UserReportPO::getProjectName, userReportParam.getProjectName()) @@ -986,9 +986,8 @@ public class UserReportPOServiceImpl extends ServiceImpl userReportPOList = this.baseMapper.selectList(userReportPOLambdaQueryWrapper);