From 4b3b1ffcceb0c33f2436bd38363190f77267ec9d Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Fri, 15 Mar 2024 08:49:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=B0=E8=B4=A6=E6=8E=A5=E5=8F=A3bug?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=202.=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3bug?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CommTerminalServiceImpl.java | 2 +- .../majornetwork/impl/MonitorServiceImpl.java | 4 +- .../service/impl/ThsSuperviseServiceImpl.java | 97 +++++++++++-------- 3 files changed, 59 insertions(+), 44 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java index 75fd3b8f9..9edbb944c 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java @@ -807,7 +807,7 @@ public class CommTerminalServiceImpl implements CommTerminalService { .eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode()).in(Monitor::getOrgId,deptList.stream().map(Dept::getCode).collect(Collectors.toList())) .eq(Monitor::getMonitorState,dictData.getId()) .in(Monitor::getMonitorTag,tagList) - .or(item->item.in(Monitor::getId,monitorIds))); + .or(CollectionUtil.isNotEmpty(monitorIds),item->item.in(CollectionUtil.isNotEmpty(monitorIds),Monitor::getId,monitorIds))); monitorList.forEach(item->result.add(CommMonitorInfoDTO.builder().id(item.getId()).name(item.getName()).powerStationName(item.getPowerrName()).build())); return result; } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index 1dc5b63a2..da63d4ee3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -609,9 +609,7 @@ public class MonitorServiceImpl extends ServiceImpl impl DictData dictData = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.LINE_STATE.getName(), DicDataEnum.RUN.getName()).getData(); List deptList = deptFeignClient.getAllDept().getData(); List monitorList = this.lambdaQuery().select(Monitor::getOrgId).eq(Monitor::getMonitorState,dictData.getId()).list().stream().map(Monitor::getOrgId).distinct().collect(Collectors.toList()); - List deptTem = deptList.stream().filter(it->monitorList.contains(it.getCode())).collect(Collectors.toList()); - - return deptTem; + return deptList.stream().filter(it->monitorList.contains(it.getCode())).collect(Collectors.toList()); } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java index 93d75bdf5..d8c999b7c 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java @@ -159,8 +159,8 @@ public class ThsSuperviseServiceImpl extends ServiceImpl { + thsOverRunLogService.remove(new LambdaQueryWrapper().eq(ThsOverRunLog::getSupIndex, id)); + thsSuperviseMapper.delete(new LambdaQueryWrapper().eq(ThsSupervise::getSupIndex, id)); + + //删除同时删除工作流程 + FlowableAss flowableAss = flowableAssMapper.selectById(id); + if (Objects.nonNull(flowableAss)) { + iFlowDefinitionService.deleteInstance(flowableAss.getExecIndex(), ""); + flowableAssMapper.deleteById(id); + } + + }); + } + + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, "删除技术监督"); + } + + @Override public Page querySuperviseList(SuperviseDto superviseDto) { Integer pageNum = PageFactory.getPageNum(superviseDto); @@ -222,27 +247,6 @@ public class ThsSuperviseServiceImpl extends ServiceImpl { - thsOverRunLogService.remove(new LambdaQueryWrapper().eq(ThsOverRunLog::getSupIndex, id)); - thsSuperviseMapper.delete(new LambdaQueryWrapper().eq(ThsSupervise::getSupIndex, id)); - - //删除同时删除工作流程 - FlowableAss flowableAss = flowableAssMapper.selectById(id); - if (Objects.nonNull(flowableAss)) { - iFlowDefinitionService.deleteInstance(flowableAss.getExecIndex(), ""); - flowableAssMapper.deleteById(id); - } - - }); - } - - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, "删除技术监督"); - } - @Override @Transactional(rollbackFor = Exception.class) public void uploadSuperviseTicket(String id, String supIndex, Integer ticketType, MultipartFile[] files, HttpServletResponse response) { @@ -250,32 +254,25 @@ public class ThsSuperviseServiceImpl extends ServiceImpl thsOverRunLogList = thsOverRunLogService.list(new LambdaQueryWrapper().eq(ThsOverRunLog::getSupIndex,supIndex)); + if (files != null && files.length == 1) { ThsOverRunLog thsOverRunLog = thsOverRunLogService.getById(id); thsOverRunLog.setId(id); String path = fileStorageUtil.uploadMultipart(files[0], OssPath.ELECTRICITY_QUALITY); this.updateSuperviesData(path, thsOverRunLog, ticketType, thsSupervise); - this.updateProcess(thsSupervise, ticketType, thsSuperObj.getType()); } if (files != null && files.length > 1) { - List thsOverRunLogs = thsOverRunLogService.list(new LambdaQueryWrapper().eq(ThsOverRunLog::getSupIndex, supIndex)); - this.batchUploadFile(thsSupervise, thsOverRunLogs, files, ticketType); - this.updateProcess(thsSupervise, ticketType, thsSuperObj.getType()); + if(files.length!=thsOverRunLogList.size()){ + throw new BusinessException("批量上传需保证报告数量与测点数量一致"); + } + + this.batchUploadFile(thsSupervise, thsOverRunLogList, files, ticketType); } + this.updateProcess(thsSupervise, ticketType, thsSuperObj.getType(),thsOverRunLogList,files.length); - //判断当监督单下面的监测点报告都被上传则认为流程完成 - List thsOverRunLogs = thsOverRunLogService.list(new LambdaQueryWrapper().eq(ThsOverRunLog::getSupIndex, supIndex)); - List fileNames = thsOverRunLogs.stream().filter(item -> StrUtil.isNotBlank(item.getFeedback())).map(ThsOverRunLog::getFileName).distinct().collect(Collectors.toList()); - if (fileNames.size() == thsOverRunLogs.size()) { - FlowableAss flowableAss = flowableAssMapper.selectById(supIndex); - Task task = iFlowTaskService.getTask(flowableAss.getExecIndex()); - FlowTaskVo flowTaskVo = new FlowTaskVo(); - flowTaskVo.setAssignee(RequestUtil.getUserIndex()); - flowTaskVo.setTaskId(task.getId()); - iFlowTaskService.complete(flowTaskVo); - } } /** @@ -285,14 +282,20 @@ public class ThsSuperviseServiceImpl extends ServiceImpl thsOverRunLogList,Integer uploadCount) { TicketTypeEnum ticketTypeEnum = TicketTypeEnum.getTicketTypeEnumByCode(ticketType); if (ticketTypeEnum == null) { throw new BusinessException("上传单据参数类型错误！"); } + + long count = 0; switch (ticketTypeEnum) { + case FEEDBACK: - thsSupervise.setProgress(ProgressEnum.TEST_REPORT.getCode()); + count = thsOverRunLogList.stream().filter(item->Objects.isNull(item.getFeedback())).count(); + if(uploadCount == count){ + thsSupervise.setProgress(ProgressEnum.TEST_REPORT.getCode()); + } break; case TEST_REPORT: if (AlarmTypeEnum.EARLY_WARN.getCode().equals(type)) { @@ -305,6 +308,19 @@ public class ThsSuperviseServiceImpl extends ServiceImpl().eq(ThsSupervise::getSupIndex, thsSupervise.getSupIndex())); } @@ -680,6 +696,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl