方案数据修改后第二版提交

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/param/WlRecordPageParam.java

@@ -4,6 +4,8 @@ import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -22,6 +24,18 @@ public class WlRecordPageParam extends BaseParam {
     @ApiModelProperty(value="是否匹配测试项ID")
     private Integer isTrueFlag;
 
+    /**
+     * 添加设备时左侧的设备或测点ID
+     */
+    @ApiModelProperty(value="添加设备时左侧的设备或测点ID")
+    private List<String> treeIds = new ArrayList<>();
+
+    /**
+     * 添加测试项的时候顺便添加基础数据列表要排除临时已经添加的基础设备数据
+     */
+    @ApiModelProperty(value="添加测试项的时候顺便添加基础数据列表要排除临时已经添加的基础设备数据")
+    private List<String> isBandIds = new ArrayList<>();
+
     /**
      * 关键字多个匹配
      */

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/WlRecordParam.java

@@ -40,6 +40,12 @@ public class WlRecordParam {
         @ApiModelProperty("CT变比")
         private Integer ct;
 
+        @ApiModelProperty("PT变比")
+        private Integer pt1;
+
+        @ApiModelProperty("CT变比")
+        private Integer ct1;
+
         @ApiModelProperty("电压等级")
         private String voltageLevel;
 
@@ -74,6 +80,9 @@ public class WlRecordParam {
     public static class AddRecord extends WlRecordParam {
         @ApiModelProperty("records")
         private List<Record> records;
+
+        @ApiModelProperty("方案id")
+        private String id;
     }
 
 }

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

@@ -68,6 +68,16 @@ public class WlRecord extends BaseEntity {
      */
     private Integer ct;
 
+    /**
+     * PT变比
+     */
+    private Integer pt1;
+
+    /**
+     * CT变比
+     */
+    private Integer ct1;
+
     /**
      * 电压等级
      */

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

@@ -0,0 +1,36 @@
+package com.njcn.csdevice.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.List;
+
+/**
+ * 类的介绍：方案树、测试项树、基础数据树
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2024/4/2 10:23
+ */
+@Data
+public class RecordAllDevTreeVo {
+
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty("设备名称")
+    private String name;
+
+    @ApiModelProperty("线路")
+    private List<RecordAllLineTreeVo> children;
+
+    @Data
+    public static class RecordAllLineTreeVo {
+
+        @ApiModelProperty("线路ID")
+        private String id;
+
+        @ApiModelProperty("线路名称")
+        private String name;
+
+    }
+}

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

@@ -18,6 +18,9 @@ public class RecordPageVo {
     @ApiModelProperty("基础数据id")
     private String id;
 
+    @ApiModelProperty("数据名称")
+    private String itemName;
+
     @ApiModelProperty("设备名称")
     private String devName;
 

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

@@ -2,7 +2,6 @@ package com.njcn.csdevice.pojo.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import java.util.List;
 
 /**
@@ -15,18 +14,26 @@ import java.util.List;
 @Data
 public class RecordTreeVo {
 
-    @ApiModelProperty("方案id")
+    @ApiModelProperty("id")
     private String id;
 
-    @ApiModelProperty("方案名称")
+    @ApiModelProperty("名称")
     private String name;
 
     @ApiModelProperty("测试项数据")
     private List<Children> children;
 
     @Data
-    @EqualsAndHashCode(callSuper = true)
-    public static class Children extends RecordTreeVo {
+    public static class Children{
+
+        @ApiModelProperty("id")
+        private String id;
+
+        @ApiModelProperty("名称")
+        private String name;
+
+        @ApiModelProperty("父级ID")
+        private String pId;
 
         @ApiModelProperty("测试项开始时间")
         private String startTime;

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 类的介绍： 测试项详情表
@@ -15,10 +16,10 @@ import java.time.LocalDateTime;
 @Data
 public class RecordVo {
 
-    @ApiModelProperty("测试项id")
+    @ApiModelProperty("id")
     private String id;
 
-    @ApiModelProperty("测试项名称")
+    @ApiModelProperty("名称")
     private String itemName;
 
     @ApiModelProperty("数据起始时间")
@@ -41,6 +42,12 @@ public class RecordVo {
     @ApiModelProperty("CT变比")
     private Integer ct;
 
+    @ApiModelProperty("PT变比")
+    private Integer pt1;
+
+    @ApiModelProperty("CT变比")
+    private Integer ct1;
+
     @ApiModelProperty("电压等级")
     private String voltageLevel;
 
@@ -59,4 +66,16 @@ public class RecordVo {
     @ApiModelProperty("电压接线方式")
     private String volConType;
 
+    @Data
+    public static class RecordItemVo{
+
+        @ApiModelProperty("方案名称")
+        private String itemName;
+
+        @ApiModelProperty("描述")
+        private String describe;
+
+        @ApiModelProperty("测试项")
+        private List<RecordVo> records;
+    }
 }