测试文档bug调整

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java

@@ -15,8 +15,8 @@ import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
 import com.njcn.event.enums.EventResponseEnum;
 import com.njcn.event.file.pojo.enums.WaveFileResponseEnum;
-import com.njcn.event.pojo.constant.Param;
-import com.njcn.event.pojo.param.*;
+import com.njcn.event.pojo.param.EventBaseParam;
+import com.njcn.event.pojo.param.StatisticsParam;
 import com.njcn.event.pojo.po.EventDetail;
 import com.njcn.event.pojo.po.RmpEventDetailPO;
 import com.njcn.event.pojo.vo.*;
@@ -30,11 +30,9 @@ import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.influxdb.dto.QueryResult;
-import org.influxdb.impl.InfluxDBResultMapper;
 import org.springframework.stereotype.Service;
 
 import java.io.*;
-import java.math.BigDecimal;
 import java.text.ParseException;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -1428,7 +1426,8 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
             if (waveTypeVO.getLineId() != null) {
                 for (AreaLineInfoVO lineInfoVO : areaLineList) {
                     if (waveTypeVO.getLineId().equals(lineInfoVO.getLineId())) {
-                        waveTypeVO.setStartTime(record.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")));
+//                        waveTypeVO.setStartTime(record.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")));
+                        waveTypeVO.setStartTime(record.getStartTime());
                         waveTypeVO.setSubName(lineInfoVO.getSubName());
                         waveTypeVO.setLineId(lineInfoVO.getLineId());
                         waveTypeVO.setLineName(lineInfoVO.getLineName());

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java

@@ -1,11 +1,22 @@
 package com.njcn.event.service.majornetwork.Impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.tocrhz.mqtt.publisher.MqttPublisher;
+import com.njcn.common.pojo.constant.LogInfo;
+import com.njcn.common.pojo.dto.LogInfoDTO;
+import com.njcn.common.utils.PubUtils;
+import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
+import com.njcn.device.biz.pojo.dto.DeptGetBase;
+import com.njcn.device.biz.pojo.param.DeptGetLineParam;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
+import com.njcn.event.pojo.vo.SendEventVO;
 import com.njcn.event.utils.EventUtil;
 import com.njcn.event.mapper.majornetwork.EventDetailMapper;
 import com.njcn.event.pojo.dto.EventDeatilDTO;
@@ -16,6 +27,7 @@ import com.njcn.influx.utils.InfluxDbUtils;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.po.DictData;
+import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.influxdb.dto.QueryResult;
@@ -26,8 +38,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * @author denghuajun
@@ -40,8 +51,10 @@ import java.util.Objects;
 public class EventDetailServiceImpl extends ServiceImpl<EventDetailMapper, RmpEventDetailPO> implements EventDetailService {
 
     private final InfluxDbUtils influxDbUtils;
-
     private final DicDataFeignClient dicDataFeignClient;
+    private final MqttPublisher publisher;
+    private final CommTerminalGeneralClient commTerminalGeneralClient;
+    private final LineFeignClient lineFeignClient;
 
 
     @Override
@@ -159,14 +172,41 @@ public class EventDetailServiceImpl extends ServiceImpl<EventDetailMapper, RmpEv
         if(Objects.nonNull(one)){
             rmpEventDetailPO.setEventId(one.getEventId());
             this.updateById(rmpEventDetailPO);
-        }else {
+        } else {
             this.save(rmpEventDetailPO);
+            //推送MQTT消息给前端，用于展示告警消息和弹窗
+            pushEvent(rmpEventDetailPO);
         }
-
-
         return true;
     }
 
+    private void pushEvent(RmpEventDetailPO po) {
+        //获取部门
+        String deptIndex = RequestUtil.getDeptIndex();
+        Set<String> dept = new HashSet<>();
+        dept.add(deptIndex);
+        DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
+        deptGetLineParam.setDeptId(deptIndex);
+        List<DeptGetBase> deptList = commTerminalGeneralClient.getDeptChildrenByParent(deptGetLineParam).getData();
+        if (CollectionUtil.isNotEmpty(deptList)) {
+            deptList.forEach(item->{
+                dept.addAll(item.getUnitChildrenList());
+            });
+        }
+        SendEventVO vo = new SendEventVO();
+        vo.setDeptList(dept);
+        vo.setTime(po.getStartTime());
+        vo.setEventValue(po.getFeatureAmplitude());
+        vo.setPersistTime(po.getDuration());
+        vo.setEventType(po.getEventType());
+        vo.setEventReason(po.getAdvanceReason());
+        List<AreaLineInfoVO> lineInfoVOList = lineFeignClient.getBaseLineAreaInfo(Collections.singletonList(po.getLineId())).getData();
+        vo.setLineName(lineInfoVOList.get(0).getLineName());
+        vo.setPowerCompany(lineInfoVOList.get(0).getGdName());
+        vo.setSubstation(lineInfoVOList.get(0).getSubName());
+        publisher.send("/sendEvent", PubUtils.obj2json(vo), 1, false);
+    }
+
     public String eventTypeReflection(Integer eventType){
         String result ="";
         switch (eventType) {