终端文件提交

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java

@@ -40,7 +40,7 @@ public class QuitRunningDeviceParam extends BaseEntity implements Serializable {
      * 设备类型 1:装置；2:监测点
      */
     @ApiModelProperty(value = "设备类型")
-    @NotNull(message = "设备编号不能为空")
+    @NotNull(message = "设备类型不能为空")
     private Integer deviceType;
 
     /**
@@ -89,6 +89,17 @@ public class QuitRunningDeviceParam extends BaseEntity implements Serializable {
     @EqualsAndHashCode(callSuper = true)
     public static class QuitRunningDeviceQueryParam extends BaseParam {
 
+        /**
+         * 设备类型 1:装置；2:监测点
+         */
+        @ApiModelProperty(value = "设备类型")
+        private Integer deviceType;
+
+        /**
+         * 设备编号
+         */
+        @ApiModelProperty(value = "设备编号")
+        private String deviceId;
 
     }
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/QuitRunningDeviceVO.java

@@ -0,0 +1,70 @@
+package com.njcn.supervision.pojo.vo.device;
+
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author hongawen
+ * @since 2024-05-13
+ */
+@Data
+public class QuitRunningDeviceVO extends BaseEntity implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备退运表索引
+     */
+    private String id;
+
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号")
+    private String deviceId;
+
+    /**
+     * 设备名称
+     */
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    /**
+     * 设备类型 1:装置；2:监测点
+     */
+    @ApiModelProperty(value = "设备类型")
+    private Integer deviceType;
+
+    /**
+     * 资产编号
+     */
+    @ApiModelProperty(value = "资产编号")
+    private String propertyNo;
+
+    /**
+     * 报告文件地址
+     */
+    @ApiModelProperty(value = "报告文件")
+    private String reportPath;
+
+    /**
+     * 1:审批中；2：审批通过；3：审批不通过；4：已取消
+     */
+    @ApiModelProperty(value = "审批状态")
+    private Integer status;
+
+    /**
+     * 流程实例的编号
+     */
+    @ApiModelProperty(value = "流程实例的编号")
+    private String processInstanceId;
+
+
+}