From 8502421b91acf1a1d0a89a3ad8cbffaf92464769 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 2 Jul 2024 18:23:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E8=AF=95?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E8=AF=84=E4=BC=B0-=E8=AF=95=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E7=BB=93=E6=9D=9F=E5=90=8E=E7=94=9F=E6=88=90=E8=AF=95?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=8A=A5=E5=91=8A=E6=8E=A5=E7=BA=BF=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E8=B0=83=E6=95=B4=E6=9C=89=E5=88=99=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=88=99=E9=BB=98=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/SupervisionTempLineRunTestVO.java | 13 +++++++ .../SupervisionTempLineRunTestMapper.xml | 3 +- ...SupervisionTempLineRunTestServiceImpl.java | 34 +++++++++++++++---- 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineRunTestVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineRunTestVO.java index 04a58b4e9..96cc2ec10 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineRunTestVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineRunTestVO.java @@ -1,5 +1,6 @@ package com.njcn.supervision.pojo.vo.device; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; @@ -84,7 +85,19 @@ public class SupervisionTempLineRunTestVO extends BaseEntity{ + /** + * 试运行成功报告地址 + */ + @ApiModelProperty(value = "试运行成功报告地址") + private String testRunReport; + public void setTestRunReport(String testRunReport) { + if (StrUtil.isNotBlank(testRunReport)) { + this.testRunReport = "/" + testRunReport; + } else { + this.testRunReport = testRunReport; + } + } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml index 598042cc7..f61fd88fd 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineRunTestMapper.xml @@ -19,7 +19,8 @@ supervision_temp_line_run_test.test_run_time, supervision_temp_line_run_test.`online_rate` `onlineRate`, supervision_temp_line_run_test.`integrity_rate` `integrityRate`, - supervision_temp_line_run_test.`suit_rate` `suitRate` + supervision_temp_line_run_test.`suit_rate` `suitRate`, + supervision_temp_line_run_test.`test_run_report` as testRunReport FROM supervision_temp_line_debug inner JOIN supervision_temp_line_report ON supervision_temp_line_report.id = supervision_temp_line_debug.id diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java index 7f7e40e38..1492a00a8 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineRunTestServiceImpl.java @@ -24,6 +24,7 @@ import com.njcn.device.pq.api.LineIntegrityClient; import com.njcn.device.pq.pojo.dto.LineDataQualityDTO; import com.njcn.device.pq.pojo.param.LineDataQualityParam; import com.njcn.harmonic.api.ReportFeignClient; +import com.njcn.oss.utils.FileStorageUtil; import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.enums.SupervisionUserStatusEnum; import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper; @@ -42,6 +43,7 @@ import com.njcn.supervision.utils.InstanceUtil; import com.njcn.web.utils.RequestUtil; import java.io.IOException; +import java.io.InputStream; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -50,6 +52,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; +import org.springframework.http.MediaType; import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -70,20 +73,16 @@ import javax.servlet.http.HttpServletResponse; public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl implements ISupervisionTempLineRunTestService { private final CommLineClient commLineClient; - private final SupervisionTempLineReportMapper supervisionTempLineReportMapper; - private final LineIntegrityClient lineIntegrityClient; - private final BpmProcessFeignClient bpmProcessFeignClient; - private final UserReportPOService userReportPOService; - private final UserReportProjectPOService userReportProjectPOService; private final UserReportSubstationPOService userReportSubstationPOService; private final UserReportSensitivePOService userReportSensitivePOService; private final IUserReportNormalService iUserReportNormalService; private final ReportFeignClient reportFeignClient; + private final FileStorageUtil fileStorageUtil; @Override @@ -209,6 +208,9 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl lineRunTestIds = usePoList.stream().map(SupervisionTempLineRunTestPO::getId).collect(Collectors.toList()); + List supervisionTempLineReports = supervisionTempLineReportMapper.selectBatchIds(lineRunTestIds); + Map lineReportMap = supervisionTempLineReports.stream().collect(Collectors.toMap(SupervisionTempLineReport::getId, SupervisionTempLineReport::getMainWiringDiagram)); Map> map = usePoList.stream().collect(Collectors.groupingBy(SupervisionTempLineRunTestPO::getTestRunTime)); map.forEach((key, val) -> { String startTime = key.split("--")[0]; @@ -237,6 +239,26 @@ public class SupervisionTempLineRunTestServiceImpl extends ServiceImpl