From 1124d4ffacc004883713c2e85568453155cfcff6 Mon Sep 17 00:00:00 2001 From: "1771838663@qq.com" <1771838663@qq.com> Date: Fri, 18 Nov 2022 11:01:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E8=83=BD=E8=B4=A8=E9=87=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/enums/ProcessResponseEnum.java | 2 + .../process/pojo/param/AbnormalParam.java | 34 ++ .../process/pojo/param/ComplaintParam.java | 46 +++ .../process/pojo/param/ExcessiveParam.java | 38 +++ .../pojo/param/GeneralSurveyParam.java | 38 +++ .../njcn/process/pojo/param/IssuesParam.java | 41 +++ .../njcn/process/pojo/param/ProcessParam.java | 73 ++++ .../process/pojo/param/QueryIssuesParam.java | 40 +++ .../RMpElectricQualityProblemFlowDetails.java | 129 ++++++++ .../po/RMpGeneralSurveyOverproofProblem.java | 59 ++++ .../po/RMpOnlineMonitorOverproofProblem.java | 120 +++++++ .../pojo/po/RMpOperationMonitorAbnormal.java | 64 ++++ .../process/pojo/po/RMpUserComplaint.java | 79 +++++ .../po/RStatElectricQualityProblemFlow.java | 74 +++++ .../com/njcn/process/pojo/vo/AbnormalVO.java | 43 +++ .../com/njcn/process/pojo/vo/ComplaintVO.java | 49 +++ .../process/pojo/vo/ExcessiveDetailVO.java | 63 ++++ .../njcn/process/pojo/vo/GeneralSurveyVO.java | 53 +++ .../com/njcn/process/pojo/vo/IssuesVO.java | 58 ++++ .../com/njcn/process/pojo/vo/ProcessVO.java | 136 ++++++++ .../ElectricityQualityIssuesController.java | 190 +++++++++++ ...ectricQualityProblemFlowDetailsMapper.java | 16 + ...MpGeneralSurveyOverproofProblemMapper.java | 16 + ...MpOnlineMonitorOverproofProblemMapper.java | 16 + .../RMpOperationMonitorAbnormalMapper.java | 16 + .../mapper/RMpUserComplaintMapper.java | 16 + ...RStatElectricQualityProblemFlowMapper.java | 22 ++ ...lectricQualityProblemFlowDetailsMapper.xml | 5 + ...RMpGeneralSurveyOverproofProblemMapper.xml | 5 + ...RMpOnlineMonitorOverproofProblemMapper.xml | 5 + .../RMpOperationMonitorAbnormalMapper.xml | 5 + .../mapper/mapping/RMpUserComplaintMapper.xml | 5 + .../RStatElectricQualityProblemFlowMapper.xml | 28 ++ .../njcn/process/service/IssuesService.java | 81 +++++ .../service/impl/IssuesServiceImpl.java | 312 ++++++++++++++++++ 35 files changed, 1977 insertions(+) create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/AbnormalParam.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/ComplaintParam.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/GeneralSurveyParam.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/IssuesParam.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/ProcessParam.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/param/QueryIssuesParam.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/po/RMpElectricQualityProblemFlowDetails.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/po/RMpGeneralSurveyOverproofProblem.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/po/RMpOperationMonitorAbnormal.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/po/RMpUserComplaint.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/po/RStatElectricQualityProblemFlow.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/vo/AbnormalVO.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/vo/ComplaintVO.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/vo/ExcessiveDetailVO.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/vo/GeneralSurveyVO.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/vo/IssuesVO.java create mode 100644 process-api/src/main/java/com/njcn/process/pojo/vo/ProcessVO.java create mode 100644 process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/RMpElectricQualityProblemFlowDetailsMapper.java create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/RMpGeneralSurveyOverproofProblemMapper.java create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/RMpOnlineMonitorOverproofProblemMapper.java create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/RMpOperationMonitorAbnormalMapper.java create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/RMpUserComplaintMapper.java create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/mapping/RMpElectricQualityProblemFlowDetailsMapper.xml create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/mapping/RMpGeneralSurveyOverproofProblemMapper.xml create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/mapping/RMpOnlineMonitorOverproofProblemMapper.xml create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/mapping/RMpOperationMonitorAbnormalMapper.xml create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/mapping/RMpUserComplaintMapper.xml create mode 100644 process-boot/src/main/java/com/njcn/process/mapper/mapping/RStatElectricQualityProblemFlowMapper.xml create mode 100644 process-boot/src/main/java/com/njcn/process/service/IssuesService.java create mode 100644 process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java diff --git a/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java b/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java index 996dba793..bba21f7bc 100644 --- a/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java +++ b/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java @@ -17,6 +17,8 @@ public enum ProcessResponseEnum { */ PROCESS_COMMON_ERROR("A00550","监督管理模块异常"), UPLOAD_FILE_ERROR("A00551","上传文件服务器错误,请检查数据"), + ARCHIVE_ERROR("A00552","不满足归档调节,操作失败!"), + PROCESS_ERROR("A00553","当前流程未审核通过,操作失败!"), ; private final String code; diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/AbnormalParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/AbnormalParam.java new file mode 100644 index 000000000..d675899e0 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/AbnormalParam.java @@ -0,0 +1,34 @@ +package com.njcn.process.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotNull; + +/** + * 运维异常问题Param + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/14 10:47 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class AbnormalParam extends IssuesParam { + + @ApiModelProperty(name = "abnormalDevName",value = "异常设备名称") + @NotNull(message = "异常设备名称不可为空") + private String abnormalDevName; + + @ApiModelProperty(name = "abnormalDevTime",value = "发现异常时间") + @NotNull(message = "发现异常时间不可为空") + private String abnormalDevTime; + + @ApiModelProperty(name = "abnormalTarget",value = "异常指标") + @NotNull(message = "异常指标不可为空") + private String abnormalTarget; + + @ApiModelProperty(name = "eventDescription",value = "事件描述") + @NotNull(message = "事件描述不可为空") + private String eventDescription; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/ComplaintParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/ComplaintParam.java new file mode 100644 index 000000000..204fabad9 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/ComplaintParam.java @@ -0,0 +1,46 @@ +package com.njcn.process.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotNull; + +/** + * 用户投诉Param + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/14 10:40 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class ComplaintParam extends IssuesParam { + + @ApiModelProperty(name = "userType",value = "用户类别") + @NotNull(message = "用户类别不可为空") + private String userType; + + @ApiModelProperty(name = "userNo",value = "用户编号") + @NotNull(message = "用户编号不可为空") + private String userNo; + + @ApiModelProperty(name = "userName",value = "用户名称") + @NotNull(message = "用户类别不可为空") + private String userName; + + @ApiModelProperty(name = "complaintContent",value = "投诉内容") + @NotNull(message = "投诉内容不可为空") + private String complaintContent; + + @ApiModelProperty(name = "complaintTime",value = "投诉时间") + @NotNull(message = "投诉时间不可为空") + private String complaintTime; + + @ApiModelProperty(name = "abnormalTarget",value = "异常指标") + @NotNull(message = "异常指标不可为空") + private String abnormalTarget; + + @ApiModelProperty(name = "electricityType",value = "用电类别") + @NotNull(message = "用电类别不可为空") + private String electricityType; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java new file mode 100644 index 000000000..1f3613fd0 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java @@ -0,0 +1,38 @@ +package com.njcn.process.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotNull; + +/** + * 在线监测超标问题Param + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/14 10:30 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class ExcessiveParam extends IssuesParam { + + @ApiModelProperty(name = "warnTarget",value = "告警指标") + @NotNull(message = "告警指标不可为空") + private String warnTarget; + + @ApiModelProperty(name = "warnReason",value = "告警原因") + @NotNull(message = "告警原因不可为空") + private String warnReason; + + @ApiModelProperty(name = "substationId",value = "变电站ID") + @NotNull(message = "变电站ID不可为空") + private String substationId; + + @ApiModelProperty(name = "measurementPointId",value = "监测点ID") + @NotNull(message = "监测点ID不可为空") + private String measurementPointId; + + @ApiModelProperty(name = "warnLastTime",value = "告警持续时间") + @NotNull(message = "告警持续时间不可为空") + private String warnLastTime; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/GeneralSurveyParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/GeneralSurveyParam.java new file mode 100644 index 000000000..aa7975224 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/GeneralSurveyParam.java @@ -0,0 +1,38 @@ +package com.njcn.process.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotNull; + +/** + * 普测超标问题Param + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/14 10:35 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class GeneralSurveyParam extends IssuesParam { + + @ApiModelProperty(name = "substationId",value = "变电站ID") + @NotNull(message = "变电站ID不可为空") + private String substationId; + + @ApiModelProperty(name = "busBarId",value = "母线ID") + @NotNull(message = "母线ID不可为空") + private String busBarId; + + @ApiModelProperty(name = "measurementPointId",value = "监测点ID") + @NotNull(message = "监测点ID不可为空") + private String measurementPointId; + + @ApiModelProperty(name = "overLimitTarget",value = "超标指标") + @NotNull(message = "超标指标不可为空") + private String overLimitTarget; + + @ApiModelProperty(name = "planName",value = "普测计划名称") + @NotNull(message = "普测计划名称不可为空") + private String planName; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/IssuesParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/IssuesParam.java new file mode 100644 index 000000000..eeca60840 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/IssuesParam.java @@ -0,0 +1,41 @@ +package com.njcn.process.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * 填报问题Param + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/14 10:13 + */ +@Data +public class IssuesParam { + + @ApiModelProperty(name = "orgNo",value = "单位ID") + @NotNull(message = "单位不可为空") + private String orgNo; + + @ApiModelProperty(name = "powerQualityProblemNo",value = "电能质量问题编号") + @NotNull(message = "电能质量问题编号不可为空") + private String powerQualityProblemNo; + + @ApiModelProperty(name = "problemName",value = "问题名称") + @NotNull(message = "问题名称不可为空") + private String problemName; + + @ApiModelProperty(name = "problemSources",value = "问题来源") + @NotNull(message = "问题来源不可为空") + private String problemSources; + + @ApiModelProperty(name = "reportProcessContent",value = "填报内容") + private String reportProcessContent; + + + + + + +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/ProcessParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/ProcessParam.java new file mode 100644 index 000000000..6988804a8 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/ProcessParam.java @@ -0,0 +1,73 @@ +package com.njcn.process.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/15 15:39 + */ +@Data +public class ProcessParam { + + @ApiModelProperty(name = "powerQualityProblemNo",value = "电能质量问题编号") + @NotNull(message = "电能质量问题编号不可为空") + private String powerQualityProblemNo; + + @ApiModelProperty(name = "reportProcessContentYyfx",value = "电网侧原因") + private String reportProcessContentYyfx; + + @ApiModelProperty(name = "userReportProcessContentYyfx",value = "用户侧原因") + private String userReportProcessContentYyfx; + + @ApiModelProperty(name = "powerGridAffectDev",value = "电网侧受影响设备") + private String powerGridAffectDev; + + @ApiModelProperty(name = "userAffectDev",value = "用户侧受影响设备") + private String userAffectDev; + + @ApiModelProperty(name = "eventDescriptionYyfx",value = "事件描述") + private String eventDescriptionYyfx; + + @ApiModelProperty(name = "fileNameYyfx",value = "原因分析报告文件名称") + private String fileNameYyfx; + + @ApiModelProperty(name = "filePathYyfx",value = "原因分析报告文件路径") + private String filePathYyfx; + + @ApiModelProperty(name = "reportProcessContentYyfx",value = "电网侧整改治理措施") + private String reportProcessContentJhzg; + + @ApiModelProperty(name = "userReportProcessContentJhzg",value = "用户侧整改治理措施") + private String userReportProcessContentJhzg; + + @ApiModelProperty(name = "fileNameJhzg",value = "计划整改文件名称") + private String fileNameJhzg; + + @ApiModelProperty(name = "filePathJhzg",value = "计划整改文件路径") + private String filePathJhzg; + + @ApiModelProperty(name = "reportProcessContentSjcq",value = "电网侧实际采取措施") + private String reportProcessContentSjcq; + + @ApiModelProperty(name = "userReportProcessContentSjcq",value = "用户侧实际采取措施") + private String userReportProcessContentSjcq; + + @ApiModelProperty(name = "fileNameSjcq",value = "实际采取措施报告文件名称") + private String fileNameSjcq; + + @ApiModelProperty(name = "filePathSjcq",value = "实际采取措施报告文件路径") + private String filePathSjcq; + + @ApiModelProperty(name = "descriptionZlxg",value = "成效分析概述") + private String descriptionZlxg; + + @ApiModelProperty(name = "fileNameZlxg",value = "成效分析报告文件名称") + private String fileNameZlxg; + + @ApiModelProperty(name = "filePathZlxg",value = "成效分析报告文件路径") + private String filePathZlxg; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/QueryIssuesParam.java b/process-api/src/main/java/com/njcn/process/pojo/param/QueryIssuesParam.java new file mode 100644 index 000000000..f534e5e13 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/param/QueryIssuesParam.java @@ -0,0 +1,40 @@ +package com.njcn.process.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/14 14:49 + */ +@Data +public class QueryIssuesParam { + + @ApiModelProperty(name = "orgNo",value = "所属单位") + private String orgNo; + + @ApiModelProperty(name = "problemSources",value = "问题来源") + private String problemSources; + + @ApiModelProperty(name = "reportProcess",value = "填报进度") + private String reportProcess; + + @ApiModelProperty(name = "reportProcessStatus",value = "审核状态") + private String reportProcessStatus; + + @ApiModelProperty(name = "problemName",value = "问题名称") + private String problemName; + + @ApiModelProperty(name = "dataType",value = "时间类型(年:1;季:2;月:3)") + private Integer dataType; + + @ApiModelProperty(name = "dataDate",value = "问题发生记录时间") + private String dataDate; + + @ApiModelProperty(name = "pageNum",value = "页码") + private Integer pageNum; + + @ApiModelProperty(name = "pageSize",value = "页面尺寸") + private Integer pageSize; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RMpElectricQualityProblemFlowDetails.java b/process-api/src/main/java/com/njcn/process/pojo/po/RMpElectricQualityProblemFlowDetails.java new file mode 100644 index 000000000..02914eedf --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RMpElectricQualityProblemFlowDetails.java @@ -0,0 +1,129 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; + +/** + *
+ * 电能质量问题流程详情表 + *
+ * + * @author xiaoyao + * @since 2022-11-14 + */ +@Data +@TableName("r_mp_electric_quality_problem_flow_details") +public class RMpElectricQualityProblemFlowDetails implements Serializable { + + private static final long serialVersionUID = 9178900090120554888L; + + /** + * 电能质量问题编号 + */ + private String powerQualityProblemNo; + + /** + * 原因分析问题填报时间 + */ + private LocalDateTime dataDateYyfx; + + /** + * 原因分析电网侧填报内容,字典表(风电场) + */ + private String reportProcessContentYyfx; + + /** + * 原因分析用户侧填报内容,字典表(风电场) + */ + private String userReportProcessContentYyfx; + + /** + * 原因分析事件描述 + */ + private String eventDescriptionYyfx; + + /** + * 原因分析文件名称 + */ + private String fileNameYyfx; + + /** + * 原因分析文件路径 + */ + private String filePathYyfx; + + /** + * 计划整改问题填报时间 + */ + private LocalDateTime dataDateJhzg; + + /** + * 计划整改电网侧填报内容,字典表(风电场) + */ + private String reportProcessContentJhzg; + + /** + * 计划整改用户侧填报内容,字典表(风电场) + */ + private String userReportProcessContentJhzg; + + /** + * 计划整改文件名称 + */ + private String fileNameJhzg; + + /** + * 计划整改文件路径 + */ + private String filePathJhzg; + + /** + * 实际采取问题填报时间 + */ + private LocalDateTime dataDateSjcq; + + /** + * 实际采取电网侧填报内容,字典表(风电场) + */ + private String reportProcessContentSjcq; + + /** + * 实际采取用户侧填报内容,字典表(风电场) + */ + private String userReportProcessContentSjcq; + + /** + * 实际采取文件名称 + */ + private String fileNameSjcq; + + /** + * 实际采取文件路径 + */ + private String filePathSjcq; + + /** + * 治理效果问题填报时间 + */ + private LocalDateTime dataDateZlxg; + + /** + * 治理效果事件描述 + */ + private String descriptionZlxg; + + /** + * 治理效果文件名称 + */ + private String fileNameZlxg; + + /** + * 治理效果文件路径 + */ + private String filePathZlxg; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RMpGeneralSurveyOverproofProblem.java b/process-api/src/main/java/com/njcn/process/pojo/po/RMpGeneralSurveyOverproofProblem.java new file mode 100644 index 000000000..2ccd33bfd --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RMpGeneralSurveyOverproofProblem.java @@ -0,0 +1,59 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; + +/** + *+ * 普测超标问题详情表 + *
+ * + * @author xiaoyao + * @since 2022-11-14 + */ +@Data +@TableName("r_mp_general_survey_overproof_problem") +public class RMpGeneralSurveyOverproofProblem implements Serializable { + + private static final long serialVersionUID = 8919697054130246792L; + + /** + * 电能质量问题编号 + */ + private String powerQualityProblemNo; + + /** + * 变电站ID + */ + private String substationId; + + /** + * 母线ID + */ + private String busbarId; + + /** + * 监测点ID + */ + private String measurementPointId; + + /** + * 问题发生记录时间 + */ + private LocalDateTime dataDate; + + /** + * 超标指标 + */ + private String overLimitTarget; + + /** + * 普测计划名称 + */ + private String planName; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java b/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java new file mode 100644 index 000000000..ef7be9f20 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java @@ -0,0 +1,120 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; + +/** + *+ * 在线监测超标问题详情表 + *
+ * + * @author xiaoyao + * @since 2022-11-14 + */ +@TableName("r_mp_online_monitor_overproof_problem") +public class RMpOnlineMonitorOverproofProblem implements Serializable { + + private static final long serialVersionUID = 3162750613976845195L; + + /** + * 电能质量问题编号 + */ + @TableId(value = "power_quality_problem_no", type = IdType.AUTO) + private String powerQualityProblemNo; + + /** + * 告警指标 + */ + private String warnTarget; + + /** + * 告警原因 + */ + private String warnReason; + + /** + * 变电站ID + */ + private String substationId; + + /** + * 监测点ID + */ + private String measurementPointId; + + /** + * 操作时间 + */ + private LocalDateTime dataDate; + + /** + * 告警持续时间 + */ + private String warnLastTime; + + public String getPowerQualityProblemNo() { + return powerQualityProblemNo; + } + + public void setPowerQualityProblemNo(String powerQualityProblemNo) { + this.powerQualityProblemNo = powerQualityProblemNo; + } + public String getWarnTarget() { + return warnTarget; + } + + public void setWarnTarget(String warnTarget) { + this.warnTarget = warnTarget; + } + public String getWarnReason() { + return warnReason; + } + + public void setWarnReason(String warnReason) { + this.warnReason = warnReason; + } + public String getSubstationId() { + return substationId; + } + + public void setSubstationId(String substationId) { + this.substationId = substationId; + } + public String getMeasurementPointId() { + return measurementPointId; + } + + public void setMeasurementPointId(String measurementPointId) { + this.measurementPointId = measurementPointId; + } + public LocalDateTime getDataDate() { + return dataDate; + } + + public void setDataDate(LocalDateTime dataDate) { + this.dataDate = dataDate; + } + public String getWarnLastTime() { + return warnLastTime; + } + + public void setWarnLastTime(String warnLastTime) { + this.warnLastTime = warnLastTime; + } + + @Override + public String toString() { + return "RMpOnlineMonitorOverproofProblem{" + + "powerQualityProblemNo=" + powerQualityProblemNo + + ", warnTarget=" + warnTarget + + ", warnReason=" + warnReason + + ", substationId=" + substationId + + ", measurementPointId=" + measurementPointId + + ", dataDate=" + dataDate + + ", warnLastTime=" + warnLastTime + + "}"; + } +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RMpOperationMonitorAbnormal.java b/process-api/src/main/java/com/njcn/process/pojo/po/RMpOperationMonitorAbnormal.java new file mode 100644 index 000000000..4149a32b0 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RMpOperationMonitorAbnormal.java @@ -0,0 +1,64 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; + +/** + *+ * 运维监控异常详情表 + *
+ * + * @author xiaoyao + * @since 2022-11-14 + */ +@Data +@TableName("r_mp_operation_monitor_abnormal") +public class RMpOperationMonitorAbnormal implements Serializable { + + private static final long serialVersionUID = 8875641972721431859L; + + /** + * 电能质量问题编号 + */ + private String powerQualityProblemNo; + + /** + * 异常设备名称 + */ + private String abnormalDevName; + + /** + * 发现异常时间 + */ + private LocalDateTime abnormalDevTime; + + /** + * 异常指标 + */ + private String abnormalTarget; + + /** + * 事件描述 + */ + private String eventDescription; + + /** + * 问题发生记录时间 + */ + private LocalDateTime dataDate; + + /** + * 电网侧受影响设备 + */ + private String powerGridAffectDev; + + /** + * 用户侧受影响设备 + */ + private String userAffectDev; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RMpUserComplaint.java b/process-api/src/main/java/com/njcn/process/pojo/po/RMpUserComplaint.java new file mode 100644 index 000000000..7cec190a8 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RMpUserComplaint.java @@ -0,0 +1,79 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; + +/** + *+ * 用户投诉详情表 + *
+ * + * @author xiaoyao + * @since 2022-11-14 + */ +@Data +@TableName("r_mp_user_complaint") +public class RMpUserComplaint implements Serializable { + + private static final long serialVersionUID = 3262855544539938372L; + + /** + * 电能质量问题编号 + */ + private String powerQualityProblemNo; + + /** + * 用户类别 + */ + private String userType; + + /** + * 用户编号 + */ + private String userNo; + + /** + * 用户名称 + */ + private String userName; + + /** + * 投诉内容 + */ + private String complaintContent; + + /** + * 投诉时间 + */ + private LocalDateTime complaintTime; + + /** + * 异常指标 + */ + private String abnormalTarget; + + /** + * 问题发生记录时间 + */ + private LocalDateTime dataDate; + + /** + * 用电类别 + */ + private String electricityType; + + /** + * 电网侧受影响设备 + */ + private String powerGridAffectDev; + + /** + * 用户侧受影响设备 + */ + private String userAffectDev; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RStatElectricQualityProblemFlow.java b/process-api/src/main/java/com/njcn/process/pojo/po/RStatElectricQualityProblemFlow.java new file mode 100644 index 000000000..079fd3ada --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RStatElectricQualityProblemFlow.java @@ -0,0 +1,74 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.io.Serializable; + +/** + *+ * 电能质量问题流程表 + *
+ * + * @author xiaoyao + * @since 2022-11-14 + */ +@Data +@TableName("r_stat_electric_quality_problem_flow") +public class RStatElectricQualityProblemFlow implements Serializable { + + private static final long serialVersionUID = -2613309615015237749L; + + /** + * 单位id + */ + private String orgNo; + + /** + * 电能质量问题编号 + */ + private String powerQualityProblemNo; + + /** + * 问题发生记录时间 + */ + private LocalDateTime dataDate; + + /** + * 流程开始时间 + */ + private LocalDateTime startTime; + + /** + * 填报更新时间 + */ + private LocalDateTime updateTime; + + /** + * 问题来源(在线监测告警、普测超标、用户投诉、设备异常) + */ + private String problemSources; + + /** + * 填报进度,字典表(未填报、原因分析结果、计划整改措施、实际采取措施、治理效果评价、已归档) + */ + private String reportProcess; + + /** + * 审核状态 (0:待审核 2:审核通过 3:已驳回) + */ + private String reportProcessStatus; + + /** + * 填报内容,字典表(风电场) + */ + private String reportProcessContent; + + /** + * 问题名称 + */ + private String problemName; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/AbnormalVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/AbnormalVO.java new file mode 100644 index 000000000..bb9beb9ef --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/AbnormalVO.java @@ -0,0 +1,43 @@ +package com.njcn.process.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/18 10:32 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class AbnormalVO extends ProcessVO implements Serializable { + + private static final long serialVersionUID = -8022287041427540079L; + + /** + * 异常设备名称 + */ + private String abnormalDevName; + + /** + * 发现异常时间 + */ + private String abnormalDevTime; + + /** + * 设备异常描述 + */ + private String eventDescription; + + /** + * 稳态指标 + */ + private String steadyIndicator; + + /** + * 暂态指标 + */ + private String transientIndicators; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/ComplaintVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/ComplaintVO.java new file mode 100644 index 000000000..25ce71db6 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/ComplaintVO.java @@ -0,0 +1,49 @@ +package com.njcn.process.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/18 10:29 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class ComplaintVO extends ProcessVO implements Serializable { + + private static final long serialVersionUID = 9158479795790063533L; + + /** + * 投诉用户名称 + */ + private String userName; + + /** + * 投诉用户编号 + */ + private String userNo; + + /** + * 投诉时间 + */ + private String complaintTime; + + /** + * 投诉内容 + */ + private String complaintContent; + + /** + * 稳态指标 + */ + private String steadyIndicator; + + /** + * 暂态指标 + */ + private String transientIndicators; + +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/ExcessiveDetailVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/ExcessiveDetailVO.java new file mode 100644 index 000000000..c1b1a424d --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/ExcessiveDetailVO.java @@ -0,0 +1,63 @@ +package com.njcn.process.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/15 14:20 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class ExcessiveDetailVO extends ProcessVO implements Serializable { + + private static final long serialVersionUID = 8148172081938274507L; + + /** + * 变电站ID + */ + private String substationId; + + /** + * 所属变电站 + */ + private String substationName; + + /** + * 母线ID + */ + private String busBarId; + + /** + * 所属母线 + */ + private String busBarName; + + /** + * 监测点ID + */ + private String measurementPointId; + + /** + * 监测点名称 + */ + private String measurementPointName; + + /** + * 告警持续时间 + */ + private String warnLastTime; + + /** + * 告警指标 + */ + private String warnTarget; + + /** + * 告警原因 + */ + private String warnReason; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/GeneralSurveyVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/GeneralSurveyVO.java new file mode 100644 index 000000000..281322465 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/GeneralSurveyVO.java @@ -0,0 +1,53 @@ +package com.njcn.process.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/18 10:18 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class GeneralSurveyVO extends ProcessVO implements Serializable { + + private static final long serialVersionUID = -2492655246455534163L; + + /** + * 普测计划名称 + */ + private String planName; + + /** + * 变电站ID + */ + private String substationId; + + /** + * 所属变电站 + */ + private String substationName; + + /** + * 母线ID + */ + private String busBarId; + + /** + * 所属母线 + */ + private String busBarName; + + /** + * 稳态指标 + */ + private String steadyIndicator; + + /** + * 暂态指标 + */ + private String transientIndicators; +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/IssuesVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/IssuesVO.java new file mode 100644 index 000000000..e95f6678a --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/IssuesVO.java @@ -0,0 +1,58 @@ +package com.njcn.process.pojo.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/14 15:26 + */ +@Data +public class IssuesVO implements Serializable { + + private static final long serialVersionUID = 3404206127125677291L; + + /** + * 单位ID + */ + private String orgNo; + + /** + * 所属单位 + */ + private String orgName; + + /** + * 问题来源(在线监测告警、普测超标、用户投诉、设备异常) + */ + private String problemSources; + + /** + * 电能质量问题编号 + */ + private String powerQualityProblemNo; + + /** + * 问题名称 + */ + private String problemName; + + /** + * 问题发生记录时间 + */ + private LocalDateTime dataDate; + + /** + * 填报进度,字典表(未填报、原因分析结果、计划整改措施、实际采取措施、治理效果评价、已归档) + */ + private String reportProcess; + + /** + * 审核状态 (0:待审核 2:审核通过 3:已驳回) + */ + private String reportProcessStatus; + +} diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/ProcessVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/ProcessVO.java new file mode 100644 index 000000000..6e64e9c15 --- /dev/null +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/ProcessVO.java @@ -0,0 +1,136 @@ +package com.njcn.process.pojo.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/18 9:21 + */ +@Data +public class ProcessVO implements Serializable { + + private static final long serialVersionUID = 5482941481503051977L; + + /** + * 单位ID + */ + private String orgNo; + + /** + * 所属单位 + */ + private String orgName; + + /** + * 问题来源(在线监测告警、普测超标、用户投诉、设备异常) + */ + private String problemSources; + + /** + * 问题名称 + */ + private String problemName; + + /** + * 电能质量问题编号 + */ + private String powerQualityProblemNo; + + /** + * 填报进度,字典表(未填报、原因分析结果、计划整改措施、实际采取措施、治理效果评价、已归档) + */ + private String reportProcess; + + /** + * 电网侧原因 + */ + private String reportProcessContentYyfx; + + /** + * 用户侧原因 + */ + private String userReportProcessContentYyfx; + + /** + * 电网侧受影响设备 + */ + private String powerGridAffectDev; + + /** + * 用户侧受影响设备 + */ + private String userAffectDev; + + /** + * 事件描述 + */ + private String eventDescriptionYyfx; + + /** + * 原因分析报告文件名称 + */ + private String fileNameYyfx; + + /** + * 原因分析报告文件路径 + */ + private String filePathYyfx; + + /** + * 电网侧整改治理措施 + */ + private String reportProcessContentJhzg; + + /** + * 用户侧整改治理措施 + */ + private String userReportProcessContentJhzg; + + /** + * 计划整改文件名称 + */ + private String fileNameJhzg; + + /** + * 计划整改文件路径 + */ + private String filePathJhzg; + + /** + * 电网侧实际采取措施 + */ + private String reportProcessContentSjcq; + + /** + * 用户侧实际采取措施 + */ + private String userReportProcessContentSjcq; + + /** + * 实际采取措施报告文件名称 + */ + private String fileNameSjcq; + + /** + * 实际采取措施报告文件路径 + */ + private String filePathSjcq; + + /** + * 成效分析概述 + */ + private String descriptionZlxg; + + /** + * 成效分析报告文件名称 + */ + private String fileNameZlxg; + + /** + * 成效分析报告文件路径 + */ + private String filePathZlxg; +} diff --git a/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java b/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java new file mode 100644 index 000000000..f01b7679a --- /dev/null +++ b/process-boot/src/main/java/com/njcn/process/controller/ElectricityQualityIssuesController.java @@ -0,0 +1,190 @@ +package com.njcn.process.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.minio.bo.MinIoUploadResDTO; +import com.njcn.process.pojo.param.*; +import com.njcn.process.pojo.vo.*; +import com.njcn.process.service.IssuesService; +import com.njcn.system.enums.DicDataEnum; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +/** + * 电能质量问题 + * @author xiaoyao + * @version 1.0.0 + * @createTime 2022/11/14 9:18 + */ +@Slf4j +@Api(tags = "电能质量问题") +@RestController +@RequestMapping("/electricityQuality") +@RequiredArgsConstructor +public class ElectricityQualityIssuesController extends BaseController { + + private final IssuesService issuesService; + + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) + @PostMapping("/addExcessiveIssues") + @ApiOperation("填报在线监测超标问题") + @ApiImplicitParam(name = "excessiveParam", value = "参数", required = true) + public HttpResult+ * 电能质量问题流程详情表 Mapper 接口 + *
+ * + * @author xiaoyao + * @since 2022-11-14 + */ +public interface RMpElectricQualityProblemFlowDetailsMapper extends BaseMapper+ * 普测超标问题详情表 Mapper 接口 + *
+ * + * @author xiaoyao + * @since 2022-11-14 + */ +public interface RMpGeneralSurveyOverproofProblemMapper extends BaseMapper+ * 在线监测超标问题详情表 Mapper 接口 + *
+ * + * @author xiaoyao + * @since 2022-11-14 + */ +public interface RMpOnlineMonitorOverproofProblemMapper extends BaseMapper+ * 运维监控异常详情表 Mapper 接口 + *
+ * + * @author xiaoyao + * @since 2022-11-14 + */ +public interface RMpOperationMonitorAbnormalMapper extends BaseMapper+ * 用户投诉详情表 Mapper 接口 + *
+ * + * @author xiaoyao + * @since 2022-11-14 + */ +public interface RMpUserComplaintMapper extends BaseMapper+ * 电能质量问题流程表 Mapper 接口 + *
+ * + * @author xiaoyao + * @since 2022-11-14 + */ +public interface RStatElectricQualityProblemFlowMapper extends BaseMapper