终端运维日志功能

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LogsListParam.java

@@ -1,5 +1,6 @@
 package com.njcn.device.pq.pojo.param;
 
+import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,12 +12,12 @@ import lombok.Data;
  */
 @Data
 @ApiModel
-public class LogsListParam extends DeviceLogParam{
+public class LogsListParam extends BaseParam {
 
     /**
-     * 描述模糊匹配字段
+     * 日志类型
      */
-    @ApiModelProperty("描述模糊匹配字段")
-    private String searchValue;
+    @ApiModelProperty("日志类型")
+    private String type;
 
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/PqsTerminalLogs.java

@@ -20,7 +20,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("pqs_terminal_logs")
-public class PqsTerminalLogs extends BaseEntity {
+public class PqsTerminalLogs extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/TerminalLogs.java

@@ -1,34 +1,34 @@
-package com.njcn.device.pq.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import org.influxdb.annotation.Column;
-import org.influxdb.annotation.Measurement;
-
-import java.time.Instant;
-
-/**
- * @version 1.0.0
- * @author: chenchao
- * @date: 2022/06/22 19:03
- */
-@Data
-@Measurement(name = "pqs_terminal_logs")
-public class TerminalLogs {
-
-    @Column(name = "time")
-    private Instant timeId;
-
-    @Column(name = "line_id")
-    private String lineId;
-
-    @Column(name = "terminal_type")
-    private String terminalType;
-
-    @Column(name = "update_by")
-    private String updateBy;
-
-    @Column(name = "terminal_describe")
-    private String terminalDescribe;
-
-}
+//package com.njcn.device.pq.pojo.po;
+//
+//import com.baomidou.mybatisplus.annotation.TableId;
+//import lombok.Data;
+//import org.influxdb.annotation.Column;
+//import org.influxdb.annotation.Measurement;
+//
+//import java.time.Instant;
+//
+///**
+// * @version 1.0.0
+// * @author: chenchao
+// * @date: 2022/06/22 19:03
+// */
+//@Data
+//@Measurement(name = "pqs_terminal_logs")
+//public class TerminalLogs {
+//
+//    @Column(name = "time")
+//    private Instant timeId;
+//
+//    @Column(name = "line_id")
+//    private String lineId;
+//
+//    @Column(name = "terminal_type")
+//    private String terminalType;
+//
+//    @Column(name = "update_by")
+//    private String updateBy;
+//
+//    @Column(name = "terminal_describe")
+//    private String terminalDescribe;
+//
+//}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LogsListVO.java

@@ -17,11 +17,44 @@ public class LogsListVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+
+
     /**
-     * 日志类型
+     * 终端运维日志Id
      */
-    @ApiModelProperty("type")
-    private String type;
+    private String id;
+
+    /**
+     * 对象Id
+     */
+    private String objIndex;
+
+    /**
+     * 对象类型 6.监测点 4.装置
+     */
+    private Integer terminalType;
+
+    /**
+     * 新增，修改，删除
+     */
+    private String operateType;
+
+    /**
+     * 运维日志类型
+     */
+    @ApiModelProperty("logsType")
+    private String logsType;
+
+    /**
+     * 是否推送
+     */
+    private Integer isPush;
+
+    /**
+     * 内容描述
+     */
+    private String terminalDescribe;
+
 
     /**
      * 更改人员
@@ -41,4 +74,5 @@ public class LogsListVO implements Serializable {
     @ApiModelProperty("描述")
     private String remark;
 
+
 }