1、新增云协议设备台账录入功能；

2、新增云协议设备实时数据请求功能
2025-09-04 13:58:30 +08:00
parent 066dceaeaf
commit 8c442d8897
44 changed files with 1938 additions and 267 deletions
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectAddParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/AppProjectAddParm.java
@@ -5,7 +5,6 @@ import lombok.Data;
 import org.springframework.web.multipart.MultipartFile;

 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;

@@ -20,16 +19,16 @@ import java.util.List;
@Data
 public class AppProjectAddParm {

-
    private String description;

    @ApiModelProperty(value="项目名称")
    @NotBlank(message="项目名称不能为空！")
    private String name;

-    @NotBlank(message="工程id不能为空！")
+    //@NotBlank(message="工程id不能为空！")
    private String engineeringId;

+    private String icdEngineeringId;

    /**
     * 地市Id
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
@@ -5,6 +5,7 @@ import lombok.Data;

 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
+import java.io.Serializable;

 /**
 * 
@@ -17,8 +18,7 @@ import javax.validation.constraints.Pattern;
 */

@Data
-public class CsEquipmentDeliveryAddParm{
-
+public class CsEquipmentDeliveryAddParm implements Serializable {

    /**
     * 装置名称
@@ -39,7 +39,6 @@ public class CsEquipmentDeliveryAddParm{
     * 装置mac地址
     */
    @ApiModelProperty(value="装置mac地址")
-//    @NotBlank(message="装置mac地址不能为空！")
    private String mac;

    /**
@@ -56,56 +55,12 @@ public class CsEquipmentDeliveryAddParm{
    @NotBlank(message="装置型号不能为空！")
    private String devModel;

-//    /**
-//     * 装置程序版本
-//     */
-//    @ApiModelProperty(value="装置程序版本")
-//    @NotBlank(message="装置程序版本不能为空！")
-//    private String programVersion;
-
-//    /**
-//     * 调试人员
-//     */
-//    @ApiModelProperty(value="调试人员")
-//    @NotBlank(message="调试人员不能为空！")
-//    private String debugPerson;
-//
-//    /**
-//     * 出厂日期
-//     */
-//    @ApiModelProperty(value="出厂日期")
-//    @NotNull(message="出厂日期不能为空！")
-//    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-//    private Date producteTime;
-//
-//    /**
-//     * 检修日期
-//     */
-//    @ApiModelProperty(value="检修日期")
-//    @NotNull(message="检修日期不能为空！")
-//    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-//    private Date checkTime;
-//
-//    /**
-//     * 调试日期
-//     */
-//    @ApiModelProperty(value="调试日期")
-//    @NotNull(message="调试日期不能为空！")
-//    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-//    private Date debugTime;
-
    /**
     * 合同号
     */
    @ApiModelProperty(value="合同号")
    private String cntractNo;

-//    /**
-//     * 营销经理
-//     */
-//    @ApiModelProperty(value="营销经理")
-//    private String salesManager;
-
    /**
     * 装置接入方式
     */
@@ -127,4 +82,19 @@ public class CsEquipmentDeliveryAddParm{
    @ApiModelProperty(value="排序")
    private Integer sort;

+    @ApiModelProperty(value="前置机id")
+    private String nodeId;
+
+    @ApiModelProperty(value="前置机进程号")
+    private Integer nodeProcess;
+
+    @ApiModelProperty(value="模板id")
+    private String modelId;
+
+    @ApiModelProperty(value="工程id")
+    private String engineeringId;
+
+    @ApiModelProperty(value="项目id")
+    private String projectId;
+
 }
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java
@@ -95,4 +95,10 @@ public class CsEquipmentDeliveryAuditParm {

    @ApiModelProperty(value="排序")
    private Integer sort;
+
+    @ApiModelProperty(value="前置机id")
+    private String nodeId;
+
+    @ApiModelProperty(value="前置机进程号")
+    private Integer nodeProcess;
 }
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java
@@ -1,6 +1,7 @@
 package com.njcn.csdevice.pojo.param;

 import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@@ -18,25 +19,66 @@ public class CsLineParam extends BaseEntity {

    private String lineId;

+    /**
+     * 监测点名称
+     */
+    private String name;
+
+    @ApiModelProperty(value="工程id")
+    private String engineeringId;
+
+    @ApiModelProperty(value="项目id")
+    private String projectId;
+
+    /**
+     * 装置id
+     */
+    private String devId;
+
+    /**
+     * 装置mac
+     */
+    private String devMac;
+
    /**
     * 电压等级
     */
    private Double volGrade;

    /**
-     * PT变比
+     * 接线方式
+     */
+    private Integer conType;
+
+    /**
+     * PT一次变比
     */
    private Double ptRatio;

    /**
-     * CT变比
+     * PT二次变比
+     */
+    private Double pt2Ratio;
+
+    /**
+     * CT一次变比
     */
    private Double ctRatio;

    /**
-     * 接线方式
+     * CT二次变比
     */
-    private Integer conType;
+    private Double ct2Ratio;
+
+    /**
+     * 监测点线路号
+     */
+    private Integer clDid;
+
+    /**
+     * 统计间隔
+     */
+    private Integer lineInterval;

    /**
     * 模板id
@@ -49,8 +91,7 @@ public class CsLineParam extends BaseEntity {
    private String dataSetId;

    /**
-     * 统计间隔
+     * 运行状态（0：运行；1：检修；2：停运；3：调试；4：退运）
     */
-    private Integer lineInterval;
-
+    private Integer runStatus;
 }
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/NodeParam.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/NodeParam.java
@@ -0,0 +1,104 @@
+package com.njcn.csdevice.pojo.param;
+
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.web.constant.ValidMessage;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.*;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2022/1/14
+ */
+@Data
+@ApiModel
+public class NodeParam {
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty(name = "name",value = "前置服务器名称")
+    @NotBlank(message = "前置机名称不能为空")
+    @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = ValidMessage.NAME_FORMAT_ERROR)
+    private String name;
+
+    /**
+     * 服务器IP
+     */
+    @ApiModelProperty(name = "ip",value = "服务器IP")
+    @NotBlank(message = "前置机IP不能为空")
+    @Pattern(regexp = PatternRegex.IP_REGEX, message = ValidMessage.IP_FORMAT_ERROR)
+    private String ip;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty(name = "remark",value = "描述")
+    private String remark;
+
+
+    /**
+     * 状态 前置等级
+     */
+    @ApiModelProperty(name = "nodeGrade",value = "前置等级")
+    @NotNull(message = "前置机等级不可为空")
+    private Integer nodeGrade;
+
+    /**
+     * 前置机支持最大装置数
+     */
+    @ApiModelProperty(name = "nodeDevNum",value = "前置机支持最大装置数")
+    @NotNull(message = "前置机支持最大装置数不可为空")
+    @Min(value = 1, message = "装置数不可小于1")
+    @Max(value = 1000, message = "装置数不可大于1000")
+    private Integer nodeDevNum;
+
+    /**
+     * 前置机支持最大进程数量
+     */
+    @ApiModelProperty(name = "nodeDevNum",value = "前置机支持最大进程数量")
+    @NotNull(message = "前置机支持最大进程数量")
+    @Min(value = 1, message = "最大进程数量不可小于1")
+    @Max(value = 10, message = "最大进程数量不可大于10")
+    private Integer maxProcessNum;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(name = "sort",value = "排序")
+    @NotNull(message = "排序不可为空")
+    private Integer sort;
+
+    /**
+     * 更新操作实体
+     */
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class NodeUpdateParam extends NodeParam {
+
+        /**
+         * 表Id
+         */
+        @ApiModelProperty("id")
+        @NotBlank(message = ValidMessage.ID_NOT_BLANK)
+        @Pattern(regexp = PatternRegex.SYSTEM_ID, message = ValidMessage.ID_FORMAT_ERROR)
+        private String id;
+    }
+
+    /**
+     * 前置查询
+     */
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class NodeQueryParam extends BaseParam {
+        @ApiModelProperty("前置等级")
+        private Integer nodeGrade;
+
+    }
+}
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
@@ -64,8 +64,6 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
    @TableField(value = "dev_access_method")
    private String devAccessMethod;

-
-
    /**
     * 合同号
     */
@@ -120,4 +118,16 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
    @TableField(value = "sort")
    private Integer sort;

+    /**
+     * 前置服务器IP
+     */
+    @TableField(value = "node_id")
+    private String nodeId;
+
+    /**
+     * 前置进程号
+     */
+    @TableField(value = "node_process")
+    private Integer nodeProcess;
+
 }
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java
@@ -66,12 +66,24 @@ public class CsLinePO  extends BaseEntity {
    @TableField(value = "pt_ratio")
    private Double ptRatio;

+    /**
+     * PT2次变比
+     */
+    @TableField(value = "pt2_ratio")
+    private Double pt2Ratio;
+
    /**
     * CT变比
     */
    @TableField(value = "ct_ratio")
    private Double ctRatio;

+    /**
+     * CT2变比
+     */
+    @TableField(value = "ct2_ratio")
+    private Double ct2Ratio;
+
    /**
     * 状态(0：删除 1：正常)
     */
@@ -101,4 +113,10 @@ public class CsLinePO  extends BaseEntity {
     */
    @TableField(value = "line_interval")
    private Integer lineInterval;
+
+    /**
+     * 运行状态
+     */
+    @TableField(value = "run_status")
+    private Integer runStatus;
 }
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/Node.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/Node.java
@@ -0,0 +1,70 @@
+package com.njcn.csdevice.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author xy
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pq_node")
+public class Node extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 前置序号
+     */
+    private String id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 服务器IP
+     */
+    private String ip;
+
+    /**
+     * 描述
+     */
+    private String remark;
+
+    /**
+     * 状态 0-删除；1-正常；默认正常
+     */
+    private Integer state;
+
+    /**
+     * 状态 前置等级
+     */
+    private Integer nodeGrade;
+
+    /**
+     * 前置机支持最大装置数
+     */
+    private Integer nodeDevNum;
+
+
+    /**
+     * 前置机支持最大进程数量
+     */
+    private Integer maxProcessNum;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+}
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceInfo.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceInfo.java
@@ -0,0 +1,70 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+//台账信息
+@Data
+public class DeviceInfo implements Serializable {
+
+    @ApiModelProperty("终端索引")
+    private String id;
+
+    @ApiModelProperty("终端mac")
+    private String ip;
+
+    @ApiModelProperty("终端型号")
+    private String devType;
+
+    @ApiModelProperty("终端名称")
+    private String name;
+
+    @ApiModelProperty("前置机序号")
+    private Integer node;
+
+    @ApiModelProperty("监测点集合")
+    private List<MonitorInfo> monitorData;
+
+    //终端下的监测点信息
+    @Data
+    public static class MonitorInfo implements Serializable {
+
+        @ApiModelProperty("监测点索引")
+        private String id;
+
+        @ApiModelProperty("名称")
+        private String name;
+
+        @ApiModelProperty("监测点逻辑号")
+        private String lineNo;
+
+        @ApiModelProperty("监测点电压等级")
+        private String voltageLevel;
+
+        @ApiModelProperty("监测点运行状态 0：运行；1：检修；2：停运；3：调试；4：退运")
+        private Integer status;
+
+        @ApiModelProperty("监测点接线方式 0-星型 1-角型 2-V型")
+        private String ptType;
+
+        @ApiModelProperty("装置id")
+        private String deviceId;
+
+        @ApiModelProperty("pt1")
+        private Double pt1;
+
+        @ApiModelProperty("pt2")
+        private Double pt2;
+
+        @ApiModelProperty("ct1")
+        private Double ct1;
+
+        @ApiModelProperty("ct2")
+        private Double ct2;
+    }
+
+}