设备监控代码提交(临时)

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

@@ -15,5 +15,6 @@ public interface DataParam {
     List<String> phases = Stream.of("A","B","C","T").collect(Collectors.toList());
     List<String> statMethods = Stream.of("avg","max","min","cp95").collect(Collectors.toList());
     long FILE_SIZE = 10 * 1024 * 1024;
-
+    //便携式设备编码(用于某些业务判断)
+    String portableDevType = "8b45cf6b7f5266e777d07c166ad5fa77";
 }

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

@@ -12,33 +12,21 @@ import java.util.List;
 @NoArgsConstructor
 public class WlRecordPageParam extends BaseParam {
 
-    /**
-     * 测试项ID
-     */
     @ApiModelProperty(value="测试项ID")
     private String id;
 
-    /**
-     * 测试项ID
-     */
     @ApiModelProperty(value="是否匹配测试项ID")
     private Integer isTrueFlag;
 
-    /**
-     * 添加设备时左侧的设备或测点ID
-     */
-    @ApiModelProperty(value="添加设备时左侧的设备或测点ID")
+    @ApiModelProperty(value="添加设备时左侧的监测点ID")
     private List<String> treeIds = new ArrayList<>();
 
-    /**
-     * 添加测试项的时候顺便添加基础数据列表要排除临时已经添加的基础设备数据
-     */
     @ApiModelProperty(value="添加测试项的时候顺便添加基础数据列表要排除临时已经添加的基础设备数据")
     private List<String> isBandIds = new ArrayList<>();
 
-    /**
-     * 关键字多个匹配
-     */
+    @ApiModelProperty(value="添加设备时左侧的设备ID")
+    private List<String> pIds  = new ArrayList<>();
+
     @ApiModelProperty(value="关键字多个匹配")
     private String searchText;
 

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

@@ -0,0 +1,50 @@
+package com.njcn.csdevice.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * @author xuyang
+ * @date 2023/6/19
+ */
+@Data
+public class DataGroupEventVO {
+
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty("事件ID")
+    private String eventId;
+
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+    @ApiModelProperty("工程名称")
+    private String gcName;
+
+    @ApiModelProperty("测试项名称")
+    private String itemName;
+
+    @ApiModelProperty("持续时间")
+    private Double persistTime;
+
+    @ApiModelProperty("发生时刻")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss.SSS")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS",timezone = "GMT+8")
+    private LocalDateTime startTime;
+
+    private String tag;
+    @ApiModelProperty("事件描述")
+    private String showName;
+
+    @ApiModelProperty("相别")
+    private String phaseType;
+
+    @ApiModelProperty("暂降幅值")
+    private Float amplitude;
+
+}

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

@@ -32,5 +32,8 @@ public class RecordAllDevTreeVo {
         @ApiModelProperty("线路名称")
         private String name;
 
+        @ApiModelProperty("设备ID")
+        private String pid;
+
     }
 }