Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

技术监督管理

Browse Source
This commit is contained in:
雨木c
2023-06-27 16:47:16 +08:00
parent 916b68d307
commit aca47f35ff
19 changed files with 812 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/PublicDTO.java → pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/ProcessPublicDTO.java
View File

@@ -10,9 +10,9 @@ import lombok.Data;
* @createTime 2022/11/11 10:34
*/
@Data
public class PublicDTO {
public class ProcessPublicDTO {
private String id;
private String date;
private Integer value;
}

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

@@ -92,9 +92,21 @@ public class SupvPlanParam extends BaseParam {
* 关联电站
*/
@ApiModelProperty(value = "关联电站")
@NotBlank(message = "关联电站不可为空")
private String objRelationStation;
@ApiModelProperty(value = "关联电站电压等级")
private String substationVoltageLevel;
@ApiModelProperty(value = "监督对象属性")
private String objType;
@ApiModelProperty(value = "监督对象属性名称")
private String objTypeName;
@ApiModelProperty(value = "监督对象协议容量(MVA)")
private Double objCapacity;
/**
* 计划执行开始时间
*/
@@ -123,6 +135,7 @@ public class SupvPlanParam extends BaseParam {
*/
@ApiModelProperty(value = "电能质量问题发生时间",required = true)
@DateTimeStrValid(message = "电能质量问题发生时间格式有误",format = "yyyy-MM-dd HH:mm:ss")
@NotBlank(message = "电能质量问题发生时间不可为空")
private String problemOcTime;
/**
@@ -132,6 +145,15 @@ public class SupvPlanParam extends BaseParam {
private String planRemark;
/**
* 计划编制单位id
*/
@ApiModelProperty(value = "计划编制单位id")
@NotBlank(message = "计划编制单位id不可为空")
private String planOrgId;
@EqualsAndHashCode(callSuper = true)
@Data

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

@@ -120,6 +120,16 @@ public class SupvProblemParam extends BaseParam {
@NotBlank(message = "整改方案不可为空")
private String rectificationProgramme;
@ApiModelProperty(value = "整改措施")
private String rectificationMeasure;
/**
* 整改情况01已整改，02未整改
*/
@ApiModelProperty(value = "整改情况",required = true)
@NotBlank(message = "整改情况不可为空")
private String rectificationStatus;
@EqualsAndHashCode(callSuper = true)
@Data
public static class UpdateSupvProblemParam extends SupvProblemParam{

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

@@ -8,6 +8,7 @@ import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -75,6 +76,28 @@ public class SupvPlan extends BaseEntity {
*/
private String objRelationStation;
/**
* 关联电站电压等级
*/
private String substationVoltageLevel;
/**
* 监督对象属性
*/
private String objType;
/**
* 监督对象属性名称
*/
private String objTypeName;
/**
* 监督对象协议容量(MVA)
*/
private Double objCapacity;
/**
* 计划执行开始时间
*/
@@ -104,6 +127,18 @@ public class SupvPlan extends BaseEntity {
*/
private String planRemark;
/**
* 计划编制人id
*/
private String planUserId;
/**
* 计划编制单位id
*/
private String planOrgId;
/**
* 0.未上送 1.上送 2.取消上送
*/

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

@@ -1,5 +1,6 @@
package com.njcn.process.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
@@ -7,11 +8,14 @@ import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
/**
* <p>
*
@@ -40,6 +44,9 @@ public class SupvProblem extends BaseEntity {
*/
private String dutyOrgId;
@TableField(exist = false)
private String dutyOrgName;
/**
* 监测点类型 ，仅供电电压监督计划必填
*/
@@ -95,6 +102,17 @@ public class SupvProblem extends BaseEntity {
*/
private String rectificationProgramme;
/**
* 整改情况01已整改，02未整改
*/
private String rectificationStatus;
/**
* 整改措施
*/
private String rectificationMeasure;
}

207
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvReportM.java Normal file
View File

@@ -0,0 +1,207 @@
package com.njcn.process.pojo.po;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDate;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
*
* </p>
*
* @author hongawen
* @since 2023-06-26
*/
@Data
@TableName("supv_report_m")
public class SupvReportM {
private static final long serialVersionUID = 1L;
@TableId
private String monthReportId;
@MppMultiId
private LocalDate statisticsDate;
@MppMultiId
private String statisticsDept;
private String statisticsLevel;
private String provinceId;
private String provinceName;
private String cityId;
private String cityName;
private String countyId;
private String countyName;
/**
* 特高压换流站本年计划监督数量
*/
private Integer convertYearSupvNum;
/**
* 特高压换流站月监督数量
*/
private Integer convertMonthSupvNum;
/**
* 特高压换流站累计监督数量
*/
private Integer convertTotalSupvNum;
/**
* 特高压换流站本月问题数量
*/
private Integer convertMonthQuesNum;
/**
* 特高压换流站累计问题数量
*/
private Integer convertTotalQuesNum;
/**
* 特高压换流站本月整改问题数量
*/
private Integer convertMonthReformNum;
/**
* 特高压换流站累计整改问题数量
*/
private Integer convertTotalReformNum;
/**
* 新能源场站本年计划监督数量
*/
private Integer energyYearSupvNum;
/**
* 新能源场站月监督数量
*/
private Integer energyMonthSupvNum;
/**
* 新能源场站累计监督数量
*/
private Integer energyTotalSupvNum;
/**
* 新能源场站本月问题数量
*/
private Integer energyMonthQuesNum;
/**
* 新能源场站累计问题数量
*/
private Integer energyTotalQuesNum;
/**
* 新能源场站本月整改问题数量
*/
private Integer energyMonthReformNum;
/**
* 新能源场站累计整改问题数量
*/
private Integer energyTotalReformNum;
/**
* 新能源场站本年计划监督新（改扩建）数量
*/
private Integer energyYearSupvNewNum;
/**
* 新能源场站本月监督新（改扩建）数量
*/
private Integer energyMonthSupvNewNum;
/**
* 新能源场站累计监督新（改扩建）数量
*/
private Integer energyTotalSupvNewNum;
/**
* 新能源场站本月问题新（改扩建）数量
*/
private Integer energyMonthQuesNewNum;
/**
* 新能源场站累计问题新（改扩建）数量
*/
private Integer energyTotalQuesNewNum;
/**
* 新能源场站本月新（改扩建）整改问题数量
*/
private Integer energyMonthReformNewNum;
/**
* 新能源场站累计新（改扩建）整改问题数量
*/
private Integer energyTotalReformNewNum;
/**
* 电能质量敏感用户本年计划监督数量
*/
private Integer sensitiveYearSupvNum;
/**
* 电能质量敏感用户本月监督数量
*/
private Integer sensitiveMonthSupvNum;
/**
* 电能质量敏感
*/
private Integer sensitiveTotalSupvNum;
/**
* 用户累计监督数量
*/
private Integer supvNum;
/**
* 电能质量敏感用户本月问题数量
*/
private Integer sensitiveMonthQuesNum;
/**
* 电能质量敏感用户累计问题数量
*/
private Integer sensitiveTotalQuesNum;
/**
* 电能质量敏感用户本月整改问题数量
*/
private Integer sensitiveMonthReformNum;
/**
* 电能质量敏感用户累计整改问题数量
*/
private Integer sensitiveTotalReformNum;
/**
* 供电电压计划本月前开展数量
*/
private Integer powerMonthPlanNum;
/**
* 供电电压本月前已开展数量
*/
private Integer powerTotalConductedNum;
}

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

@@ -1,11 +1,13 @@
package com.njcn.process.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
import java.time.LocalDateTime;
/**
* pqs
@@ -34,6 +36,18 @@ public class SupvPlanVO {
@ApiModelProperty(value = "监督单位名称",required = true)
private String supvOrgName;
/**
* 计划编制单位id
*/
@ApiModelProperty(value = "计划编制单位id")
private String planOrgId;
/**
* 计划编制单位名字
*/
@ApiModelProperty(value = "计划编制单位名字")
private String planOrgName;
/**
* 监督类型
*/
@@ -76,6 +90,18 @@ public class SupvPlanVO {
@ApiModelProperty(value = "关联电站")
private String objRelationStation;
@ApiModelProperty(value = "关联电站电压等级")
private String substationVoltageLevel;
@ApiModelProperty(value = "监督对象属性")
private String objType;
@ApiModelProperty(value = "监督对象属性名称")
private String objTypeName;
@ApiModelProperty(value = "监督对象协议容量(MVA)")
private Double objCapacity;
/**
* 计划执行开始时间
*/
@@ -92,13 +118,15 @@ public class SupvPlanVO {
* 报告出具时间
*/
@ApiModelProperty(value = "报告出具时间",required = true)
private String reportIssueTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime reportIssueTime;
/**
* 电能质量问题发生时间
*/
@ApiModelProperty(value = "电能质量问题发生时间",required = true)
private String problemOcTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime problemOcTime;
/**
@@ -119,4 +147,10 @@ public class SupvPlanVO {
@ApiModelProperty(value = "附件名称")
private String attachmentName;
/**
* 0.未上送 1.上送 2.取消上送
*/
@ApiModelProperty(value = "0.未上送 1.上送 2.取消上送")
private Integer isUploadHead;
}