现场测试问题

预告警单

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/FlowStatusEnum.java

@@ -13,7 +13,8 @@ public enum FlowStatusEnum {
     AUDIT(1, "审批中"),
     APPROVE(2, "审批通过"),
     OPPOSE(3, "审批不通过"),
-    CANCEL(4, "已取消");
+    CANCEL(4, "已取消"),
+    NO_FEEDBACK(5, "未反馈");
 
     private final Integer code;
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/LeafletTypeEnum.java

@@ -0,0 +1,19 @@
+package com.njcn.supervision.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum LeafletTypeEnum {
+
+    WARNING(1, "预警单"),
+    ALARM(2, "告警单");
+
+    private final Integer code;
+
+    private final String name;
+
+    LeafletTypeEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/ProblemTypeEnum.java

@@ -0,0 +1,21 @@
+package com.njcn.supervision.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum ProblemTypeEnum {
+
+    PLAN(1, "技术监督计划"),
+    ONLINE(2, "在线监测超标问题"),
+    USER(3, "用户投诉问题"),
+    SITE_TEST(4, "现场测试超标问题");
+
+    private final Integer code;
+
+    private final String name;
+
+    ProblemTypeEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java

@@ -0,0 +1,112 @@
+package com.njcn.supervision.pojo.param.leaflet;
+
+import com.njcn.db.bo.BaseEntity;
+import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 预告警单表
+ * </p>
+ *
+ * @author hongawen
+ * @since 2024-05-21
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WarningLeafletParam extends BaseEntity implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 预告警单名称
+     */
+    @ApiModelProperty(value = "设备编号")
+    private String leafletName;
+
+    /**
+     * 预告警编号，目前阶段不做配置
+     */
+    @ApiModelProperty(value = "设备编号")
+    private String leafletNo;
+
+    /**
+     * 1：技术监督管理；2：在线监测超标问题；3：用户投诉；4：现场测试超标
+     */
+    @ApiModelProperty(value = "设备编号")
+    private Integer problemType;
+
+    /**
+     * 对应问题源ID，用于查询详细信息
+     */
+    @ApiModelProperty(value = "设备编号")
+    private String problemId;
+
+    /**
+     * 单子类型：1：预警单；2：告警单
+     */
+    @ApiModelProperty(value = "设备编号")
+    private Integer leafletType;
+
+    /**
+     * 1:审批中；2：审批通过；3：审批不通过；4：已取消；5：待反馈
+     */
+    @ApiModelProperty(value = "设备编号")
+    private Integer status;
+
+    /**
+     * 流程实例的编号
+     */
+    @ApiModelProperty(value = "设备编号")
+    private String processInstanceId;
+
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class WarningLeafletUpdateParam extends WarningLeafletParam {
+
+        @ApiModelProperty("id")
+        @NotBlank(message = "索引不能为空")
+        private String Id;
+
+
+        /**
+         * 采取措施
+         */
+        @ApiModelProperty(value = "采取措施")
+        @NotBlank(message = "采取措施不能为空")
+        private String takeStep;
+
+
+        /**
+         * 处理成效报告
+         */
+        @ApiModelProperty(value = "处理成效报告")
+        @NotBlank(message = "处理成效报告不能为空")
+        private String reportPath;
+
+    }
+
+
+    /**
+     * 分页查询实体
+     */
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class WarningLeafletQueryParam extends BaseParam {
+
+
+
+    }
+
+
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/leaflet/WarningLeaflet.java

@@ -0,0 +1,85 @@
+package com.njcn.supervision.pojo.po.leaflet;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 预告警单表
+ * </p>
+ *
+ * @author hongawen
+ * @since 2024-05-21
+ */
+@Data
+@TableName("supervision_warning_leaflet")
+public class WarningLeaflet extends BaseEntity implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 预告警单
+     */
+    private String id;
+
+    /**
+     * 预告警单名称
+     */
+    private String leafletName;
+
+    /**
+     * 预告警编号，目前阶段不做配置
+     */
+    private String leafletNo;
+
+    /**
+     * 1：技术监督管理；2：在线监测超标问题；3：用户投诉；4：现场测试超标
+     */
+    private Integer problemType;
+
+    /**
+     * 对应问题源ID，用于查询详细信息
+     */
+    private String problemId;
+
+    /**
+     * 单子类型：1：预警单；2：告警单
+     */
+    private Integer leafletType;
+
+    /**
+     * 1:审批中；2：审批通过；3：审批不通过；4：已取消；5：待反馈
+     */
+    private Integer status;
+
+    /**
+     * 流程实例的编号
+     */
+    private String processInstanceId;
+
+
+    /**
+     * 采取措施
+     */
+    private String takeStep;
+
+
+    /**
+     * 处理成效报告
+     */
+    private String reportPath;
+
+
+    /**
+     * 状态：0-删除 1-正常
+     */
+    private Integer state;
+
+
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SupervisionGeneralSurveyPlanDetailPO.java

@@ -79,6 +79,14 @@ public class SupervisionGeneralSurveyPlanDetailPO extends BaseEntity {
     @TableField(value = "is_survey")
     @ApiModelProperty(value="是否实现监测(0:否 1:是)")
     private Integer isSurvey;
+
+    /**
+     * 存在问题的普测变电站是否发起告警单，0：否，1：是
+     */
+    @TableField(value = "initiate_warning_flag")
+    @ApiModelProperty(value="是否发起告警单")
+    private Integer initiateWarningFlag;
+
     /**
      * 状态：0-删除 1-正常
      */

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java

@@ -0,0 +1,72 @@
+package com.njcn.supervision.pojo.vo.leaflet;
+
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 预告警单表
+ * </p>
+ *
+ * @author hongawen
+ * @since 2024-05-21
+ */
+@Data
+public class WarningLeafletVO extends BaseEntity implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 预告警单
+     */
+    private String id;
+
+    /**
+     * 预告警单名称
+     */
+    private String leafletName;
+
+    /**
+     * 预告警编号，目前阶段不做配置
+     */
+    private String leafletNo;
+
+    /**
+     * 1：技术监督管理；2：在线监测超标问题；3：用户投诉；4：现场测试超标
+     */
+    private Integer problemType;
+
+    /**
+     * 对应问题源ID，用于查询详细信息
+     */
+    private String problemId;
+
+    /**
+     * 单子类型：1：预警单；2：告警单
+     */
+    private Integer leafletType;
+
+    /**
+     * 1:审批中；2：审批通过；3：审批不通过；4：已取消；5：待反馈
+     */
+    private Integer status;
+
+    /**
+     * 采取措施
+     */
+    private String takeStep;
+
+
+    /**
+     * 处理成效报告
+     */
+    private String reportPath;
+
+    /**
+     * 流程实例的编号
+     */
+    private String processInstanceId;
+
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SupervisionGeneralSurveyPlanDetailVO.java

@@ -0,0 +1,117 @@
+package com.njcn.supervision.pojo.vo.survey;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/5/13  18:35【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class SupervisionGeneralSurveyPlanDetailVO extends BaseEntity {
+    /**
+     * 普测计划编号
+     */
+    @MppMultiId(value = "plan_no")
+    private String planNo;
+
+    @ApiModelProperty(value="单位Id")
+    private String orgNo;
+
+    @ApiModelProperty(value="单位名称")
+    private String orgName;
+
+    /**
+     * 普测计划名称
+     */
+    @ApiModelProperty(value="普测计划名称")
+    private String planName;
+
+    /**
+     * 计划生成时间
+     */
+    @ApiModelProperty(value="计划生成时间")
+    private LocalDate planCreateTime;
+
+    /**
+     * 计划开始时间
+     */
+    @ApiModelProperty(value="计划开始时间")
+    private LocalDate planStartTime;
+
+    /**
+     * 计划结束时间
+     */
+    @ApiModelProperty(value="计划结束时间")
+    private LocalDate planEndTime;
+
+    /**
+     * 实际完成时间
+     */
+    @ApiModelProperty(value="实际完成时间")
+    private LocalDate planComplateTime;
+
+    /**
+     * 计划负责人
+     */
+    @ApiModelProperty(value="计划负责人")
+    private String leader;
+
+
+    /**
+     * 变电站ID
+     */
+    @MppMultiId(value = "sub_id")
+    private String subId;
+
+    /**
+     * 变电站名称
+     */
+    @TableField(value = "sub_name")
+    @ApiModelProperty(value="变电站名称")
+    private String subName;
+
+    /**
+     * 变电站电压等级
+     */
+    @TableField(value = "voltage_level")
+    @ApiModelProperty(value="变电站电压等级")
+    private String voltageLevel;
+
+
+    /**
+     * 是否生成问题(0:否 1:是)
+     */
+    @TableField(value = "is_problem")
+    @ApiModelProperty(value="是否生成问题(0:否 1:是)")
+    private Integer isProblem;
+
+    /**
+     * 文件路径
+     */
+    @ApiModelProperty(value="文件路径")
+    private String filePath;
+
+
+    /**
+     * 是否发起告警单
+     */
+    @ApiModelProperty(value="是否发起告警单")
+    private Integer initiateWarningFlag;
+
+
+
+}