暂态事件处理

iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java

@@ -20,6 +20,8 @@ public enum AccessResponseEnum {
     MODEL_REPEAT("A0302", "模板存在,请勿重复录入!"),
     MODEL_NO_FIND("A0302", "模板不存在,请先录入模板数据!"),
 
+    DICT_ANALYSIS_ERROR("A0303","字典解析错误!"),
+    MODEL_ANALYSIS_ERROR("A0303","模板解析错误!"),
     MESSAGE_TYPE_ERROR("A0303","报文消息类型Type错误!"),
     DEV_TYPE_ERROR("A0303","装置类型错误!"),
     DEV_NOT_FIND("A0303","装置类型未找到!"),
@@ -58,6 +60,8 @@ public enum AccessResponseEnum {
     LDEVINFO_IS_NULL("A0309","逻辑设备信息为空"),
     SOFTINFO_IS_NULL("A0309","软件信息为空"),
 
+    LINE_POSITION_REPEAT("A0310","监测点位置重复")
+
     ;
 
     private final String code;

iot-access/access-api/src/main/java/com/njcn/access/enums/TypeEnum.java

@@ -62,6 +62,7 @@ public enum TypeEnum {
     DATA_12("12","定值Set"),
     DATA_13("13","内部定值InSet"),
     DATA_14("14","控制Ctrl"),
+    DATA_16("16","波形文件"),
 
     /**
      * 数据模型列表

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/EventDto.java

@@ -0,0 +1,94 @@
+package com.njcn.access.pojo.dto;
+
+import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/8/22 11:36
+ */
+@Data
+public class EventDto {
+
+    @SerializedName("Mid")
+    private Integer mid;
+
+    @SerializedName("Did")
+    @ApiModelProperty("逻辑设备 治理逻辑设备为1 电能质量设备为2")
+    private Integer did;
+
+    @SerializedName("Pri")
+    private Integer pri;
+
+    @SerializedName("Type")
+    private Integer type;
+
+    @SerializedName("Msg")
+    private Msg msg;
+
+    @Data
+    public static class Msg{
+
+        @SerializedName("Cldid")
+        @ApiModelProperty("逻辑子设备 治理逻辑设备为0 电能质量设备为1、2")
+        private Integer clDid;
+
+        @SerializedName("DataType")
+        private Integer dataType;
+
+        @SerializedName("DataAttr")
+        @ApiModelProperty("数据属性：无-0、实时-1、统计-2")
+        private Integer dataAttr;
+
+        @SerializedName("DsNameIdx")
+        private Integer dsNameIdx;
+
+        @SerializedName("DataArray")
+        private List<DataArray> dataArray;
+    }
+
+    @Data
+    public static class DataArray{
+
+        @SerializedName("Idx")
+        private Integer idx;
+
+        @SerializedName("Name")
+        private String name;
+
+        @SerializedName("DataTimeSec")
+        private Long dataTimeSec;
+
+        @SerializedName("DataTimeUSec")
+        private Long dataTimeUSec;
+
+        @SerializedName("Type")
+        @ApiModelProperty("事件类型")
+        private String type;
+
+        @SerializedName("Parm")
+        private List<Param> param;
+    }
+
+    @Data
+    public static class Param{
+
+        @SerializedName("Name")
+        private String name;
+
+        @SerializedName("Type")
+        private String type;
+
+        @SerializedName("Unit")
+        private String unit;
+
+        @SerializedName("Data")
+        private Object data;
+    }
+}

iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsEvtParmPO.java

@@ -1,62 +0,0 @@
-package com.njcn.access.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 事件参数表
- * </p>
- *
- * @author xuyang
- * @since 2023-05-19
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@TableName("cs_evt_parm")
-public class CsEvtParmPO extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private String id;
-
-    /**
-     * pid
-     */
-    @MppMultiId(value = "pid")
-    private String pid;
-
-    /**
-     * 事件信息名称
-     */
-    @MppMultiId(value = "name")
-    private String name;
-
-    /**
-     * 参数类型“string”“float”
-     */
-    private String type;
-
-    /**
-     * 参数单位
-     */
-    private String unit;
-
-    /**
-     * 参数值
-     */
-    private String data;
-
-}