diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
index 3d4f90a33..03b523d2f 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
@@ -24,33 +24,41 @@
select count(ed.event_id) "count",
ed.measurement_point_id "id"
from r_mp_event_detail ed
- where
- ed.measurement_point_id in
-
- #{item}
-
-
- and date_format(ed.start_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
-
-
- and date_format(ed.start_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
-
+
+
+ ed.measurement_point_id in
+
+ #{item}
+
+
+
+ and date_format(ed.start_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
+
+
+ and date_format(ed.start_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
+
+
group by ed.measurement_point_id
@@ -75,17 +83,20 @@
count(ed.event_id) "count"
from r_mp_event_detail ed
left join sys_dict_data sdd on ed.event_type = sdd.id and sdd.code = 'Voltage_Dip'
- where
- ed.measurement_point_id in
-
- #{item}
-
-
- and date_format(ed.start_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
-
-
- and date_format(ed.start_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
-
+
+
+ ed.measurement_point_id in
+
+ #{item}
+
+
+
+ and date_format(ed.start_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d')
+
+
+ and date_format(ed.start_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
+
+
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
index 7125d703f..5410fa680 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
@@ -232,7 +232,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
}
}
// 输出返回结果的Map集合中的每一个键值对
- resultMap.entrySet().forEach(System.out::println);
+// resultMap.entrySet().forEach(System.out::println);
for (LocalDate s : resultMap.keySet()) {
DownTimeVO downTimeVO = new DownTimeVO();
downTimeVO.setTime(s.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));