去掉魔法字符,设备监控及管理左侧树过滤掉无数据的tree,测试项绑定数据列表形式修改

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/constant/DataParam.java

@@ -23,4 +23,23 @@ public interface DataParam {
 
     //便携式设备默认统计方式
     String portableDevStatisticalMethods = "min";
+
+    //DecimalFormat格式化
+    String DecimalFormatStr = "#0.0000";
+
+    //DecimalFormat格式化
+    String startTime = " 00:00:00";
+
+    String endTime = " 23:59:59";
+
+    String timeFormat = "yyyy-MM-dd HH:mm:ss";
+
+    String portableDev = "便携式设备";
+
+    String governmentDev = "治理设备";
+
+    String EvtParamPhase = "Evt_Param_Phase";
+
+    String evtData = "evt_data";
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/LineBaseEnum.java

@@ -19,6 +19,10 @@ public enum LineBaseEnum {
     DEVICE_LEVEL(2, "设备"),
     LINE_LEVEL(3, "监测点"),
     INVALID_LEVEL(-1, "非法拓扑等级"),
+    NOWLRECORD_FAIL(-1,"方案ID不存在"),
+    EXISTWLRECORD_FAIL(-1,"方案名称已存在"),
+    DEVID_FAIL(-1,"devId有误"),
+    NOTYPE_FAIL(-1,"devId有误"),
     ;
 
     private final Integer code;

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

@@ -4,9 +4,6 @@ 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
 @NoArgsConstructor
@@ -18,16 +15,10 @@ public class WlRecordPageParam extends BaseParam {
     @ApiModelProperty(value="是否匹配测试项ID")
     private Integer isTrueFlag;
 
-    @ApiModelProperty(value="添加设备时左侧的监测点ID")
-    private List<String> treeIds = new ArrayList<>();
+    @ApiModelProperty(value="设备ID(后端自己用)")
+    private String devId;
 
-    @ApiModelProperty(value="添加测试项的时候顺便添加基础数据列表要排除临时已经添加的基础设备数据")
-    private List<String> isBandIds = new ArrayList<>();
-
-    @ApiModelProperty(value="添加设备时左侧的设备ID")
-    private List<String> pIds  = new ArrayList<>();
-
-    @ApiModelProperty(value="关键字多个匹配")
-    private String searchText;
+    @ApiModelProperty(value="监测点ID(后端自己用)")
+    private String lineId;
 
 }

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

@@ -35,5 +35,22 @@ public class RecordAllDevTreeVo {
         @ApiModelProperty("设备ID")
         private String pid;
 
+        @ApiModelProperty("线路")
+        private List<RecordAllTimeTreeVo> children;
+
+    }
+
+    @Data
+    public static class RecordAllTimeTreeVo {
+
+        @ApiModelProperty("数据ID")
+        private String id;
+
+        @ApiModelProperty("数据名称(开始时间-结束时间)")
+        private String name;
+
+        @ApiModelProperty("监测点ID")
+        private String pid;
+
     }
 }