数据模板解析调整

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

@@ -80,6 +80,13 @@ public enum TypeEnum {
     INSET("InSet","内部定值"),
     CTRL("Ctrl","控制"),
 
+    /**
+     * 监测点位置信息
+     */
+    GUID("guid","电网侧"),
+    LOAD("load","负载侧"),
+
+
     ;
 
     private final String code;

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

@@ -46,4 +46,12 @@ public class ApfDto implements Serializable {
     @ApiModelProperty("数据统计方法(max,min,avg,cp95)")
     private List<String> statMethod;
 
+    @SerializedName("HarmStart")
+    @ApiModelProperty("开始次数")
+    private Integer harmStart;
+
+    @SerializedName("HarmEnd")
+    @ApiModelProperty("结束次数")
+    private Integer harmEnd;
+
 }

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

@@ -26,6 +26,10 @@ public class ClDevDto implements Serializable {
     @ApiModelProperty(value = "逻辑子设备型号")
     private String devType;
 
+    @SerializedName("Location")
+    @ApiModelProperty(value = "安装位置")
+    private String location;
+
     @SerializedName("DataList")
     @NotEmpty(message = "数据模型列表,不可为空")
     private List<String> dataList;