前置机功能开发

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/DeviceInfo.java

@@ -26,8 +26,10 @@ public class DeviceInfo {
     private String port;
     //终端端口
     private String stationName;
-    //变电站名
+    //终端名称
     private String name;
+    //电站名称
+    private String subName;
     //终端序列号
     private String updateTime;
     //数据更新时间
@@ -40,6 +42,8 @@ public class DeviceInfo {
     private String devKey;
 
     private Integer processNo;
+
+    private Integer maxProcessNum;
     //
     private List<MonitorInfo> monitorData;
 

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/NodeProcessDeviceTree.java

@@ -0,0 +1,33 @@
+package com.njcn.device.pq.pojo.dto;
+
+
+import com.njcn.device.pq.pojo.param.NodeParam;
+import com.njcn.device.pq.pojo.po.Node;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * Description:
+ * Date: 2024/11/4  21:01【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class NodeProcessDeviceTree {
+
+    private Node node;
+
+    private List<ProcessDevice> processDeviceList;
+    @Data
+    @EqualsAndHashCode(callSuper = false)
+    public static class ProcessDevice  {
+        private Integer processNo;
+        private Integer processState;
+        private List<DeviceInfo>  deviceInfoList;
+    }
+
+
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/PqsTerminalPushLogDTO.java

@@ -0,0 +1,43 @@
+package com.njcn.device.pq.pojo.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-04-12
+ */
+@Data
+public class PqsTerminalPushLogDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 终端运维日志Id
+     */
+    private String id;
+
+    private String nodeId;
+
+    private Integer processNum;
+
+
+    private String devId;
+
+    /**
+     * 新增，修改，删除
+     */
+    private String operateType;
+
+
+
+}

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

@@ -56,9 +56,9 @@ public class DeviceParam {
     @NotNull(message = "前置机索引不能为空")
     private String nodeId;
 
-    @ApiModelProperty(name = "nodeId",value = "所属前置机机进程",required = true)
-    @NotNull(message = "所属前置机机进程不能为空")
-    private Integer processNum;
+//    @ApiModelProperty(name = "nodeId",value = "所属前置机机进程",required = true)
+//    @NotNull(message = "所属前置机机进程不能为空")
+//    private Integer processNum;
 
     @ApiModelProperty(name = "series",value = "装置识别码，采用3ds加密")
     private String series;

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

@@ -50,7 +50,7 @@ public class PqsTerminalLogs extends BaseEntity implements Serializable {
     private String logsType;
 
     /**
-     * 是否推送
+     * 是否推送 0未推送1已推送
      */
     private Integer isPush;