调整台账树

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

@@ -54,6 +54,9 @@ public class CsLedgerVO implements Serializable {
     @ApiModelProperty(name = "conType",value = "接线方式 0-星型 1-角型 2-V型")
     private Integer conType;
 
+    @ApiModelProperty(name = "process",value = "流程状态")
+    private Integer process;
+
     @ApiModelProperty(name = "children",value = "子节点")
     private List<CsLedgerVO> children = new ArrayList<>();
 

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

@@ -20,8 +20,15 @@ public class EachModuleVO implements Serializable {
     @ApiModelProperty("模块状态")
     private String moduleState;
 
+    @ApiModelProperty("模块运行状态数据")
     List<harmonicVo> dataList;
 
+    @ApiModelProperty("电压数据")
+    List<dataVo> vList;
+
+    @ApiModelProperty("电流数据")
+    List<dataVo> iList;
+
     @Data
     public static class harmonicVo implements Serializable {
 
@@ -41,4 +48,15 @@ public class EachModuleVO implements Serializable {
         @ApiModelProperty("事件名称")
         private String eventName;
     }
+
+    @Data
+    public static class dataVo implements Serializable {
+
+        @ApiModelProperty("稳态数据时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime time;
+
+        @ApiModelProperty("数据")
+        private Double data;
+    }
 }