技术监督管理

用户部门添加省级，市，县层级判断

pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java

@@ -22,6 +22,8 @@ public enum ProcessResponseEnum {
     ENABLED_CANNOT_BE_DELETED("A00555","策略为启用状态不能删除!"),
     THERE_IS_ONLY_ONE_STRATEGY("A00556","各个策略等级，通用策略只能有一条!"),
     TERMINAL_ID_REPEAT("A00351","终端编号已存在"),
+
+    SUPV_PLAN_REPEAT("A00568","监督计划名称已存在")
     ;
 
     private final String code;

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvFileParam.java

@@ -0,0 +1,43 @@
+package com.njcn.process.pojo.param;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-06-21
+ */
+@Getter
+@Setter
+@TableName("supv_file")
+public class SupvFileParam {
+
+
+
+    private String id;
+
+    /**
+     * 附件路径
+     */
+    private String file;
+
+    /**
+     * 附件名称
+     */
+    private String attachmentName;
+
+    private String attachmentType;
+
+    /**
+     * 计划问题id
+     */
+    private String busiId;
+
+
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvPlanParam.java

@@ -0,0 +1,145 @@
+package com.njcn.process.pojo.param;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import com.njcn.web.pojo.annotation.DateTimeStrValid;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-06-21
+ */
+@Data
+@TableName("supv_plan")
+public class SupvPlanParam extends BaseParam {
+
+
+
+
+    /**
+     * 计划名称
+     */
+    @ApiModelProperty(value = "计划名称",required = true)
+    @NotBlank(message = "计划名称不可为空")
+    private String workPlanName;
+
+    /**
+     * 监督单位
+     */
+    @ApiModelProperty(value = "监督单位",required = true)
+    @NotBlank(message = "监督单位不可为空")
+    private String supvOrgId;
+
+    /**
+     * 监督类型
+     */
+    @ApiModelProperty(value = "监督类型",required = true)
+    @NotBlank(message = "监督类型不可为空")
+    private String supvType;
+
+    /**
+     * 监督阶段
+     */
+    @ApiModelProperty(value = "监督阶段",required = true)
+    @NotBlank(message = "监督阶段不可为空")
+    private String supvStage;
+
+    /**
+     * 计划监督时间
+     */
+    @ApiModelProperty(value = "计划监督时间",required = true)
+    @NotNull(message = "计划监督时间不可为空")
+    @DateTimeStrValid(message = "计划监督时间格式有误")
+    private String planSupvDate;
+
+    /**
+     * 监督对象名称
+     */
+    @ApiModelProperty(value = "监督对象名称")
+    @NotBlank(message = "监督对象名称不可为空")
+    private String supvObjName;
+
+    /**
+     * 对象类型
+     */
+    @ApiModelProperty(value = "对象类型")
+    @NotBlank(message = "对象类型不可为空")
+    private String supvObjType;
+
+    /**
+     * 对象电压等级
+     */
+    @ApiModelProperty(value = "对象电压等级")
+    @NotBlank(message = "对象电压等级不可为空")
+    private String objVoltageLevel;
+
+    /**
+     * 关联电站
+     */
+    @ApiModelProperty(value = "关联电站")
+    @NotBlank(message = "关联电站不可为空")
+    private String objRelationStation;
+
+    /**
+     * 计划执行开始时间
+     */
+    @ApiModelProperty(value = "计划执行开始时间",required = true)
+    @NotNull(message = "计划执行开始时间不可为空")
+    @DateTimeStrValid(message = "计划执行开始时间格式有误")
+    private String supvStartTime;
+
+    /**
+     * 计划执行结束时间
+     */
+    @ApiModelProperty(value = "计划执行结束时间",required = true)
+    @NotNull(message = "计划执行结束时间不可为空")
+    @DateTimeStrValid(message = "计划执行结束时间格式有误")
+    private String supvEndTime;
+
+    /**
+     * 报告出具时间
+     */
+    @ApiModelProperty(value = "报告出具时间",required = true)
+    @DateTimeStrValid(message = "报告出具时间格式有误",format = "yyyy-MM-dd HH:mm:ss")
+    private String reportIssueTime;
+
+    /**
+     * 电能质量问题发生时间
+     */
+    @ApiModelProperty(value = "电能质量问题发生时间",required = true)
+    @DateTimeStrValid(message = "电能质量问题发生时间格式有误",format = "yyyy-MM-dd HH:mm:ss")
+    private String problemOcTime;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String planRemark;
+
+
+
+    @EqualsAndHashCode(callSuper = true)
+    @Data
+    public static class UpdateSupvPlanParam extends SupvPlanParam{
+
+        @ApiModelProperty(value = "索引",required = true)
+        @NotBlank(message = "计划索引不可为空")
+        private String planId;
+    }
+
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvProblemParam.java

@@ -0,0 +1,132 @@
+package com.njcn.process.pojo.param;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import com.njcn.web.pojo.annotation.DateTimeStrValid;
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-06-21
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("supv_problem")
+public class SupvProblemParam extends BaseParam {
+
+
+
+    /**
+     * 关联计划表
+     */
+    @ApiModelProperty(value = "关联计划表id",required = true)
+    @NotBlank(message = "关联计划表不可为空")
+    private String planId;
+
+    /**
+     * 责任单位id，取ISC平台上的组织id
+     */
+    @ApiModelProperty(value = "责任单位id，取ISC平台上的组织id",required = true)
+    @NotBlank(message = "责任单位id不可为空")
+    private String dutyOrgId;
+
+    /**
+     * 监测点类型 ，仅供电电压监督计划必填
+     */
+    @ApiModelProperty(value = "监测点类型 ，仅供电电压监督计划必填")
+    private String monitorType;
+
+    /**
+     * 整改时间
+     */
+    @ApiModelProperty(value = "整改时间",required = true)
+    @NotNull(message = "整改时间不可为空")
+    @DateTimeStrValid(message = "整改时间格式有误")
+    private String rectificationTime;
+
+    /**
+     * 计划整改时间
+     */
+    @ApiModelProperty(value = "计划整改时间",required = true)
+    @NotNull(message = "计划整改时间不可为空")
+    @DateTimeStrValid(message = "计划整改时间格式有误")
+    private String planRectificationTime;
+
+    /**
+     * 是否发布预告警
+     */
+    @ApiModelProperty(value = "是否发布预告警",required = true)
+    @NotNull(message = "是否发布预告警不可为空")
+    private Integer ifReleaseWarning;
+
+    /**
+     * 问题描述
+     */
+    @ApiModelProperty(value = "问题描述")
+    private String simpleProblemDesc;
+
+    /**
+     * 监督标准
+     */
+    @ApiModelProperty(value = "监督标准",required = true)
+    @NotBlank(message = "监督标准不可为空")
+    private String supvStandard;
+
+    /**
+     * 标准出处
+     */
+    @ApiModelProperty(value = "标准出处",required = true)
+    @NotBlank(message = "标准出处不可为空")
+    private String supvResouce;
+
+    /**
+     * 问题等级	01 一般，02 较大
+     */
+    @ApiModelProperty(value = "问题等级",required = true)
+    @NotBlank(message = "问题等级不可为空")
+    private String problemLevel;
+
+    /**
+     * 定级依据
+     */
+    @ApiModelProperty(value = "定级依据",required = true)
+    @NotBlank(message = "定级依据不可为空")
+    private String problemLevelReason;
+
+    /**
+     * 问题类型
+     */
+    @ApiModelProperty(value = "问题类型",required = true)
+    @NotBlank(message = "问题类型不可为空")
+    private String problemType;
+
+    /**
+     * 整改方案
+     */
+    @ApiModelProperty(value = "整改方案",required = true)
+    @NotBlank(message = "整改方案不可为空")
+    private String rectificationProgramme;
+
+    @EqualsAndHashCode(callSuper = true)
+    @Data
+    public static class UpdateSupvProblemParam extends SupvProblemParam{
+
+        @ApiModelProperty(value = "索引",required = true)
+        @NotBlank(message = "问题索引不可为空")
+        private String problemId;
+    }
+
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvFile.java

@@ -0,0 +1,51 @@
+package com.njcn.process.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-06-21
+ */
+@Getter
+@Setter
+@TableName("supv_file")
+public class SupvFile extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    /**
+     * 附件路径
+     */
+    private String file;
+
+    /**
+     * 附件名称
+     */
+    private String attachmentName;
+
+    /**
+     * 0.计划 1.问题
+     */
+    private Integer type;
+
+
+    private String attachmentType;
+
+    /**
+     * 计划问题id
+     */
+    private String busiId;
+
+
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlan.java

@@ -0,0 +1,115 @@
+package com.njcn.process.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-06-21
+ */
+@Data
+@TableName("supv_plan")
+public class SupvPlan extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private String planId;
+
+    /**
+     * 计划名称
+     */
+    private String workPlanName;
+
+    /**
+     * 监督单位
+     */
+    private String supvOrgId;
+
+    /**
+     * 监督类型
+     */
+    private String supvType;
+
+    /**
+     * 监督阶段
+     */
+    private String supvStage;
+
+    /**
+     * 计划监督时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate planSupvDate;
+
+    /**
+     * 监督对象名称
+     */
+    private String supvObjName;
+
+    /**
+     * 对象类型
+     */
+    private String supvObjType;
+
+    /**
+     * 对象电压等级
+     */
+    private String objVoltageLevel;
+
+    /**
+     * 关联电站
+     */
+    private String objRelationStation;
+
+    /**
+     * 计划执行开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate supvStartTime;
+
+    /**
+     * 计划执行结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate supvEndTime;
+
+    /**
+     * 报告出具时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime reportIssueTime;
+
+    /**
+     * 电能质量问题发生时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime problemOcTime;
+
+    /**
+     * 备注
+     */
+    private String planRemark;
+
+    /**
+     * 0.未上送 1.上送 2.取消上送
+     */
+    private Integer isUploadHead;
+
+
+
+
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvProblem.java

@@ -0,0 +1,100 @@
+package com.njcn.process.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-06-21
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("supv_problem")
+public class SupvProblem extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId
+    private String problemId;
+
+    /**
+     * 关联计划表
+     */
+    private String planId;
+
+    /**
+     * 责任单位id，取ISC平台上的组织id
+     */
+    private String dutyOrgId;
+
+    /**
+     * 监测点类型 ，仅供电电压监督计划必填
+     */
+    private String monitorType;
+
+    /**
+     * 整改时间
+     */
+    private LocalDate rectificationTime;
+
+    /**
+     * 计划整改时间
+     */
+    private LocalDate planRectificationTime;
+
+    /**
+     * 是否发布预告警
+     */
+    private Integer ifReleaseWarning;
+
+    /**
+     * 问题描述
+     */
+    private String simpleProblemDesc;
+
+    /**
+     * 监督标准
+     */
+    private String supvStandard;
+
+    /**
+     * 标准出处
+     */
+    private String supvResouce;
+
+    /**
+     * 问题等级	01 一般，02 较大
+     */
+    private String problemLevel;
+
+    /**
+     * 定级依据
+     */
+    private String problemLevelReason;
+
+    /**
+     * 问题类型
+     */
+    private String problemType;
+
+    /**
+     * 整改方案
+     */
+    private String rectificationProgramme;
+
+
+
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java

@@ -0,0 +1,122 @@
+package com.njcn.process.pojo.vo;
+
+import com.njcn.web.pojo.annotation.DateTimeStrValid;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2023/6/25
+ */
+@Data
+public class SupvPlanVO {
+
+    @ApiModelProperty(value = "索引",required = true)
+    private String planId;
+
+    /**
+     * 计划名称
+     */
+    @ApiModelProperty(value = "计划名称",required = true)
+    private String workPlanName;
+
+    /**
+     * 监督单位
+     */
+    @ApiModelProperty(value = "监督单位",required = true)
+    private String supvOrgId;
+
+    @ApiModelProperty(value = "监督单位名称",required = true)
+    private String supvOrgName;
+
+    /**
+     * 监督类型
+     */
+    @ApiModelProperty(value = "监督类型",required = true)
+    private String supvType;
+
+    /**
+     * 监督阶段
+     */
+    @ApiModelProperty(value = "监督阶段",required = true)
+    private String supvStage;
+
+    /**
+     * 计划监督时间
+     */
+    @ApiModelProperty(value = "计划监督时间",required = true)
+    private String planSupvDate;
+
+    /**
+     * 监督对象名称
+     */
+    @ApiModelProperty(value = "监督对象名称")
+    private String supvObjName;
+
+    /**
+     * 对象类型
+     */
+    @ApiModelProperty(value = "对象类型")
+    private String supvObjType;
+
+    /**
+     * 对象电压等级
+     */
+    @ApiModelProperty(value = "对象电压等级")
+    private String objVoltageLevel;
+
+    /**
+     * 关联电站
+     */
+    @ApiModelProperty(value = "关联电站")
+    private String objRelationStation;
+
+    /**
+     * 计划执行开始时间
+     */
+    @ApiModelProperty(value = "计划执行开始时间",required = true)
+    private String supvStartTime;
+
+    /**
+     * 计划执行结束时间
+     */
+    @ApiModelProperty(value = "计划执行结束时间",required = true)
+    private String supvEndTime;
+
+    /**
+     * 报告出具时间
+     */
+    @ApiModelProperty(value = "报告出具时间",required = true)
+    private String reportIssueTime;
+
+    /**
+     * 电能质量问题发生时间
+     */
+    @ApiModelProperty(value = "电能质量问题发生时间",required = true)
+    private String problemOcTime;
+
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String planRemark;
+
+    @ApiModelProperty(value = "省部门")
+    private String province;
+
+    @ApiModelProperty(value = "市部门")
+    private String city;
+
+    @ApiModelProperty(value = "县部门")
+    private String county;
+
+
+    @ApiModelProperty(value = "附件名称")
+    private String attachmentName;
+}