高级算法代码修改，管理员功能代码移植

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailAssPO.java

@@ -1,6 +1,8 @@
 package com.njcn.event.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -21,17 +23,19 @@ public class RmpEventDetailAssPO extends BaseEntity {
     /**
      *事件关联分析表uuid
      */
+    @TableId("Event_Ass_Id")
     private String eventAssId;
 
     /**
      *发生时间（归一化中第一个时间）
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS")
     private LocalDateTime timeId;
 
     /**
      *关联事件描述
      */
-    private String describe;
+    private String contentDes;
 
     /**
      *是否进行范围分析（0：分析；1：未分析）

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/AdvanceEventDetailVO.java

@@ -96,10 +96,15 @@ public class AdvanceEventDetailVO {
 
     private Double transientValue;
 
+    @ApiModelProperty(value = "供电公司名称")
     private String gdName;
 
+    @ApiModelProperty(value = "变电站名称")
     private String subName;
 
+    @ApiModelProperty(value = "监测点名称")
+    private String lineName;
+
     private String voltageId;
 
     @ApiModelProperty(value = "特征值是否计算")

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/MonitorPointController.java

@@ -45,7 +45,7 @@ public class MonitorPointController extends BaseController {
      * @author cdf
      * @date 2022/6/23
      */
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+ /*   @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getEventAnalyse")
     @ApiOperation("获取监测点暂降事件分析")
     @ApiImplicitParam(name = "eventBaseParam", value = "暂降事件分析参数", required = true)
@@ -53,7 +53,7 @@ public class MonitorPointController extends BaseController {
         String methodDescribe = getMethodDescribe("getEventAnalyse");
         Page<EventDetail> page = eventAnalysisService.getEventAnalyse(eventBaseParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
-    }
+    }*/
 
     /**
      * 获取电压暂态表及密度图

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

@@ -23,7 +23,7 @@ public interface EventAnalysisService {
      * @author cdf
      * @date 2022/6/23
      */
-    Page<EventDetail> getEventAnalyse(EventBaseParam eventBaseParam);
+    //Page<EventDetail> getEventAnalyse(EventBaseParam eventBaseParam);
 
     /**
      * 获取坐标

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

@@ -65,7 +65,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
     private final DicDataFeignClient dicDataFeignClient;
 
 
-    @Override
+    /*@Override
     public Page<EventDetail> getEventAnalyse(EventBaseParam eventBaseParam) {
 
         //查询sql语句
@@ -97,7 +97,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
         page.setCurrent(eventBaseParam.getPageNum());
         page.setSize(eventBaseParam.getPageSize());
         return page;
-    }
+    }*/
 
     /**
      * 时间无ID全查询