模拟直连设备在APP注册接入

2023-07-06 11:32:25 +08:00
parent 18aa374215
commit feb30c71dd
111 changed files with 968 additions and 3603 deletions
--- a/iot-access/access-api/src/main/java/com/njcn/access/annotation/ParamName.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/annotation/ParamName.java
@@ -1,4 +1,4 @@
-package com.njcn.access.param;
+package com.njcn.access.annotation;

 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
--- a/iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java
@@ -14,19 +14,22 @@ public enum AccessResponseEnum {
     * A0301 ~ A0399 用于用户模块的枚举
     * <p>
     */
-    NDID_NO_FIND("A0301", "与平台nDid匹配错误!"),
+    NDID_NO_FIND("A0301", "nDid在平台端未找到或者已接入"),

    MODEL_REPEAT("A0302", "模板重复,请勿重复录入!"),
    MODEL_NO_FIND("A0302", "模板不存在,请先录入模板数据!"),

    MESSAGE_TYPE_ERROR("A0303","报文消息类型Type错误!"),
    DEV_TYPE_ERROR("A0303","装置类型错误!"),
+    DEV_NOT_FIND("A0303","装置类型未找到!"),
+    DEV_MODEL_NOT_FIND("A0303","装置型号未找到!"),
+    DEV_IS_NOT_ZL("A0303","注册装置不是直连装置!"),

-    RESPONSE_ERROR("A0304","装置请求响应错误!"),
+    REGISTER_RESPONSE_ERROR("A0304","装置注册,装置侧应答失败!"),

    DEV_TYPE_NOT_FIND("A0305","装置类型未找到,需要录入!"),

-    NO_RECEIVE_FROM_DEV("A0306","未收到装置注册响应,请核查!"),
+    REGISTER_ERROR("A0306","装置注册失败!"),

    DICT_MISSING("A0307","字典数据缺失!"),
    EPD_DICT_MISSING("A0307","Epd字典数据缺失!"),
@@ -42,6 +45,9 @@ public enum AccessResponseEnum {
    INSET_DICT_MISSING("A0307","InSet字典数据缺失!"),
    CTRL_DICT_MISSING("A0307","Ctrl字典数据缺失!"),

+    MODEL_MISS("A0308","模板信息缺失!"),
+    MODEL_VERSION_ERROR("A0308","询问装置模板信息错误"),
+
    ;

    private final String code;
--- a/iot-access/access-api/src/main/java/com/njcn/access/param/DevAccessParam.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/param/DevAccessParam.java
@@ -0,0 +1,71 @@
+package com.njcn.access.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/7/5 16:25
+ */
+@Data
+public class DevAccessParam implements Serializable {
+
+    @ApiModelProperty("项目id")
+    @NotNull(message = "项目id不能为空")
+    private String projectId;
+
+    @ApiModelProperty("区域")
+    private String area;
+
+    @ApiModelProperty("拓扑图id")
+    @NotNull(message = "拓扑图id不能为空")
+    private String topologyDiagram;
+
+    @ApiModelProperty("设备识别码")
+    @NotNull(message = "设备识别码不能为空")
+    private String nDid;
+
+    @ApiModelProperty("监测点集合")
+    @NotNull(message = "监测点集合不能为空")
+    private List<LineParam> list;
+
+    @Data
+    public static class LineParam {
+
+        @ApiModelProperty("监测点名称")
+        @NotNull(message = "监测点名称不能为空")
+        private String name;
+
+        @ApiModelProperty("安装位置")
+        @NotNull(message = "安装位置不能为空")
+        private String position;
+
+        @ApiModelProperty("电压等级")
+        @NotNull(message = "电压等级不能为空")
+        private String volGrade;
+
+        @ApiModelProperty("PT变比")
+        @NotNull(message = "PT变比不能为空")
+        private String ptRatio;
+
+        @ApiModelProperty("CT变比")
+        @NotNull(message = "CT变比不能为空")
+        private String ctRatio;
+
+        @ApiModelProperty("中心点经度")
+        @NotNull(message = "中心点经度不能为空")
+        private Double lng;
+
+        @ApiModelProperty("中心点纬度")
+        @NotNull(message = "中心点纬度不能为空")
+        private Double lat;
+    }
+
+}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/AccessDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/AccessDto.java
@@ -1,6 +1,6 @@
 package com.njcn.access.pojo.dto;

-import com.njcn.access.param.ParamName;
+import com.njcn.access.annotation.ParamName;
 import lombok.Data;

 import java.io.Serializable;
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/DevCfgDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/DevCfgDto.java
@@ -1,8 +1,7 @@
 package com.njcn.access.pojo.dto;

 import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
-import com.njcn.access.param.ParamName;
-import io.swagger.annotations.ApiModelProperty;
+import com.njcn.access.annotation.ParamName;
 import lombok.Data;

 import javax.validation.constraints.NotNull;
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/ModelDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/ModelDto.java
@@ -1,8 +1,11 @@
 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 lombok.EqualsAndHashCode;

+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
@@ -12,16 +15,43 @@ import java.util.List;
 *
 * @author xuyang
 * @version 1.0.0
- * @createTime 2023/4/10 10:54
+ * @createTime 2023/7/5 11:26
 */
@Data
 public class ModelDto implements Serializable {

-    @SerializedName("DevCfg")
-    @NotNull(message = "设备配置序列,不为空")
-    private List<DevCfgDto> devCfg;
+    @SerializedName("Mid")
+    @ApiModelProperty("报文ID,在请求报文中该值为请求ID")
+    @NotNull(message = "报文ID不能为空")
+    private Integer mid;

-    @SerializedName("DevModInfo")
-    @NotNull(message = "设备模板信息序列,不为空")
-    private List<DevModInfoDto> devMod;
+    @SerializedName("Did")
+    @ApiModelProperty("设备唯一标识lDid,填入0代表nDid")
+    @NotBlank(message = "设备唯一标识lDid不能为空")
+    private String did;
+
+    @SerializedName("Pri")
+    @ApiModelProperty("报文处理的优先级")
+    @NotNull(message = "报文处理的优先级不能为空")
+    private Integer pri;
+
+    @SerializedName("Type")
+    @ApiModelProperty("消息类型")
+    @NotNull(message = "消息类型不能为空")
+    private String type;
+
+    @SerializedName("Msg")
+    @ApiModelProperty("报文内容")
+    private Msg msg;
+
+    @Data
+    public static class Msg {
+        @SerializedName("DevCfg")
+        @ApiModelProperty("设备配置序列")
+        private List<DevCfgDto> devCfg;
+
+        @SerializedName("DevModInfo")
+        @ApiModelProperty("设备模板信息序列")
+        private List<DevModInfoDto> devMod;
+    }
 }
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/param/ReqAndResParam.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/param/ReqAndResParam.java
@@ -1,4 +1,4 @@
-package com.njcn.access.pojo.param;
+package com.njcn.access.pojo.dto;

 import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;

 /**
 * 类的介绍：
@@ -17,7 +18,7 @@ import java.io.Serializable;
 * @createTime 2023/4/20 14:05
 */
@Data
-public class ReqAndResParam implements Serializable {
+public class ReqAndResDto implements Serializable {

    @SerializedName("Mid")
    @ApiModelProperty("报文ID,在请求报文中该值为请求ID")
@@ -48,7 +49,7 @@ public class ReqAndResParam implements Serializable {
     */
    @Data
    @EqualsAndHashCode(callSuper = true)
-    public static class Req extends ReqAndResParam {
+    public static class Req extends ReqAndResDto {
        @SerializedName("Expire")
        @ApiModelProperty("此报文过期的相对时间,单位秒,该字段为-1时表示永不过期.控制类报文接收者超时处理按此时间")
        @NotNull(message = "报文过期的相对时间不能为空")
@@ -60,10 +61,11 @@ public class ReqAndResParam implements Serializable {
     */
    @Data
    @EqualsAndHashCode(callSuper = true)
-    public static class Res extends ReqAndResParam {
+    public static class Res extends ReqAndResDto {
        @SerializedName("Code")
        @ApiModelProperty("标识应答的返回码")
        @NotNull(message = "状态码不能为空")
        private Integer code;
    }
+
 }
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/data/StsDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/data/StsDto.java
@@ -38,17 +38,8 @@ public class StsDto implements Serializable {
    @NotNull(message = "当前值,不为空")
    private Integer curSts;

-    @SerializedName("ClassID")
-    @NotNull(message = "数据分类,不为空")
-    private String classId;
-
    @SerializedName("TranRule")
    @NotNull(message = "上送规则,不为空")
    @ApiModelProperty("变化:change 周期:period")
    private String tranRule;
-
-    //todo 不确定是否还有这个字段先保留
-    @SerializedName("GroupId")
-    @NotNull(message = "数据分组组号,不为空")
-    private List<Object> groupId;
 }
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/ApfDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/ApfDto.java
@@ -0,0 +1,45 @@
+package com.njcn.access.pojo.dto.devModel;
+
+import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/7/3 15:15
+ */
+@Data
+public class ApfDto implements Serializable {
+
+    @SerializedName("OpAttr")
+    @NotNull(message = "读写操作属性,不为空")
+    private String opAttr;
+
+    @SerializedName("Name")
+    @NotNull(message = "数据名称,不为空")
+    private String name;
+
+    @SerializedName("IDX")
+    @NotNull(message = "数据编号,不为空")
+    private Integer idx;
+
+    @SerializedName("Type")
+    @NotNull(message = "数据类型,不为空")
+    private String type;
+
+    @SerializedName("Unit")
+    @ApiModelProperty("单位")
+    private String unit;
+
+    @SerializedName("StatMethod")
+    @ApiModelProperty("数据统计方法(max,min,avg,cp95)")
+    private List<String> statMethod;
+
+}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/CfgDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/CfgDto.java
@@ -1,63 +0,0 @@
-package com.njcn.access.pojo.dto.devModel;
-
-import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 类的介绍：
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/4/10 16:35
- */
-@Data
-public class CfgDto implements Serializable {
-
-    @SerializedName("DevModName")
-    private String name;
-
-    @SerializedName("DevModVersion")
-    private String version;
-
-    @SerializedName("DevModTime")
-    private String time;
-
-    @SerializedName("ID")
-    private String id;
-
-    @SerializedName("DevType")
-    private String type;
-
-    @SerializedName("DevApp")
-    private String devApp;
-
-    @SerializedName("DevInfo")
-    private DevInfoDto devInfo;
-
-    @SerializedName("Province")
-    private String province;
-
-    @SerializedName("City")
-    private String city;
-
-    @SerializedName("County")
-    private String county;
-
-    @SerializedName("Address")
-    private String address;
-
-    @SerializedName("Position")
-    private String position;
-
-    @SerializedName("LineNum")
-    private Integer lineNum;
-
-    @SerializedName("FileFrameLength")
-    private Integer fileFrameLength;
-
-    @SerializedName("FileFrameTimeout")
-    private Integer fileFrameTimeout;
-
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/ClDevDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/ClDevDto.java
@@ -28,7 +28,7 @@ public class ClDevDto implements Serializable {

    @SerializedName("DataList")
    @NotEmpty(message = "数据模型列表,不可为空")
-    private List<DevModDataListDto> dataList;
+    private List<String> dataList;

    @SerializedName("DataSet")
    @NotEmpty(message = "数据集序列,不可为空")
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/DevModDataListDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/DevModDataListDto.java
@@ -1,77 +0,0 @@
-package com.njcn.access.pojo.dto.devModel;
-
-import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
-import com.njcn.access.pojo.dto.data.*;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 类的介绍：
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/5/16 15:27
- */
-@Data
-public class DevModDataListDto implements Serializable {
-
-    @SerializedName("SoftInfo")
-    @NotEmpty(message = "软件信息,不可为空")
-    private SoftInfoDto softInfoDto;
-
-    @SerializedName("LdevInfo")
-    @NotEmpty(message = "设备信息,不可为空")
-    private List<LDevInfoDto> lDevInfoDto;
-
-    @SerializedName("Epd")
-    @NotEmpty(message = "电能数据,不可为空")
-    private List<EpdPqdDto> epdDto;
-
-    @SerializedName("Pqd")
-    @NotEmpty(message = "电能质量数据,不可为空")
-    private List<EpdPqdDto> pqdDto;
-
-    @SerializedName("Bmd")
-    @NotEmpty(message = "基础测量数据,不可为空")
-    private List<BmdDto> bmdDto;
-
-    @SerializedName("Evt")
-    @NotEmpty(message = "事件,不可为空")
-    private List<EvtDto> evtDto;
-
-    @SerializedName("Alm")
-    @NotEmpty(message = "告警,不可为空")
-    private List<AlmDto> almDto;
-
-    @SerializedName("Sts")
-    @NotEmpty(message = "状态,不可为空")
-    private List<StsDto> stsDto;
-
-    @SerializedName("Di")
-    @NotEmpty(message = "开入,不可为空")
-    private List<DiDto> diDto;
-
-    @SerializedName("Do")
-    @NotEmpty(message = "开出,不可为空")
-    private List<DoDto> doDto;
-
-    @SerializedName("Parm")
-    @NotEmpty(message = "参数,不可为空")
-    private List<ParmDto> parmDto;
-
-    @SerializedName("Set")
-    @NotEmpty(message = "定值,不可为空")
-    private List<SetDto> setDto;
-
-    @SerializedName("InSet")
-    @NotEmpty(message = "内部定值,不可为空")
-    private List<InSetDto> inSetDto;
-
-    @SerializedName("Ctrl")
-    @NotEmpty(message = "控制,不可为空")
-    private List<CtrlDto> ctrlDto;
-
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/DevModDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/DevModDto.java
@@ -1,44 +0,0 @@
-package com.njcn.access.pojo.dto.devModel;
-
-import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 类的介绍：
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/5/4 10:00
- */
-@Data
-public class DevModDto implements Serializable {
-
-    @SerializedName("Version")
-    @NotEmpty(message = "直连装置/网关版本号,不可为空")
-    private String version;
-
-    @SerializedName("Time")
-    @NotEmpty(message = "创建或最后修改时间,不可为空")
-    private String time;
-
-    @SerializedName("DevType")
-    @NotEmpty(message = "设备型号,不可为空")
-    private String devType;
-
-    @SerializedName("DataList")
-    @NotEmpty(message = "数据模型列表,不可为空")
-    private List<DevModDataListDto> dataList;
-
-    @SerializedName("DataSet")
-    @NotEmpty(message = "数据集,不可为空")
-    private List<DataSetDto> dataSetDtoList;
-
-    @SerializedName("Cldev")
-    @ApiModelProperty(value = "逻辑子设备序列")
-    private List<ClDevDto> clDevDtoList;
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/NetDevModDataListDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/NetDevModDataListDto.java
@@ -1,27 +0,0 @@
-package com.njcn.access.pojo.dto.devModel;
-
-import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import java.io.Serializable;
-
-/**
- * 类的介绍：
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/5/16 15:27
- */
-@Data
-public class NetDevModDataListDto implements Serializable {
-
-    @SerializedName("SoftInfo")
-    @NotEmpty(message = "软件信息,不可为空")
-    private SoftInfoDto softInfoDto;
-
-    @SerializedName("PrjInfo")
-    @NotEmpty(message = "工程信息,不可为空")
-    private PrjInfoDto prjInfoDto;
-
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/NetDevModDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/NetDevModDto.java
@@ -1,35 +0,0 @@
-package com.njcn.access.pojo.dto.devModel;
-
-import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 类的介绍：
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/4/10 16:25
- */
-@Data
-public class NetDevModDto implements Serializable {
-
-    @SerializedName("Version")
-    @NotEmpty(message = "直连装置/网关版本号,不可为空")
-    private String version;
-
-    @SerializedName("Time")
-    @NotEmpty(message = "创建或最后修改时间,不可为空")
-    private String time;
-
-    @SerializedName("DevType")
-    @NotEmpty(message = "设备型号,不可为空")
-    private String devType;
-
-    @SerializedName("DataList")
-    @NotEmpty(message = "数据模型列表,不可为空")
-    private List<NetDevModDataListDto> dataList;
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/TemplateDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/TemplateDto.java
@@ -1,10 +1,13 @@
 package com.njcn.access.pojo.dto.devModel;

 import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
+import com.njcn.access.pojo.dto.data.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

 import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
+import java.util.List;

 /**
 * 类的介绍：
@@ -16,12 +19,88 @@ import java.io.Serializable;
@Data
 public class TemplateDto implements Serializable {

-    @SerializedName("NetDevMod")
-    @NotEmpty(message = "直连装置/网关信息描述表,不为空")
-    private NetDevModDto netDevModDto;
+    @SerializedName("Version")
+    @NotEmpty(message = "版本号,不可为空")
+    private String version;

-    @SerializedName("DevMod")
-    @NotEmpty(message = "逻辑设备数据模板说明,不为空")
-    private DevModDto devModDto;
+    @SerializedName("Time")
+    @NotEmpty(message = "创建或最后修改时间,不可为空")
+    private String time;
+
+    @SerializedName("DevType")
+    @NotEmpty(message = "设备型号,不可为空")
+    private String devType;
+
+    @SerializedName("DataList")
+    @NotEmpty(message = "数据模型列表,不可为空")
+    private List<String> dataList;
+
+    @SerializedName("DataSet")
+    @NotEmpty(message = "数据集,不可为空")
+    private List<DataSetDto> dataSet;
+
+    @SerializedName("Cldev")
+    @ApiModelProperty(value = "逻辑子设备序列")
+    private List<ClDevDto> clDevDtoList;
+
+    @SerializedName("SoftInfo")
+    @NotEmpty(message = "软件信息,不可为空")
+    private List<SoftInfoDto> softInfoDto;
+
+    @SerializedName("LdevInfo")
+    @NotEmpty(message = "设备信息,不可为空")
+    private List<LDevInfoDto> lDevInfoDto;
+
+    @SerializedName("Apf")
+    @NotEmpty(message = "谐波治理设备Apf,不可为空")
+    private List<ApfDto> apfDto;
+
+    @SerializedName("Epd")
+    @ApiModelProperty("电能数据")
+    private List<EpdPqdDto> epdDto;
+
+    @SerializedName("Pqd")
+    @ApiModelProperty("电能质量数据")
+    private List<EpdPqdDto> pqdDto;
+
+    @SerializedName("Bmd")
+    @ApiModelProperty("基础测量数据")
+    private List<BmdDto> bmdDto;
+
+    @SerializedName("Evt")
+    @ApiModelProperty("事件")
+    private List<EvtDto> evtDto;
+
+    @SerializedName("Alm")
+    @ApiModelProperty("告警")
+    private List<AlmDto> almDto;
+
+    @SerializedName("Sts")
+    @ApiModelProperty("状态")
+    private List<StsDto> stsDto;
+
+    @SerializedName("Di")
+    @ApiModelProperty("开入")
+    private List<DiDto> diDto;
+
+    @SerializedName("Do")
+    @ApiModelProperty("开出")
+    private List<DoDto> doDto;
+
+    @SerializedName("Parm")
+    @ApiModelProperty("参数")
+    private List<ParmDto> parmDto;
+
+    @SerializedName("Set")
+    @ApiModelProperty("定值")
+    private List<SetDto> setDto;
+
+    @SerializedName("InSet")
+    @ApiModelProperty("内部定值")
+    private List<InSetDto> inSetDto;
+
+    @SerializedName("Ctrl")
+    @ApiModelProperty("控制")
+    private List<CtrlDto> ctrlDto;

 }
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/heart/HeartBeatDto.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/heart/HeartBeatDto.java
@@ -1,6 +1,6 @@
 package com.njcn.access.pojo.dto.heart;

-import com.njcn.access.param.ParamName;
+import com.njcn.access.annotation.ParamName;
 import lombok.Data;

 import java.io.Serializable;
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/param/MessageParam.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/param/MessageParam.java
@@ -1,4 +1,4 @@
-package com.njcn.access.pojo;
+package com.njcn.access.pojo.param;

 import lombok.Data;

--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsAlmPO.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsAlmPO.java
@@ -1,62 +0,0 @@
-package com.njcn.access.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 设备告警数据表
- * </p>
- *
- * @author xuyang
- * @since 2023-05-19
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@TableName("cs_alm")
-@Deprecated
-public class CsAlmPO extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private String id;
-
-    /**
-     * 读写操作属性：“r”
-     */
-    private String opAttr;
-
-    /**
-     * 告警事件名称
-     */
-    @MppMultiId(value = "name")
-    private String name;
-
-    /**
-     * 告警事件编号
-     */
-    private Integer idx;
-
-    /**
-     * 告警事件类别“1”“2”
-     */
-    private String type;
-
-    /**
-     * 别名
-     */
-    private String anotherName;
-
-    /**
-     * 数据分类，唯一类别
-     */
-    private String classId;
-
-
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsBmdPO.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsBmdPO.java
@@ -1,46 +0,0 @@
-package com.njcn.access.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import lombok.Data;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author xuyang
- * @since 2023-05-11
- */
-@Data
-@TableName("cs_bmd")
-@Deprecated
-public class CsBmdPO {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    @MppMultiId(value = "name")
-    private String name;
-
-    private String anotherName;
-
-    private Integer idx;
-
-    private String type;
-
-    private String unit;
-
-    @MppMultiId(value = "phase")
-    private String phase;
-
-    private String classId;
-
-    private String statMethod;
-
-    private String tranRule;
-
-    private String opAttr;
-
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsCtrlPO.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsCtrlPO.java
@@ -1,99 +0,0 @@
-package com.njcn.access.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.naming.Name;
-
-/**
- * <p>
- * 控制表
- * </p>
- *
- * @author xuyang
- * @since 2023-05-19
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@TableName("cs_ctrl")
-@Deprecated
-public class CsCtrlPO extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private String id;
-
-    /**
-     * 读写操作属性：“r”
-     */
-    private String opAttr;
-
-    /**
-     * 参数名称
-     */
-    @MppMultiId(value = "name")
-    private String name;
-
-    /**
-     * 别名
-     */
-    private String anotherName;
-
-    /**
-     * 参数编号
-     */
-    private Integer idx;
-
-    /**
-     * 下发数据类型 “string”“float”“enum”
-     */
-    private String type;
-
-    /**
-     * 是否需遥控校验 “1”“0”
-     */
-    private Integer remoteControlCheck;
-
-    /**
-     * 是否支持自动控制 “1”“0”
-     */
-    private Integer auto;
-
-    /**
-     * 设置最大值
-     */
-    private Integer maxNum;
-
-    /**
-     * 设置最小值
-     */
-    private Integer minNum;
-
-    /**
-     * 参数为enum可设置的所有值序列
-     */
-    private String ctlValue;
-
-    /**
-     * 参数string可设置字符串的长度上限
-     */
-    private Integer strlen;
-
-    /**
-     * 是否加密，“1”“0”
-     */
-    private Integer encode;
-
-    /**
-     * 数据分类，唯一类别
-     */
-    private String classId;
-
-
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsDiPO.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsDiPO.java
@@ -1,83 +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_di")
-@Deprecated
-public class CsDiPO extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Id
-     */
-    private String id;
-
-    /**
-     * 读写操作属性：“r”
-     */
-    private String opAttr;
-
-    /**
-     * 开入信号名称
-     */
-    @MppMultiId(value = "name")
-    private String name;
-
-    /**
-     * 开入编号
-     */
-    private Integer idx;
-
-    /**
-     * 是否存储“1”“0”
-     */
-    private Integer storeFlag;
-
-    /**
-     * 当前值“1”“0”
-     */
-    private Integer curSts;
-
-    /**
-     * 数据分类，唯一类别
-     */
-    private String classId;
-
-    /**
-     * 数据是否上送 “1”“0”
-     */
-    private Integer tranFlag;
-
-    /**
-     * 上送规则 变化:“change”周期:“period”
-     */
-    private String tranRule;
-
-    /**
-     * 别名
-     */
-    private String anotherName;
-
-
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsDoPO.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsDoPO.java
@@ -1,93 +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_do")
-@Deprecated
-public class CsDoPO extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Id
-     */
-    private String id;
-
-    /**
-     * 读写操作属性：“r”
-     */
-    private String opAttr;
-
-    /**
-     * 开出信号名称
-     */
-    @MppMultiId(value = "name")
-    private String name;
-
-    /**
-     * DO编号
-     */
-    private Integer idx;
-
-    /**
-     * 当前值/设定值“1”“0”
-     */
-    private Integer curSts;
-
-    /**
-     * 是否可远程控制 “1”“0”
-     */
-    private Integer ctlSts;
-
-    /**
-     * 创建用户
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新用户
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 别名
-     */
-    private String anotherName;
-
-    /**
-     * 数据分类，唯一类别
-     */
-    private String classId;
-
-
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsEpdPqdPO.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsEpdPqdPO.java
@@ -1,61 +0,0 @@
-package com.njcn.access.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
-import lombok.Data;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author xuyang
- * @since 2023-05-11
- */
-@Data
-@TableName("cs_epd_pqd")
-@Deprecated
-public class CsEpdPqdPO {
-
-    private static final long serialVersionUID = 1L;
-
-    @MppMultiId(value = "name")
-    private String name;
-
-    @MppMultiId(value = "phase")
-    private String phase;
-
-    @TableField(value = "id")
-    private String id;
-
-    @TableField(value = "another_name")
-    private String anotherName;
-
-    @TableField(value = "idx")
-    private Integer idx;
-
-    @TableField(value = "type")
-    private String type;
-
-    @TableField(value = "unit")
-    private String unit;
-
-    @TableField(value = "harm_start")
-    private Integer harmStart;
-
-    @TableField(value = "harm_end")
-    private Integer harmEnd;
-
-    @TableField(value = "class_id")
-    private String classId;
-
-    @TableField(value = "stat_method")
-    private String statMethod;
-
-    @TableField(value = "op_attr")
-    private String opAttr;
-
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsEvtPO.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsEvtPO.java
@@ -1,85 +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 lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 事件表
- * </p>
- *
- * @author xuyang
- * @since 2023-05-19
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@TableName("cs_evt")
-@Deprecated
-public class CsEvtPO extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private String id;
-
-    /**
-     * 读写操作属性：“r”
-     */
-    private String opAttr;
-
-    /**
-     * 事件信息名称
-     */
-    @MppMultiId(value = "name")
-    private String name;
-
-    /**
-     * 事件编号
-     */
-    private Integer idx;
-
-    /**
-     * 事件类别“1”“2”
-     */
-    private String type;
-
-    /**
-     * 创建用户
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新用户
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 别名
-     */
-    private String anotherName;
-
-    /**
-     * 数据分类，唯一类别
-     */
-    private String classId;
-
-
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsLineModel.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsLineModel.java
@@ -0,0 +1,62 @@
+package com.njcn.access.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 监测点模板表
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-07-05
+ */
+@Data
+@TableName("cs_line_model")
+public class CsLineModel {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点id
+     */
+    private String lineId;
+
+    /**
+     * 模板id
+     */
+    private String pid;
+
+    /**
+     * 监测点默认名称
+     */
+    private String name;
+
+    /**
+     * 安装位置
+     */
+    private String position;
+
+    /**
+     * 电压等级
+     */
+    private String volGrade;
+
+    /**
+     * PT变比
+     */
+    private String ptRatio;
+
+    /**
+     * CT变比
+     */
+    private String ctRatio;
+
+
+}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsParmPO.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsParmPO.java
@@ -1,98 +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.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 参数表
- * </p>
- *
- * @author xuyang
- * @since 2023-05-19
- */
-@Data
-@TableName("cs_parm")
-@Deprecated
-public class CsParmPO extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    /**
-     * 读写操作属性：“r”
-     */
-    private String opAttr;
-
-    /**
-     * 参数名称
-     */
-    @MppMultiId(value = "name")
-    private String name;
-
-    /**
-     * 别名
-     */
-    private String anotherName;
-
-    /**
-     * 参数编号
-     */
-    private Integer idx;
-
-    /**
-     * 系统参数：“sys”运行参数：“run”	功能参数:“fun”
-     */
-    private String type;
-
-    /**
-     * 参数数据类型 “string”“float”“enum”
-     */
-    private String dataType;
-
-    /**
-     * 是否可修改 “1”“0”
-     */
-    private Integer modifyFlag;
-
-    /**
-     * 设置最大值
-     */
-    private Integer maxNum;
-
-    /**
-     * 设置最小值
-     */
-    private Integer minNum;
-
-    /**
-     * 参数为enum可设置的所有值序列
-     */
-    private String setValue;
-
-    /**
-     * 参数string可设置字符串的长度上限
-     */
-    private Integer strlen;
-
-    /**
-     * 参数缺省值
-     */
-    private String defaultValue;
-
-    /**
-     * 数据分类，唯一类别
-     */
-    private String classId;
-
-
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsSetPO.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsSetPO.java
@@ -1,103 +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_set")
-@Deprecated
-public class CsSetPO extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private String id;
-
-    /**
-     * 读写操作属性：“r”
-     */
-    private String opAttr;
-
-    /**
-     * 参数名称
-     */
-    @MppMultiId(value = "name")
-    private String name;
-
-    /**
-     * 别名
-     */
-    private String anotherName;
-
-    /**
-     * 参数编号
-     */
-    private Integer idx;
-
-    /**
-     * 定值数据类型 “hex”“number”
-     */
-    private String dataType;
-
-    /**
-     * 设置最大值
-     */
-    private Integer maxNum;
-
-    /**
-     * 设置最小值
-     */
-    private Integer minNum;
-
-    /**
-     * 定值缺省值
-     */
-    private String defaultValue;
-
-    /**
-     * 数据分类，唯一类别
-     */
-    private String classId;
-
-    /**
-     * 创建用户
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新用户
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-
-}
--- a/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsStsPO.java
+++ b/iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsStsPO.java
@@ -1,78 +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_sts")
-@Deprecated
-public class CsStsPO extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    private String id;
-
-    /**
-     * 读写操作属性：“r”
-     */
-    private String opAttr;
-
-    /**
-     * 状态名称
-     */
-    @MppMultiId(value = "name")
-    private String name;
-
-    /**
-     * 状态编号
-     */
-    private Integer idx;
-
-    /**
-     * 是否存储“1”“0”
-     */
-    private Integer storeFlag;
-
-    /**
-     * 当前值“1”“0”
-     */
-    private Integer curSts;
-
-    /**
-     * 数据分类，唯一类别
-     */
-    private String classId;
-
-    /**
-     * 上送规则 变化:“change”周期:“period”
-     */
-    private String tranRule;
-
-    /**
-     * 别名
-     */
-    private String anotherName;
-
-
-}