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

1.单位回显，时间范围查询等功能添加

Browse Source 
2.干扰源和敏感供用户模板下载和批量导入
3.增加根据code进行树形字典筛选
3.全景展示技术监督接口新增
This commit is contained in:
wr
2024-06-19 15:31:17 +08:00
parent b0fb724880
commit e54638425e
24 changed files with 1110 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java Normal file
View File

@@ -0,0 +1,123 @@
package com.njcn.supervision.pojo.dto;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
@Data
public class SensitiveReportExcel implements Serializable {
/**
* 对应用户名称
*/
@Excel(name = "*工程名称", width = 30)
@NotBlank(message = "工程名称不能为空")
private String projectName;
@Excel(name = "*用户性质", width = 30, replace = {"新建电网工程_0", "扩建电网工程_1", "新建非线性负荷用户_2", "扩建非线性负荷用户_3", "新建新能源发电站_4", "扩建新能源发电站_5", "_null"})
@NotNull(message = "用户性质不能为空")
private Integer userType;
@Excel(name = "*所属地市", width = 30)
@NotBlank(message = "所属地市不能为空")
private String city;
@Excel(name = "*归口管理部门", width = 30)
@NotBlank(message = "归口管理部门不能为空")
private String responsibleDepartment;
@Excel(name = "*用户状态", width = 30, replace = {"可研_0", "建设_1", "运行_2", "退运_3", "_null"})
@NotNull(message = "用户状态不能为空")
private Integer userStatus;
@Excel(name = "*变电站", width = 30)
@NotBlank(message = "变电站不能为空")
private String substation;
// @Excel(name = "填报人", width = 30)
// //@NotBlank(message = "填报人不能为空")
// private String reporter;
//
// @Excel(name = "填报日期(yyyy-MM-dd)", width = 30)
// //@NotBlank(message = "填报日期不能为空")
// private String reportDate;
//
// @Excel(name = "填报部门", width = 30)
// //@NotBlank(message = "填报部门不能为空")
// private String orgId;
@Excel(name = "工程预期投产日期", width = 30)
//@NotBlank(message = "工程预期投产日期不能为空")
private LocalDate expectedProductionDate;
@Excel(name = "电压等级", width = 30)
//@NotBlank(message = "电压等级不能为空")
private String voltageLevel;
@Excel(name = "预测评估单位", width = 30)
//@NotBlank(message = "预测评估单位不能为空")
private String evaluationDept;
@Excel(name = "预测评估结论", width = 30)
//@NotBlank(message = "预测评估结论不能为空")
private String evaluationConclusion;
//----------------------------以上基础数据------------------------------------
@Excel(name = "PCC点", width = 30)
//@NotBlank(message = "PCC点不能为空")
private String pccPoint;
@Excel(name = "基准短路容量(MVA)", width = 30)
//@NotBlank(message = "基准短路容量(MVA)不能为空")
private BigDecimal baseShortCircuitCapacity;
@Excel(name = "系统最小短路容量(MVA)", width = 30)
//@NotBlank(message = "系统最小短路容量(MVA)不能为空")
private BigDecimal minShortCircuitCapacity;
@Excel(name = "PCC供电设备容量(MVA)", width = 30)
//@NotBlank(message = "PCC供电设备容量(MVA)不能为空")
private BigDecimal pccEquipmentCapacity;
@Excel(name = "用户用电协议容量(MVA)", width = 30)
//@NotBlank(message = "用户用电协议容量(MVA)不能为空")
private BigDecimal userAgreementCapacity;
@Excel(name = "评估类型", width = 30)
//@NotBlank(message = "评估类型不能为空")
private String evaluationType;
@Excel(name = "非线性负荷类型", width = 30)
//@NotBlank(message = "非线性负荷类型不能为空")
private String nonlinearLoadType;
@Excel(name = "预测评估审核单位", width = 30)
//@NotBlank(message = "预测评估审核单位不能为空")
private String evaluationChekDept;
@Excel(name = "是否需要治理", width = 30, replace = {"否_0", "是_1", "_null"})
//@NotBlank(message = "是否需要治理不能为空")
private Integer needGovernance;
@Excel(name = "是否开展背景测试", width = 30, replace = {"否_0", "是_1", "_null"})
//@NotBlank(message = "是否开展背景测试不能为空")
private Integer backgroundTestPerformed;
@Data
@EqualsAndHashCode(callSuper = true)
public static class SensitiveReportExcelMsg extends SensitiveReportExcel implements Serializable {
@Excel(name = "错误信息描述")
private String msg;
}
}

159
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java Normal file
View File

@@ -0,0 +1,159 @@
package com.njcn.supervision.pojo.dto;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
@Data
public class SensitiveUserSExcel implements Serializable {
/**
* 对应用户名称
*/
@Excel(name = "*工程名称", width = 30)
@NotBlank(message = "工程名称不能为空")
private String projectName;
@Excel(name = "*所属地市", width = 30)
@NotBlank(message = "所属地市不能为空")
private String city;
@Excel(name = "*归口管理部门", width = 30)
@NotBlank(message = "归口管理部门不能为空")
private String responsibleDepartment;
@Excel(name = "*用户状态", width = 30, replace = {"可研_0", "建设_1", "运行_2", "退运_3", "_null"})
@NotNull(message = "用户状态不能为空")
private Integer userStatus;
@Excel(name = "*变电站", width = 30)
@NotBlank(message = "变电站不能为空")
private String substation;
@Excel(name = "*负荷级别", width = 30)
@NotBlank(message = "*负荷级别不能为空")
private String loadLevel;
@Excel(name = "*供电电源情况", width = 30)
@NotBlank(message = "*供电电源情况不能为空")
private String powerSupplyInfo;
// @Excel(name = "填报人", width = 30)
// //@NotBlank(message = "填报人不能为空")
// private String reporter;
//
// @Excel(name = "填报日期(yyyy-MM-dd)", width = 30)
// //@NotBlank(message = "填报日期不能为空")
// private String reportDate;
//
// @Excel(name = "填报部门", width = 30)
// //@NotBlank(message = "填报部门不能为空")
// private String orgId;
@Excel(name = "工程预期投产日期", width = 30)
//@NotBlank(message = "工程预期投产日期不能为空")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate expectedProductionDate;
@Excel(name = "电压等级", width = 30)
//@NotBlank(message = "电压等级不能为空")
private String voltageLevel;
@Excel(name = "预测评估单位", width = 30)
//@NotBlank(message = "预测评估单位不能为空")
private String evaluationDept;
@Excel(name = "预测评估结论", width = 30)
//@NotBlank(message = "预测评估结论不能为空")
private String evaluationConclusion;
//----------------------------以上基础数据------------------------------------
@Excel(name = "PCC点", width = 30)
//@NotBlank(message = "PCC点不能为空")
private String pccPoint;
@Excel(name = "是否需要治理", width = 30, replace = {"否_0", "是_1", "_null"})
//@NotBlank(message = "是否需要治理不能为空")
private Integer needGovernance;
@Excel(name = "是否开展背景测试", width = 30, replace = {"否_0", "是_1", "_null"})
//@NotBlank(message = "是否开展背景测试不能为空")
private Integer backgroundTestPerformed;
@Excel(name = "评估类型", width = 30)
//@NotBlank(message = "评估类型不能为空")
private String evaluationType;
@Excel(name = "行业", width = 30)
//@NotBlank(message = "行业不能为空")
private String industry;
@Excel(name = "敏感装置名称", width = 30)
//@NotBlank(message = "敏感装置名称不能为空")
private String deviceName;
@Excel(name = "供电电源数量", width = 30)
//@NotBlank(message = "供电电源数量不能为空")
private Integer powerSupplyCount;
@Excel(name = "敏感电能质量指标", width = 30)
//@NotBlank(message = "敏感电能质量指标不能为空")
private String energyQualityIndex;
@Excel(name = "是否开展抗扰度测试", width = 30, replace = {"否_0", "是_1", "_null"})
//@NotBlank(message = "是否开展抗扰度测试不能为空")
private Integer antiInterferenceTest;
@Excel(name = "预测评估审核单位", width = 30)
//@NotBlank(message = "敏感电能质量指标不能为空")
private String evaluationChekDept;
@Excel(name = "供电电源", width = 30)
//@NotBlank(message = "供电电源不能为空")
private String powerSupply;
@Excel(name = "接入电压等级", width = 30)
//@NotBlank(message = "接入电压等级不能为空")
private String supplyVoltageLevel;
@Excel(name = "运维单位", width = 30)
//@NotBlank(message = "运维单位不能为空")
private String maintenanceUnit;
// substation_main_wiring_diagram 用户接入变电站主接线示意图地址
// sensitive_devices 主要敏感设备清单
// anti_interference_report 抗扰度测试报告
// power_quality_report 背景电能质量测试报告
// feasibility_report 可研报告地址
// preliminary_design_description 项目初步设计说明书地址
// prediction_evaluation_report 预测评估报告地址
// prediction_evaluation_review_opinions 预测评估评审意见报告地址
//
// additional_attachments 其他附件
// state 数据状态
// Create_By 创建用户
// Create_Time 创建时间
// Update_By 更新用户
// Update_Time 更新时间
@Data
@EqualsAndHashCode(callSuper = true)
public static class SensitiveUserExcelMsg extends SensitiveUserSExcel implements Serializable {
@Excel(name = "错误信息描述")
private String msg;
}
}

43
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/gridDiagram/GridDiagramVO.java Normal file
View File

@@ -0,0 +1,43 @@
package com.njcn.supervision.pojo.vo.gridDiagram;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class GridDiagramVO {
@ApiModelProperty(value = "部门名称")
private String orgName;
@ApiModelProperty(value = "异常问题总数")
private Integer abnormalNum;
@ApiModelProperty(value = "已关联工单数")
private Integer associatedNum;
@ApiModelProperty(value = "工单转换率")
private Float conversionNum;
@ApiModelProperty(value = "工单总数")
private Integer workNum;
@ApiModelProperty(value = "已处理工单数")
private Integer processedNum;
@ApiModelProperty(value = "工单处置率")
private Float disposalNum;
@Data
public static class Info extends GridDiagramVO {
@ApiModelProperty(value = "在线监测")
private Integer onLineNum;
@ApiModelProperty(value = "用户投诉")
private Integer userNum;
@ApiModelProperty(value = "技术监督计划")
private Integer surveyNum;
}
}

7
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java
View File

@@ -1,6 +1,7 @@
package com.njcn.supervision.pojo.vo.problem;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -16,7 +17,6 @@ public class SupervisionUserComplaintVO {
@ApiModelProperty("id")
private String Id;
@ApiModelProperty(value = "用户编号")
private String userNumber;
@@ -38,7 +38,6 @@ public class SupervisionUserComplaintVO {
@ApiModelProperty(value = "是否实现检测(0：否；1：是)")
private Integer detectionFlag;
@ApiModelProperty(value = "监测点编号")
private String monitorNumber;
@@ -50,7 +49,11 @@ public class SupervisionUserComplaintVO {
private String createBy;
@ApiModelProperty(value = "责任单位id")
private String dutyOrgId;
@ApiModelProperty(value = "责任单位")
private String dutyOrgName;
}

5
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java
View File

@@ -134,6 +134,11 @@ public class UserReportVO {
@TableField(value = "`status`")
private Integer status;
/**
* 数据来源类型 0.正常流程审核入库 1.批量导入
*/
@ApiModelProperty(value = "数据来源类型 0.正常流程审核入库 1.批量导入")
private Integer dataType;
private String createBy;