From d4ba963d98b575c479a3fdd5b60ca5d8a94b2f7b Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Fri, 5 May 2023 13:02:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8D=95=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/event/pojo/po/RmpEventDetailPO.java | 5 ++++- .../Impl/EventAnalysisServiceImpl.java | 14 +++++++------- .../harmonic/pojo/mysql/po/line/TopMsgPO.java | 10 ++-------- .../mapping/DeviceAbnormaStatisticsMapper.xml | 6 +++--- .../DeviceAbnormaStatisticsServiceImpl.java | 19 +++++-------------- 5 files changed, 21 insertions(+), 33 deletions(-) diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java index 43c35186f..9174a0740 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java @@ -85,9 +85,12 @@ public class RmpEventDetailPO implements Serializable { private String sagsource; @ApiModelProperty(value = "开始时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS", timezone = "GMT+8") private LocalDateTime startTime; + @ApiModelProperty(value = "格式化开始时间") + @TableField(exist = false) + private String formatTime; + @ApiModelProperty(value = "持续时间，单位秒") private Double duration; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java index dce6a2d2c..b1d11de6a 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java @@ -954,7 +954,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { Integer endMonth = Integer.parseInt(endTime.substring(5, 7)); Integer startYear = Integer.parseInt(startTime.substring(0, 4)); Integer endYear = Integer.parseInt(endTime.substring(0, 4)); - if (statisticsParam.getFlag() == 0) { + if (statisticsParam.getFlag()==0) { while (startYear != endYear && startMonth != endMonth) { builder1.delete(0, builder1.length()); builder2.delete(0, builder2.length()); @@ -1019,12 +1019,12 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { ); Map> map = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType())) - .collect(Collectors.groupingBy(s -> s.getStartTime().toString())); + .peek(t ->t.setFormatTime(t.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))) + .collect(Collectors.groupingBy(RmpEventDetailPO::getFormatTime)); Set keySet = map.keySet(); - LocalDate parse1 = LocalDate.parse(startTime); LocalDate parse2 = LocalDate.parse(endTime); - while (!parse1.equals(parse2.plus(1, ChronoUnit.DAYS))) { + while (!parse1.equals(parse2.plus(1, ChronoUnit.DAYS))){ if (keySet.contains(parse1.toString())) { // List eventDetailNews = map.get(parse1.toString()); List eventDetailNews = map.get(parse1.toString()); @@ -1067,7 +1067,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { } @Override - public StatisticVO getStatistic(StatisticsParam statisticsParam) { + public StatisticVO getStatistic (StatisticsParam statisticsParam) { StatisticVO result = new StatisticVO(); List list = new ArrayList<>(); List reasonsVOS = new ArrayList<>(); @@ -1107,8 +1107,8 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { for (DictData data : typeData) { typeMap.put(data.getName(), 0); if (detail.getAdvanceType().equals(data.getId())) { - details = BeanUtil.copyProperties(detail, EventDetail.class); - detail.setAdvanceType(data.getName()); +// details = BeanUtil.copyProperties(detail, EventDetail.class); + details.setAdvanceType(data.getName()); } } list.add(details); diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/TopMsgPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/TopMsgPO.java index dd202d569..d6a4e3999 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/TopMsgPO.java +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/TopMsgPO.java @@ -27,27 +27,25 @@ public class TopMsgPO extends BaseEntity { */ private Integer deviceLevel; + private Integer offtimeFlag; /** * 通信中断次数 */ private Integer comOutCount; - - /** * 通信中断时间段描述 */ private String comOutDescription; - /** * 数据完整性标识 0.不达标 1.达标 */ private Integer integrityFlag; - /** * 数据完成性百分比 */ private Float integrityValue; + private Integer alarmCountFlag; /** * 告警次数 */ @@ -58,8 +56,6 @@ public class TopMsgPO extends BaseEntity { */ private String alarmDesc; - private Integer alarmCountFlag; - /** * 流量超标标识 0.不达标 1.达标 */ @@ -74,8 +70,6 @@ public class TopMsgPO extends BaseEntity { private float onlineRateValue; - private Integer offtimeFlag; - private List communicates; /** diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml index e5456b06f..e11681d08 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml @@ -58,7 +58,7 @@ @@ -150,7 +150,7 @@