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-28 15:58:46 +08:00
parent 2eb2a41744
commit 970cd5b3dd
20 changed files with 765 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/supv/PlanProblemData.java Normal file
View File

@@ -0,0 +1,37 @@
package com.njcn.process.pojo.dto.supv;
import lombok.Data;
import java.util.Date;
/**
* pqs
*
* @author cdf
* @date 2023/6/28
*/
@Data
public class PlanProblemData {
private String problemId;
private String planId;
private String dutyOrgId;
private String dutyOrgName;
private String monitorType;
private Date rectificationTime;
private Date planRectificationTime;
private String ifReleaseWarning;
private String simpleProblemDesc;
private String rectificationMeasure;
private String rectificationStatus;
private String createTime;
private String remark;
private String supvStandardSort;
private String supvStandard;
private String supvResouce;
private String problemLevel;
private String problemDesc;
private String problemLevelReason;
private String problemType;
private String rectificationProgramme;
}

186
pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/supv/WorkPlanData.java Normal file
View File

@@ -0,0 +1,186 @@
package com.njcn.process.pojo.dto.supv;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
/**
* pqs
*
* @author cdf
* @date 2023/6/28
*/
@Data
public class WorkPlanData {
private String planId;
private String provinceId;
private String provinceName;
private String cityId;
private String cityName;
private String countyId;
private String countyName;
/**
* 计划名称
*/
private String workPlanName;
/**
* 监督单位
*/
private String supvOrgId;
/**
* 监督单位名称
*/
private String supvOrgName;
/**
* 监督类型
*/
private String supvType;
/**
* 监督阶段
*/
private String supvStage;
/**
* 计划监督时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private String planSupvDate;
/**
* 计划编制人id
*/
private String planUserId;
/**
* 计划编制人名称
*/
private String planUserName;
/**
* 计划编制单位id
*/
private String planOrgId;
/**
* 计划编制单位名称
*/
private String planOrgName;
/**
* 创建时间
*/
private Date createTime;
/**
* 其他要求
*/
private String otherRemark;
/**
* 计划（实施）执行开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private String effectStartTime;
/**
* 计划（实施）执行结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate effectEndTime;
/**
* 实施状态
*/
private String effectStatus;
/**
* 监督对象id
*/
private String supvObjId;
/**
* 监督对象名称
*/
private String supvObjName;
/**
* 对象类型
*/
private String supvObjType;
/**
* 对象电压等级
*/
private String objVoltageLevel;
private String objVoltageLevelName;
/**
* 关联电站
*/
private String substationName;
/**
* 关联电站电压等级
*/
private String substationVoltageLevel;
/**
* 关联电站电压等级名称
*/
private String substationVoltageLevelName;
/**
* 监督对象属性
*/
private String objType;
/**
* 监督对象属性名称
*/
private String objTypeName;
/**
* 监督对象协议容量(MVA)
*/
private Double objCapacity;
/**
* 报告出具时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String reportIssueTime;
/**
* 电能质量问题发生时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String problemOcTime;
}

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

@@ -92,7 +92,7 @@ public class SupvPlanParam extends BaseParam {
* 关联电站
*/
@ApiModelProperty(value = "关联电站")
private String objRelationStation;
private String substationName;
@ApiModelProperty(value = "关联电站电压等级")
private String substationVoltageLevel;
@@ -113,7 +113,7 @@ public class SupvPlanParam extends BaseParam {
@ApiModelProperty(value = "计划执行开始时间",required = true)
@NotNull(message = "计划执行开始时间不可为空")
@DateTimeStrValid(message = "计划执行开始时间格式有误")
private String supvStartTime;
private String effectStartTime;
/**
* 计划执行结束时间
@@ -121,7 +121,7 @@ public class SupvPlanParam extends BaseParam {
@ApiModelProperty(value = "计划执行结束时间",required = true)
@NotNull(message = "计划执行结束时间不可为空")
@DateTimeStrValid(message = "计划执行结束时间格式有误")
private String supvEndTime;
private String effectEndTime;
/**
* 报告出具时间
@@ -141,8 +141,8 @@ public class SupvPlanParam extends BaseParam {
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String planRemark;
@ApiModelProperty(value = "备注(其他要求)")
private String otherRemark;
/**
@@ -152,7 +152,8 @@ public class SupvPlanParam extends BaseParam {
@NotBlank(message = "计划编制单位id不可为空")
private String planOrgId;
@ApiModelProperty(value = "实施状态")
private String effectStatus;
@EqualsAndHashCode(callSuper = true)

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

@@ -113,6 +113,9 @@ public class SupvProblemParam extends BaseParam {
@NotBlank(message = "问题类型不可为空")
private String problemType;
@ApiModelProperty(value = "备注")
private String remark;
/**
* 整改方案
*/

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

@@ -1,11 +1,16 @@
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;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import org.springframework.web.multipart.MultipartFile;
/**
* <p>
@@ -15,19 +20,22 @@ import lombok.Setter;
* @author hongawen
* @since 2023-06-21
*/
@Getter
@Setter
@Data
@TableName("supv_file")
public class SupvFile extends BaseEntity {
public class SupvFile {
private static final long serialVersionUID = 1L;
private String id;
@TableId
private String uuid;
/**
* 附件路径
*/
private String file;
private String fileUrl;
@TableField(exist = false)
private MultipartFile file;
/**
* 附件名称
@@ -47,5 +55,11 @@ public class SupvFile extends BaseEntity {
*/
private String busiId;
private String uploaderName;
private LocalDateTime uploadTime;
private String uploaderId;
}

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

@@ -74,7 +74,7 @@ public class SupvPlan extends BaseEntity {
/**
* 关联电站
*/
private String objRelationStation;
private String substationName;
/**
@@ -102,13 +102,13 @@ public class SupvPlan extends BaseEntity {
* 计划执行开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate supvStartTime;
private LocalDate effectStartTime;
/**
* 计划执行结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate supvEndTime;
private LocalDate effectEndTime;
/**
* 报告出具时间
@@ -125,7 +125,7 @@ public class SupvPlan extends BaseEntity {
/**
* 备注
*/
private String planRemark;
private String otherRemark;
/**
* 计划编制人id
@@ -138,6 +138,10 @@ public class SupvPlan extends BaseEntity {
private String planOrgId;
/**
* 实施状态
*/
private String effectStatus;
/**
* 0.未上送 1.上送 2.取消上送

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

@@ -114,5 +114,16 @@ public class SupvProblem extends BaseEntity {
private String rectificationMeasure;
/**
* 0.以上送 1.未上送 2.取消上送
*/
private Integer isUploadHead;
/**
* 备注
*/
private String remark;
}

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

@@ -106,13 +106,13 @@ public class SupvPlanVO {
* 计划执行开始时间
*/
@ApiModelProperty(value = "计划执行开始时间",required = true)
private String supvStartTime;
private String effectStartTime;
/**
* 计划执行结束时间
*/
@ApiModelProperty(value = "计划执行结束时间",required = true)
private String supvEndTime;
private String effectEndTime;
/**
* 报告出具时间
@@ -133,7 +133,7 @@ public class SupvPlanVO {
* 备注
*/
@ApiModelProperty(value = "备注")
private String planRemark;
private String otherRemark;
@ApiModelProperty(value = "省部门")
private String province;
@@ -153,4 +153,13 @@ public class SupvPlanVO {
*/
@ApiModelProperty(value = "0.未上送 1.上送 2.取消上送")
private Integer isUploadHead;
private String createBy;
/**
* 实施状态
*/
private String effectStatus;
private String createTime;
}