1.根据code获取字典树

2.解决数据中心bug
3.优化暂态报表的查询语句将influxdb转为mysql

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

@@ -1,11 +1,16 @@
 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 org.influxdb.annotation.Column;
 import org.influxdb.annotation.Measurement;
 
 import java.math.BigDecimal;
 import java.time.Instant;
+import java.time.LocalDateTime;
 
 /**
  * @author zbj
@@ -14,31 +19,29 @@ import java.time.Instant;
  */
 
 @Data
-@Measurement(name = "pqs_eventass")
-public class Eventass {
+@TableName("r_mp_event_detail_ass")
+public class Eventass extends BaseEntity {
 
-  @Column(name = "time")
-  private Instant timeId;
+  /**
+   *事件关联分析表uuid
+   */
+  @TableId("Event_Ass_Id")
+  private String eventAssId;
 
-  @Column(name = "event_time")
-  private String eventTime;
+  /**
+   *发生时间（归一化中第一个时间）
+   */
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS")
+  private LocalDateTime timeId;
 
-  @Column(name = "line_id")
-  private String lineId;
+  /**
+   *关联事件描述
+   */
+  private String contentDes;
 
-  @Column(name = "host")
-  private String host;
-
-  @Column(name = "describe")
-  private String describe;
-
-  @Column(name = "range")
-  private Integer range;
-
-  @Column(name = "user_index")
-  private String userIndex;
-
-  @Column(name = "user_name")
-  private String userName;
+  /**
+   *是否进行范围分析（0：分析；1：未分析）
+   */
+  private Integer analyseFlag;
 
 }

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

@@ -5,7 +5,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
 
 /**
  * @author zbj
@@ -19,7 +18,7 @@ public class TimeSVO extends TimeVO {
 
 
     @ApiModelProperty(name = "eventAssIndex", value = "关联处理事件时间")
-    private int eventAssIndex;
+    private Integer eventAssIndex;
 
 
 }