将终端台账拆分为pq&pms两类

2022-09-29 19:43:14 +08:00
parent 5385e7521b
commit ab8e86f257
530 changed files with 5060 additions and 1863 deletions
--- a/pqs-event/event-api/pom.xml
+++ b/pqs-event/event-api/pom.xml
@@ -34,7 +34,7 @@
        </dependency>
        <dependency>
            <groupId>com.njcn</groupId>
-            <artifactId>device-api</artifactId>
+            <artifactId>pq-device-api</artifactId>
            <version>1.0.0</version>
            <scope>compile</scope>
        </dependency>
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/AreaReportParam.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/AreaReportParam.java
@@ -1,7 +1,7 @@
 package com.njcn.event.pojo.param;


-import com.njcn.device.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/ExportParam.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/ExportParam.java
@@ -1,6 +1,5 @@
 package com.njcn.event.pojo.param;

-import com.njcn.device.pojo.param.DeviceInfoParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Getter;
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/TransientParam.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/TransientParam.java
@@ -1,6 +1,6 @@
 package com.njcn.event.pojo.param;

-import com.njcn.device.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/WaveTypeParam.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/WaveTypeParam.java
@@ -1,6 +1,6 @@
 package com.njcn.event.pojo.param;

-import com.njcn.device.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDetail.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDetail.java
@@ -1,6 +1,8 @@
 package com.njcn.event.pojo.po;

-import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.InstantSerializer;
 import lombok.Data;
 import org.influxdb.annotation.Column;
 import org.influxdb.annotation.Measurement;
@@ -22,6 +24,7 @@ public class EventDetail {
  private String lineId;

  @Column(name = "time")
+  @JsonSerialize(using = InstantSerializer.class)
  private Instant timeId;

  @Column(name = "event_describe")
@@ -94,5 +97,4 @@ public class EventDetail {

  private String subName;

-
 }
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/AreaLineVO.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/AreaLineVO.java
@@ -1,6 +1,6 @@
 package com.njcn.event.pojo.vo;

-import com.njcn.device.pojo.vo.SubstationDetailVO;
+import com.njcn.device.pq.pojo.vo.SubstationDetailVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/AreaSubLineVO.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/AreaSubLineVO.java
@@ -1,6 +1,6 @@
 package com.njcn.event.pojo.vo;

-import com.njcn.device.pojo.vo.AreaLineInfoVO;
+import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import lombok.Data;

 import java.math.BigDecimal;
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java
@@ -1,6 +1,6 @@
 package com.njcn.event.pojo.vo;

-import com.njcn.device.pojo.vo.AreaLineInfoVO;
+import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java
@@ -1,16 +1,12 @@
 package com.njcn.event.pojo.vo;

-import com.njcn.device.pojo.vo.AreaLineInfoVO;
-import com.njcn.event.pojo.po.EventDetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.influxdb.annotation.Column;
 import org.influxdb.annotation.Measurement;


 import java.math.BigDecimal;
-import java.time.Instant;
 /**
 *获取事件报告
 * @author zbj
--- a/pqs-event/event-boot/pom.xml
+++ b/pqs-event/event-boot/pom.xml
@@ -34,7 +34,7 @@
        </dependency>
        <dependency>
            <groupId>com.njcn</groupId>
-            <artifactId>device-api</artifactId>
+            <artifactId>pq-device-api</artifactId>
            <version>${project.version}</version>
        </dependency>
        <dependency>
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/AreaAnalysisController.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/AreaAnalysisController.java
@@ -5,7 +5,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.event.pojo.vo.AreaAnalysisVO;
 import com.njcn.event.pojo.vo.VoltageToleranceCurveVO;
 import com.njcn.event.service.AreaAnalysisService;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/AreaController.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/AreaController.java
@@ -6,7 +6,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
-import com.njcn.device.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.event.pojo.vo.AreaLineVO;
 import com.njcn.event.pojo.vo.EventHeatMapVO;
 import com.njcn.event.pojo.vo.EventSeverityVO;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/AreaStatisticalController.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/AreaStatisticalController.java
@@ -5,7 +5,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.event.pojo.vo.AreaStatisticalVO;
 import com.njcn.event.service.AreaStatisticalService;
 import com.njcn.web.controller.BaseController;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/ReportController.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/ReportController.java
@@ -7,8 +7,8 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.api.GeneralDeviceInfoClient;
-import com.njcn.device.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.api.GeneralDeviceInfoClient;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.event.pojo.param.*;
 import com.njcn.event.pojo.vo.DetailVO;
 import com.njcn.event.pojo.vo.GeneralVO;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/controller/area/AreaInfoController.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/controller/area/AreaInfoController.java
@@ -5,8 +5,8 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pojo.param.DeviceInfoParam;
-import com.njcn.device.pojo.vo.TerminalBaseVO;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.vo.TerminalBaseVO;
 import com.njcn.event.pojo.po.EventDetail;
 import com.njcn.event.pojo.po.EventDetailNew;
 import com.njcn.event.pojo.vo.AreaSubLineVO;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/AreaAnalysisService.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/AreaAnalysisService.java
@@ -1,6 +1,6 @@
 package com.njcn.event.service;

-import com.njcn.device.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.event.pojo.vo.AreaAnalysisVO;
 import com.njcn.event.pojo.vo.VoltageToleranceCurveVO;

--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/AreaInfoService.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/AreaInfoService.java
@@ -1,7 +1,7 @@
 package com.njcn.event.service;

-import com.njcn.device.pojo.param.DeviceInfoParam;
-import com.njcn.device.pojo.vo.TerminalBaseVO;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.vo.TerminalBaseVO;
 import com.njcn.event.pojo.po.EventDetail;
 import com.njcn.event.pojo.po.EventDetailNew;
 import com.njcn.event.pojo.vo.AreaSubLineVO;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/AreaLineService.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/AreaLineService.java
@@ -1,7 +1,7 @@
 package com.njcn.event.service;


-import com.njcn.device.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.event.pojo.vo.*;

 import java.util.List;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/AreaStatisticalService.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/AreaStatisticalService.java
@@ -1,6 +1,6 @@
 package com.njcn.event.service;

-import com.njcn.device.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.event.pojo.vo.AreaStatisticalVO;

 /**
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/AreaAnalysisServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/AreaAnalysisServiceImpl.java
@@ -1,11 +1,11 @@
 package com.njcn.event.service.Impl;

 import cn.hutool.core.collection.CollUtil;
-import com.njcn.device.api.GeneralDeviceInfoClient;
-import com.njcn.device.api.LineFeignClient;
-import com.njcn.device.pojo.dto.GeneralDeviceDTO;
-import com.njcn.device.pojo.param.DeviceInfoParam;
-import com.njcn.device.pojo.vo.AreaLineInfoVO;
+import com.njcn.device.pq.api.GeneralDeviceInfoClient;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.event.influxdb.PqsEventDetailQuery;
 import com.njcn.event.pojo.po.EventDetail;
 import com.njcn.event.pojo.vo.AreaAnalysisVO;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/AreaInfoServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/AreaInfoServiceImpl.java
@@ -1,14 +1,14 @@
 package com.njcn.event.service.Impl;

 import cn.hutool.core.collection.CollectionUtil;
-import com.njcn.device.api.GeneralDeviceInfoClient;
-import com.njcn.device.api.LineFeignClient;
-import com.njcn.device.api.TerminalBaseClient;
-import com.njcn.device.pojo.dto.GeneralDeviceDTO;
-import com.njcn.device.pojo.param.DeviceInfoParam;
-import com.njcn.device.pojo.po.Line;
-import com.njcn.device.pojo.vo.AreaLineInfoVO;
-import com.njcn.device.pojo.vo.TerminalBaseVO;
+import com.njcn.device.pq.api.GeneralDeviceInfoClient;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.api.TerminalBaseClient;
+import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.po.Line;
+import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
+import com.njcn.device.pq.pojo.vo.TerminalBaseVO;
 import com.njcn.event.pojo.constant.Param;
 import com.njcn.event.pojo.po.EventDetail;
 import com.njcn.event.pojo.po.EventDetailNew;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/AreaLineServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/AreaLineServiceImpl.java
@@ -5,14 +5,14 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ArrayUtil;
 import com.njcn.common.pojo.enums.common.ServerEnum;
-import com.njcn.device.api.GeneralDeviceInfoClient;
-import com.njcn.device.api.LineFeignClient;
-import com.njcn.device.pojo.dto.GeneralDeviceDTO;
-import com.njcn.device.pojo.param.DeviceInfoParam;
-import com.njcn.device.pojo.vo.AreaLineInfoVO;
-import com.njcn.device.pojo.vo.LineDetailVO;
-import com.njcn.device.pojo.vo.LineDeviceStateVO;
-import com.njcn.device.pojo.vo.SubstationDetailVO;
+import com.njcn.device.pq.api.GeneralDeviceInfoClient;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
+import com.njcn.device.pq.pojo.vo.LineDetailVO;
+import com.njcn.device.pq.pojo.vo.LineDeviceStateVO;
+import com.njcn.device.pq.pojo.vo.SubstationDetailVO;
 import com.njcn.event.influxdb.PqsOnlinerateQuery;
 import com.njcn.event.mapper.PqDeviceMapper;
 import com.njcn.event.pojo.po.PqDevice;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/AreaStatisticalServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/AreaStatisticalServiceImpl.java
@@ -5,9 +5,9 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import com.njcn.device.api.GeneralDeviceInfoClient;
-import com.njcn.device.pojo.dto.GeneralDeviceDTO;
-import com.njcn.device.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.api.GeneralDeviceInfoClient;
+import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.event.influxdb.PqsEventDetailQuery;
 import com.njcn.event.pojo.po.EventDetail;
 import com.njcn.event.pojo.vo.AreaCalculationVO;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/EventAnalysisServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/EventAnalysisServiceImpl.java
@@ -11,9 +11,9 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.common.utils.wave.AnalyWave;
-import com.njcn.device.api.LineFeignClient;
-import com.njcn.device.pojo.vo.AreaLineInfoVO;
-import com.njcn.device.pojo.vo.LineDetailDataVO;
+import com.njcn.device.pq.api.LineFeignClient;
+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.pojo.constant.Param;
 import com.njcn.event.pojo.param.*;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/ReportServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/ReportServiceImpl.java
@@ -21,13 +21,13 @@ import com.github.abel533.echarts.style.itemstyle.Normal;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.device.api.GeneralDeviceInfoClient;
-import com.njcn.device.api.LineFeignClient;
-import com.njcn.device.pojo.dto.GeneralDeviceDTO;
-import com.njcn.device.pojo.param.DeviceInfoParam;
-import com.njcn.device.pojo.param.LineBaseQueryParam;
-import com.njcn.device.pojo.vo.AreaLineInfoVO;
-import com.njcn.device.pojo.vo.LineDetailDataVO;
+import com.njcn.device.pq.api.GeneralDeviceInfoClient;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.LineBaseQueryParam;
+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.pojo.constant.Param;
 import com.njcn.event.pojo.param.*;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/TransientServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/Impl/TransientServiceImpl.java
@@ -11,11 +11,11 @@ import com.njcn.common.pojo.enums.common.ServerEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.common.utils.wave.AnalyWave;
-import com.njcn.device.api.GeneralDeviceInfoClient;
-import com.njcn.device.api.LineFeignClient;
-import com.njcn.device.pojo.dto.GeneralDeviceDTO;
-import com.njcn.device.pojo.vo.AreaLineInfoVO;
-import com.njcn.device.pojo.vo.LineDetailDataVO;
+import com.njcn.device.pq.api.GeneralDeviceInfoClient;
+import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
+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.mapper.TransientMapper;
 import com.njcn.event.pojo.param.TransientParam;
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/ReportService.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/ReportService.java
@@ -1,7 +1,7 @@
 package com.njcn.event.service;

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.device.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.event.pojo.param.*;
 import com.njcn.event.pojo.vo.DetailVO;
 import com.njcn.event.pojo.vo.GeneralVO;