From 33da822317a939e52d8f30d5915d0044c7bef969 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 26 Mar 2026 09:33:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/csdevice/pojo/vo/CsLedgerVO.java   |  3 +++
 .../service/impl/CsLedgerServiceImpl.java       |  4 ++++
 .../service/impl/CsAppReportServiceImpl.java    | 17 ++++++++++++++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsLedgerVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsLedgerVO.java
index 61275ca..44e069a 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsLedgerVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsLedgerVO.java
@@ -72,6 +72,9 @@ public class CsLedgerVO implements Serializable {
     @ApiModelProperty(name = "isTop",value = "是否置顶,默认不置顶")
     private Integer isTop = 0;
 
+    @ApiModelProperty(name = "devConType",value = "设备连接方式 MQTT || CLD")
+    private String devConType;
+
     @ApiModelProperty(name = "children",value = "子节点")
     private List<CsLedgerVO> children = new ArrayList<>();
 
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
index 963f9b3..cfd6669 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
@@ -133,6 +133,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                     item.setNDId(po.getNdid());
                     item.setType("device");
                     item.setProcess(po.getProcess());
+                    item.setDevConType(po.getDevAccessMethod());
                 })
                 .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
                 .sorted(Comparator.comparing(CsLedgerVO::getSort))
@@ -146,6 +147,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                     item.setNDId(po.getNdid());
                     item.setType("device");
                     item.setProcess(po.getProcess());
+                    item.setDevConType(po.getDevAccessMethod());
                 })
                 .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
                 .sorted(Comparator.comparing(CsLedgerVO::getSort))
@@ -472,6 +474,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                     item.setNDId(po.getNdid());
                     item.setType("device");
                     item.setProcess(po.getProcess());
+                    item.setDevConType(po.getDevAccessMethod());
                 })
                 .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
                 .sorted(Comparator.comparing(CsLedgerVO::getSort))
@@ -499,6 +502,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
                     item.setNDId(po.getNdid());
                     item.setType("device");
                     item.setProcess(po.getProcess());
+                    item.setDevConType(po.getDevAccessMethod());
                 })
                 .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
                 .sorted(Comparator.comparing(CsLedgerVO::getSort))
diff --git a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java
index cc1cfd0..1178cb5 100644
--- a/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java
+++ b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/service/impl/CsAppReportServiceImpl.java
@@ -100,8 +100,9 @@ public class CsAppReportServiceImpl extends ServiceImpl<CsAppReportMapper, CsApp
             timeRanges = splitIntoMonths(startLocalDate, endLocalDate);
         }
 
-        String queryStartTime = timeRanges.get(0).start.format(DateTimeFormatter.ISO_LOCAL_DATE);
-        String queryEndTime = timeRanges.get(timeRanges.size() - 1).end.format(DateTimeFormatter.ISO_LOCAL_DATE);
+        String queryStartTime = timeRanges.get(timeRanges.size() - 1).end.format(DateTimeFormatter.ISO_LOCAL_DATE);
+        String queryEndTime = timeRanges.get(0).start.format(DateTimeFormatter.ISO_LOCAL_DATE);
+
 
         StatSubstationBizBaseParam rStatLimitQueryParam = new StatSubstationBizBaseParam();
         rStatLimitQueryParam.setIds(Collections.singletonList(param.getLineId()));
@@ -187,6 +188,9 @@ public class CsAppReportServiceImpl extends ServiceImpl<CsAppReportMapper, CsApp
     public void applicationReport(LineParamDTO param) {
         CsAppReport po = new CsAppReport();
         po.setId(IdUtil.fastSimpleUUID());
+        if (Objects.isNull(param.getLineId())) {
+            throw new BusinessException("请选择监测点!");
+        }
         po.setLineId(param.getLineId());
         po.setEventList(String.join(",", param.getList()));
         po.setStartTime(LocalDate.parse(param.getStartTime()));
@@ -239,7 +243,7 @@ public class CsAppReportServiceImpl extends ServiceImpl<CsAppReportMapper, CsApp
         }
         CsAppReport report = this.getById(id);
         if (report == null) {
-            throw new BusinessException("事件缺失");
+            throw new BusinessException("报告记录缺失");
         }
         //生成暂态报告
         //step1: 获取暂态事件
@@ -250,6 +254,13 @@ public class CsAppReportServiceImpl extends ServiceImpl<CsAppReportMapper, CsApp
         List<String> eventIdList = Arrays.asList(eventIds.split(","));
         //获取事件集合
         List<CsEventPO> eventList = eventFeignClient.getEventByIdList(eventIdList).getData();
+        // 收集缺失波形文件的事件
+        List<CsEventPO> missingWaveEventList = eventList.stream()
+                .filter(item -> StringUtils.isBlank(item.getWavePath()))
+                .collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(missingWaveEventList)) {
+            throw new BusinessException("所选的暂态事件波形缺失，无法生成报告");
+        }
         //获取监测点id集合
         List<String> lineIdList = eventList.stream().map(CsEventPO::getLineId).distinct().collect(Collectors.toList());
         //获取监测点集合