解析模板

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

@@ -17,7 +17,7 @@ public enum AccessResponseEnum {
     NDID_NO_FIND("A0301", "nDid在平台端未找到或者已注册"),
 
     MISSING_CLIENT("A0302","设备客户端不在线!"),
-    MODEL_REPEAT("A0302", "模板重复,请勿重复录入!"),
+    MODEL_REPEAT("A0302", "模板存在,请勿重复录入!"),
     MODEL_NO_FIND("A0302", "模板不存在,请先录入模板数据!"),
 
     MESSAGE_TYPE_ERROR("A0303","报文消息类型Type错误!"),

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

@@ -0,0 +1,69 @@
+package com.njcn.access.enums;
+
+/**
+ * @author xuyang
+ */
+public interface DataModel {
+
+    /**
+     * 数据模型
+     */
+    String APF = "Apf";
+
+    String DVR = "Dvr";
+
+    String EPD = "Epd";
+
+    String PQD = "Pqd";
+
+    String BMD = "Bmd";
+
+    String EVT = "Evt";
+
+    String ALM = "Alm";
+
+    String STS = "Sts";
+
+    String DI = "Di";
+
+    String DO = "Do";
+
+    String PARM = "Parm";
+
+    String SET = "Set";
+
+    String INSET = "InSet";
+
+    String CTRL = "Ctrl";
+
+    /**
+     * 数据模型临时表
+     */
+    String APF_DATA = "apf_data";
+
+    String DVR_DATA = "dvr_data";
+
+    String EPD_DATA = "epd_data";
+
+    String PQD_DATA = "pqd_data";
+
+    String BMD_DATA = "bmd_data";
+
+    String EVT_DATA = "evt_data";
+
+    String ALM_DATA = "alm_data";
+
+    String STS_DATA = "sts_data";
+
+    String DI_DATA = "di_data";
+
+    String DO_DATA = "do_data";
+
+    String PARM_DATA = "parm_data";
+
+    String SET_DATA = "set_data";
+
+    String INSET_DATA = "inset_data";
+
+    String CTRL_DATA = "ctrl_data";
+}

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

@@ -33,6 +33,10 @@ public class EvtDto implements Serializable {
     @NotNull(message = "事件类别,不为空")
     private String eventType;
 
+    @SerializedName("Phase")
+    @NotNull(message = "相别,不为空")
+    private String phase;
+
     @SerializedName("Parm")
     private List<EvtParamDto> param;
 }

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

@@ -35,11 +35,11 @@ public class SetDto implements Serializable {
 
     @SerializedName("MaxNum")
     @ApiModelProperty("设置最大值")
-    private Integer maxNum;
+    private Double maxNum;
 
     @SerializedName("MinNum")
     @ApiModelProperty("设置最小值")
-    private Integer minNum;
+    private Double minNum;
 
     @SerializedName("DefaultValue")
     @NotNull(message = "参数缺省值")

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

@@ -38,6 +38,10 @@ public class ApfDto implements Serializable {
     @ApiModelProperty("单位")
     private String unit;
 
+    @SerializedName("Phase")
+    @ApiModelProperty("相别")
+    private String phase;
+
     @SerializedName("StatMethod")
     @ApiModelProperty("数据统计方法(max,min,avg,cp95)")
     private List<String> statMethod;