组态功能

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/DataArrayDTO.java

@@ -21,4 +21,8 @@ public class DataArrayDTO implements Serializable {
     private String dataArrayName;
 
     private String dataArrayShowName;
+
+    private String statMethod;
+
+    private String phase;
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -22,6 +24,7 @@ import java.util.Date;
 /**
     * 装置数据模板表
     */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @TableName(value = "cs_dev_model")
 public class CsDevModelPO extends BaseEntity {
@@ -56,7 +59,7 @@ public class CsDevModelPO extends BaseEntity {
      * 版本日期
      */
     @TableField(value = "version_date")
-    private Date versionDate;
+    private LocalDateTime versionDate;
 
     /**
      * 装置模板文件路径

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataArrayTreeVO.java

@@ -0,0 +1,27 @@
+package com.njcn.csdevice.pojo.vo;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/6/14 13:36
+ */
+@Data
+public class DataArrayTreeVO {
+
+    private String id;
+
+    private String name;
+
+    private String showName;
+
+    private List<DataArrayTreeVO> children = new ArrayList<>();
+
+
+}

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/LineTargetVO.java

@@ -14,7 +14,7 @@ import java.util.List;
  * @createTime 2023/6/1 10:13
  */
 @Data
-public class LineTargetVO {
+public class  LineTargetVO {
 
     @ApiModelProperty("指标id")
     private String id;