diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/enums/ApplyFormEnum.java b/pqs-process/process-api/src/main/java/com/njcn/process/enums/ApplyFormEnum.java new file mode 100644 index 000000000..b81e0fa5a --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/enums/ApplyFormEnum.java @@ -0,0 +1,31 @@ +package com.njcn.process.enums; + +import lombok.Getter; + +@Getter +public enum ApplyFormEnum { + ONLINE_MONITORING_EXCEEDS (1, "电能质量-在线监测超标问题申请单"), + MONITORING_ABNORMAL (2, "电能质量-运维监控异常申请单"), + USER_COMPLAINT(3, "电能质量-用户投诉申请单"), + GENERAL_TEST_EXCEEDED (4, "电能质量-普测超标问题申请单"), + MONITORINGRETURNED (5, "监测设备退运申请单"), + + ; + private final Integer code; + + private final String message; + + ApplyFormEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + public static ApplyFormEnum getAlarmTypeEnumByCode(Integer code) { + for (ApplyFormEnum alarmTypeEnum : ApplyFormEnum.values()) { + if (alarmTypeEnum.getCode().equals(code)) { + return alarmTypeEnum; + } + } + return null; + } +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/RFlowProcessParm.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/RFlowProcessParm.java index 4829c8bfa..5e1f8788b 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/RFlowProcessParm.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/RFlowProcessParm.java @@ -48,6 +48,9 @@ public class RFlowProcessParm { @ApiModelProperty(value = "文件路径") private String filePath; + @ApiModelProperty(value = "文件路径") + private String fileName; + /** * 上传时间 @@ -75,9 +78,9 @@ public class RFlowProcessParm { @ApiModelProperty(value = "流程状态") private String processStatus; - - @ApiModelProperty(value = "操作1-保存，2-直接提交审核") - private String operate ; +// +// @ApiModelProperty(value = "操作1-保存，2-直接提交审核") +// private String operate ; @Data public static class RFlowProcessUpdate extends RFlowProcessParm { diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/RFlowProcessQueryParm.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/RFlowProcessQueryParm.java new file mode 100644 index 000000000..856e7d623 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/RFlowProcessQueryParm.java @@ -0,0 +1,53 @@ +package com.njcn.process.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 15:20【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class RFlowProcessQueryParm { + + @NotNull(message="当前页不能为空！") + @Min(value = 1, message = "当前页不能为0") + @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) + private Integer pageNum; + /**显示条数*/ + @NotNull(message="显示条数不能为空！") + @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) + private Integer pageSize; + + @ApiModelProperty(value="单位ID") + private String orgNo; + + @ApiModelProperty(value="开始时间") + private String startTime; + + @ApiModelProperty(value="结束时间") + private String endTime; + + + @ApiModelProperty(value = "申请流程类型") + @NotNull(message="申请流程类型为空！") + private Integer applyType; + + @ApiModelProperty(value = "申请单类型") + @NotNull(message="申请单类型为空！") + private Integer type; + + @ApiModelProperty(value = "申请页面1，审核页面2") + @NotNull(message="页面类型为空！") + private String pageType; + + + +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportParam.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportParam.java new file mode 100644 index 000000000..e720236af --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportParam.java @@ -0,0 +1,124 @@ +package com.njcn.process.pojo.param; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.njcn.db.bo.BaseEntity; +import com.njcn.process.pojo.po.UserReportProjectPO; +import com.njcn.process.pojo.po.UserReportSensitivePO; +import com.njcn.process.pojo.po.UserReportSubstationPO; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; + +/** + * + * Description: + * Date: 2024/4/25 10:07【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class UserReportParam extends BaseEntity { + + + /** + * 填报人 + */ + @ApiModelProperty(value = "填报人") + private String reporter; + + /** + * 填报日期 + */ + @ApiModelProperty(value = "填报日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private LocalDate reportDate; + + /** + * 填报部门 + */ + @ApiModelProperty(value = "填报部门") + private String orgId; + + /** + * 工程预期投产日期 + */ + @ApiModelProperty(value = "工程预期投产日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private LocalDate expectedProductionDate; + + /** + * 用户性质 + */ + @ApiModelProperty(value = "用户性质") + private String userType; + + /** + * 所属地市 + */ + @ApiModelProperty(value = "所属地市") + private String city; + + /** + * 归口管理部门 + */ + @ApiModelProperty(value = "归口管理部门") + private String responsibleDepartment; + + /** + * 用户状态 + */ + @ApiModelProperty(value = "用户状态") + private String userStatus; + + /** + * 变电站 + */ + @ApiModelProperty(value = "变电站") + private String substation; + + /** + * 电压等级 + */ + @ApiModelProperty(value = "电压等级") + private String voltageLevel; + + /** + * 工程名称 + */ + @ApiModelProperty(value = "工程名称") + private String projectName; + + /** + * 预测评估单位 + */ + @ApiModelProperty(value = "预测评估单位") + private String evaluationDept; + + /** + * 预测评估结论 + */ + @ApiModelProperty(value = "预测评估结论") + private String evaluationConclusion; + + + private UserReportProjectPO userReportProjectPO; + + private UserReportSensitivePO userReportSensitivePO; + + private UserReportSubstationPO userReportSubstationPO; + + + @Data + public static class UserReportUpdate extends UserReportParam { + @ApiModelProperty("id") + private String Id; + + } + +} \ No newline at end of file diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportQueryParm.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportQueryParm.java new file mode 100644 index 000000000..f508f9cb1 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/UserReportQueryParm.java @@ -0,0 +1,53 @@ +package com.njcn.process.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/11 15:20【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class UserReportQueryParm { + + @NotNull(message="当前页不能为空！") + @Min(value = 1, message = "当前页不能为0") + @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) + private Integer pageNum; + /**显示条数*/ + @NotNull(message="显示条数不能为空！") + @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) + private Integer pageSize; + + @ApiModelProperty(value="单位ID") + private String orgNo; + + @ApiModelProperty(value="开始时间") + private String startTime; + + @ApiModelProperty(value="结束时间") + private String endTime; + + + @ApiModelProperty(value = "申请流程类型") + @NotNull(message="申请流程类型为空！") + private Integer applyType; + + @ApiModelProperty(value = "申请单类型") + @NotNull(message="申请单类型为空！") + private Integer type; + + @ApiModelProperty(value = "申请页面1，审核页面2") + @NotNull(message="页面类型为空！") + private String pageType; + + + +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RFlowProcessPO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RFlowProcessPO.java index e85f66268..bdb3aef58 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RFlowProcessPO.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RFlowProcessPO.java @@ -35,7 +35,7 @@ public class RFlowProcessPO extends BaseEntity { * 申请表单类型 */ @TableField(value = "`type`") - private String type; + private Integer type; /** * 单位ID @@ -54,6 +54,8 @@ public class RFlowProcessPO extends BaseEntity { */ @TableField(value = "file_path") private String filePath; + @TableField(value = "file_name") + private String fileName; /** * 上传时间 diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportPO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportPO.java new file mode 100644 index 000000000..2f9cc4e64 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportPO.java @@ -0,0 +1,118 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.IdType; +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 lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; + +/** + * + * Description: + * Date: 2024/4/25 10:07【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "user_report") +public class UserReportPO extends BaseEntity { + /** + * id + */ + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private String id; + + /** + * 填报人 + */ + @TableField(value = "reporter") + private String reporter; + + /** + * 填报日期 + */ + @TableField(value = "report_date") + private LocalDate reportDate; + + /** + * 填报部门 + */ + @TableField(value = "org_id") + private String orgId; + + /** + * 工程预期投产日期 + */ + @TableField(value = "expected_production_date") + private LocalDate expectedProductionDate; + + /** + * 用户性质 + */ + @TableField(value = "user_type") + private String userType; + + /** + * 所属地市 + */ + @TableField(value = "city") + private String city; + + /** + * 归口管理部门 + */ + @TableField(value = "responsible_department") + private String responsibleDepartment; + + /** + * 用户状态 + */ + @TableField(value = "user_status") + private String userStatus; + + /** + * 变电站 + */ + @TableField(value = "substation") + private String substation; + + /** + * 电压等级 + */ + @TableField(value = "voltage_level") + private String voltageLevel; + + /** + * 工程名称 + */ + @TableField(value = "project_name") + private String projectName; + + /** + * 预测评估单位 + */ + @TableField(value = "evaluation_dept") + private String evaluationDept; + + /** + * 预测评估结论 + */ + @TableField(value = "evaluation_conclusion") + private String evaluationConclusion; + + + + /** + * 状态：0-删除 1-正常 + */ + @TableField(value = "`State`") + private Integer state; +} \ No newline at end of file diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportProjectPO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportProjectPO.java new file mode 100644 index 000000000..4aec5bc14 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportProjectPO.java @@ -0,0 +1,90 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.IdType; +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 lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * Description: + * Date: 2024/4/25 10:08【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "user_report_project") +public class UserReportProjectPO extends BaseEntity { + /** + * 关联id + */ + @TableId(value = "id", type = IdType.INPUT) + private String id; + + /** + * 用户协议容量 + */ + @TableField(value = "agreement_capacity") + private Double agreementCapacity; + + /** + * 非线性设备类型 + */ + @TableField(value = "nonlinear_device_type") + private String nonlinearDeviceType; + + /** + * 是否需要治理 + */ + @TableField(value = "need_governance") + private Integer needGovernance; + + /** + * 是否开展背景测试 + */ + @TableField(value = "background_test_performed") + private Integer backgroundTestPerformed; + + /** + * 可研报告告地址 + */ + @TableField(value = "feasibility_report") + private String feasibilityReport; + + /** + * 项目初步设计说明书告地址 + */ + @TableField(value = "preliminary_design_description") + private String preliminaryDesignDescription; + + /** + * 预测评估报告告地址 + */ + @TableField(value = "prediction_evaluation_report") + private String predictionEvaluationReport; + + /** + * 预测评估评审意见报告地址 + */ + @TableField(value = "prediction_evaluation_review_opinions") + private String predictionEvaluationReviewOpinions; + + /** + * 其他附件告地址 + */ + @TableField(value = "additional_attachments") + private String additionalAttachments; + + /** + * 数据状态 + */ + @TableField(value = "`state`") + private Integer state; +} \ No newline at end of file diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSensitivePO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSensitivePO.java new file mode 100644 index 000000000..102ac08f2 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSensitivePO.java @@ -0,0 +1,152 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.IdType; +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 lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * Description: + * Date: 2024/4/25 10:09【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "user_report_sensitive") +public class UserReportSensitivePO extends BaseEntity { + /** + * 关联id + */ + @TableId(value = "id", type = IdType.INPUT) + private String id; + + /** + * PCC点 + */ + @TableField(value = "pcc_point") + private String pccPoint; + + /** + * 行业 + */ + @TableField(value = "industry") + private String industry; + + /** + * 敏感装置名称 + */ + @TableField(value = "device_name") + private String deviceName; + + /** + * 供电电源数量 + */ + @TableField(value = "power_supply_count") + private Integer powerSupplyCount; + + /** + * 敏感电能质量指标 + */ + @TableField(value = "energy_quality_index") + private String energyQualityIndex; + + /** + * 评估类型 + */ + @TableField(value = "evaluation_type") + private String evaluationType; + + /** + * 是否开展抗扰度测试 + */ + @TableField(value = "anti_interference_test") + private String antiInterferenceTest; + + /** + * 预测评估审核单位 + */ + @TableField(value = "evaluation_chek_dept") + private String evaluationChekDept; + + /** + * 是否需要治理 + */ + @TableField(value = "need_governance") + private Integer needGovernance; + + /** + * 是否开展背景测试 + */ + @TableField(value = "background_test_performed") + private Integer backgroundTestPerformed; + + /** + * 用户接入变电站主接线示意图地址 + */ + @TableField(value = "substation_main_wiring_diagram") + private String substationMainWiringDiagram; + + /** + * 主要敏感设备清单 + */ + @TableField(value = "sensitive_devices") + private String sensitiveDevices; + + /** + * 抗扰度测试报告 + */ + @TableField(value = "anti_interference_report") + private String antiInterferenceReport; + + /** + * 背景电能质量测试报告 + */ + @TableField(value = "power_quality_report") + private String powerQualityReport; + + /** + * 可研报告地址 + */ + @TableField(value = "feasibility_report") + private String feasibilityReport; + + /** + * 项目初步设计说明书地址 + */ + @TableField(value = "preliminary_design_description") + private String preliminaryDesignDescription; + + /** + * 预测评估报告地址 + */ + @TableField(value = "prediction_evaluation_report") + private String predictionEvaluationReport; + + /** + * 预测评估评审意见报告地址 + */ + @TableField(value = "prediction_evaluation_review_opinions") + private String predictionEvaluationReviewOpinions; + + /** + * 其他附件 + */ + @TableField(value = "additional_attachments") + private String additionalAttachments; + + /** + * 数据状态 + */ + @TableField(value = "`state`") + private Integer state; + + +} \ No newline at end of file diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSubstationPO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSubstationPO.java new file mode 100644 index 000000000..57cfff935 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/UserReportSubstationPO.java @@ -0,0 +1,133 @@ +package com.njcn.process.pojo.po; + +import com.baomidou.mybatisplus.annotation.IdType; +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 lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * + * Description: + * Date: 2024/4/25 10:09【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "user_report_substation") +public class UserReportSubstationPO extends BaseEntity { + @TableId(value = "id", type = IdType.INPUT) + private String id; + + /** + * PCC点 + */ + @TableField(value = "pcc_point") + private String pccPoint; + + /** + * 基准短路容量（MVA） + */ + @TableField(value = "base_short_circuit_capacity") + private BigDecimal baseShortCircuitCapacity; + + /** + * 系统最小短路容量（MVA） + */ + @TableField(value = "min_short_circuit_capacity") + private BigDecimal minShortCircuitCapacity; + + /** + * PCC供电设备容量（MVA） + */ + @TableField(value = "pcc_equipment_capacity") + private BigDecimal pccEquipmentCapacity; + + /** + * 用户用电协议容量（MVA） + */ + @TableField(value = "user_agreement_capacity") + private BigDecimal userAgreementCapacity; + + /** + * 评估类型 + */ + @TableField(value = "evaluation_type") + private String evaluationType; + + /** + * 非线性负荷类型 + */ + @TableField(value = "nonlinear_load_type") + private String nonlinearLoadType; + + /** + * 预测评估审核单位 + */ + @TableField(value = "evaluation_chek_dept") + private String evaluationChekDept; + + /** + * 是否需要治理 + */ + @TableField(value = "need_governance") + private Integer needGovernance; + + /** + * 是否开展背景测试 + */ + @TableField(value = "background_test_performed") + private Integer backgroundTestPerformed; + + /** + * 用户接入变电站主接线示意图地址 + */ + @TableField(value = "substation_main_wiring_diagram") + private String substationMainWiringDiagram; + + /** + * 可研报告地址 + */ + @TableField(value = "feasibility_report") + private String feasibilityReport; + + /** + * 项目初步设计说明书地址 + */ + @TableField(value = "preliminary_design_description") + private String preliminaryDesignDescription; + + /** + * 预测评估报告地址 + */ + @TableField(value = "prediction_evaluation_report") + private String predictionEvaluationReport; + + /** + * 预测评估评审意见报告地址 + */ + @TableField(value = "prediction_evaluation_review_opinions") + private String predictionEvaluationReviewOpinions; + + /** + * 其他附件 + */ + @TableField(value = "additional_attachments") + private String additionalAttachments; + + /** + * 数据状态 + */ + @TableField(value = "`state`") + private Integer state; + + +} \ No newline at end of file diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/UserReportVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/UserReportVO.java new file mode 100644 index 000000000..39887f8cd --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/UserReportVO.java @@ -0,0 +1,109 @@ +package com.njcn.process.pojo.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.njcn.process.pojo.po.UserReportProjectPO; +import com.njcn.process.pojo.po.UserReportSensitivePO; +import com.njcn.process.pojo.po.UserReportSubstationPO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDate; + +/** + * + * Description: + * Date: 2024/4/25 10:07【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class UserReportVO { + private String Id; + /** + * 填报人 + */ + @ApiModelProperty(value = "填报人") + private String reporter; + + /** + * 填报日期 + */ + @ApiModelProperty(value = "填报日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private LocalDate reportDate; + + /** + * 填报部门 + */ + @ApiModelProperty(value = "填报部门") + private String orgId; + + /** + * 工程预期投产日期 + */ + @ApiModelProperty(value = "工程预期投产日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private LocalDate expectedProductionDate; + + /** + * 用户性质 + */ + @ApiModelProperty(value = "用户性质") + private String userType; + + /** + * 所属地市 + */ + @ApiModelProperty(value = "所属地市") + private String city; + + /** + * 归口管理部门 + */ + @ApiModelProperty(value = "归口管理部门") + private String responsibleDepartment; + + /** + * 用户状态 + */ + @ApiModelProperty(value = "用户状态") + private String userStatus; + + /** + * 变电站 + */ + @ApiModelProperty(value = "变电站") + private String substation; + + /** + * 电压等级 + */ + @ApiModelProperty(value = "电压等级") + private String voltageLevel; + + /** + * 工程名称 + */ + @ApiModelProperty(value = "工程名称") + private String projectName; + + /** + * 预测评估单位 + */ + @ApiModelProperty(value = "预测评估单位") + private String evaluationDept; + + /** + * 预测评估结论 + */ + @ApiModelProperty(value = "预测评估结论") + private String evaluationConclusion; + + + private UserReportProjectPO userReportProjectPO; + + private UserReportSensitivePO userReportSensitivePO; + + private UserReportSubstationPO userReportSubstationPO; +} \ No newline at end of file diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/applyform/GeneralSurveyFormVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/applyform/GeneralSurveyFormVO.java new file mode 100644 index 000000000..c234f31e8 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/applyform/GeneralSurveyFormVO.java @@ -0,0 +1,15 @@ +package com.njcn.process.pojo.vo.applyform; + +import lombok.Data; + +/** + * Description: + * Date: 2024/4/17 11:17【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class GeneralSurveyFormVO { + +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/applyform/MonitorReturnedFormVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/applyform/MonitorReturnedFormVO.java new file mode 100644 index 000000000..70635d222 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/applyform/MonitorReturnedFormVO.java @@ -0,0 +1,21 @@ +package com.njcn.process.pojo.vo.applyform; + +import lombok.Data; + +/** + * Description: + * Date: 2024/4/17 10:57【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class MonitorReturnedFormVO { + + //设备编号 + private String devNumber; + + //资产编号 + private String assetNumber; + +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/applyform/RFlowProcessVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/applyform/RFlowProcessVO.java new file mode 100644 index 000000000..bad14b8ac --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/applyform/RFlowProcessVO.java @@ -0,0 +1,87 @@ +package com.njcn.process.pojo.vo.applyform; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.njcn.db.bo.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDate; + +/** + * Description: + * Date: 2024/4/17 18:08【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class RFlowProcessVO extends BaseEntity { + + @ApiModelProperty("id") + private String Id; + + @ApiModelProperty(value = "申请流程类型") + private Integer applyType; + + @ApiModelProperty(value = "申请单类型") + private Integer type; + /** + * 单位ID + */ + @ApiModelProperty(value = "单位ID") + private String orgNo; + + @ApiModelProperty(value = "单位名称") + private String orgName; + + /** + * 申请单详情 + */ + @ApiModelProperty(value = "申请单详情") + private String applicationFormText; + + @ApiModelProperty(value = "申请单详情") + private Object applyForm; + + /** + * 文件路径 + */ + @ApiModelProperty(value = "文件路径") + private String filePath; + + @ApiModelProperty(value = "文件路径") + private String fileName; + + + /** + * 上传时间 + */ + @ApiModelProperty(value = "上传时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate uploadTime; + + + /** + * 审核人 + */ + @ApiModelProperty(value = "审核人") + private String checker; + + /** + * 审核人名称 + */ + @ApiModelProperty(value = "审核人名称") + private String checkerName; + + + /** + * 流程状态（1-新建，2-待审核，3-驳回，4-归档） + */ + @ApiModelProperty(value = "流程状态") + private Integer processStatus; + + + + + +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/applyform/RMpPartHarmonicDetailFormVO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/applyform/RMpPartHarmonicDetailFormVO.java new file mode 100644 index 000000000..cdd2c2ce7 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/applyform/RMpPartHarmonicDetailFormVO.java @@ -0,0 +1,52 @@ +package com.njcn.process.pojo.vo.applyform; + +import io.swagger.annotations.ApiModelProperty; + +import java.time.LocalDate; +import java.util.List; + +/** + * Description: + * Date: 2024/4/17 11:40【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public class RMpPartHarmonicDetailFormVO { + /** + * 监测点ID + */ + private String measurementPointId; + + private String measurementPointName; + + + //告警指标 + private String harmonicType; + + //母线id + private String barId; + + private String barName; + + + //电站id + private String sustationId; + + private String sustationName; + + @ApiModelProperty(name = "objName",value = "监测点对象名称") + private String objName; + @ApiModelProperty(name = "loadType",value = "监测对象类型") + private String loadType; + @ApiModelProperty(name = "voltageLevel",value = "电压等级") + private String voltageLevel; + + //超标天数 + private Double overLimitrate; + + + /*当月超标日期 + * */ + private List dateList; +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RFlowProcessController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RFlowProcessController.java index 2c946c0ba..d17e21496 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RFlowProcessController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RFlowProcessController.java @@ -1,5 +1,7 @@ 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; @@ -10,6 +12,8 @@ import com.njcn.minioss.bo.MinIoUploadResDTO; import com.njcn.oss.constant.OssPath; import com.njcn.oss.utils.FileStorageUtil; import com.njcn.process.pojo.param.RFlowProcessParm; +import com.njcn.process.pojo.param.RFlowProcessQueryParm; +import com.njcn.process.pojo.vo.applyform.RFlowProcessVO; import com.njcn.process.service.RFlowProcessPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -56,6 +60,14 @@ public class RFlowProcessController extends BaseController { Boolean addFlag = rFlowProcessPOService.add(rFlowProcessParm); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, addFlag, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/createCheckflow") + @ApiOperation("提交申请单审核") + public HttpResult createCheckflow(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("createCheckflow"); + Boolean addFlag = rFlowProcessPOService.createCheckflow(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, addFlag, methodDescribe); + } @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/update") @@ -89,12 +101,32 @@ public class RFlowProcessController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD) @PostMapping("/uploadFile") @ApiOperation("上传文件") - @ApiImplicitParam(name = "file", value = "文件", required = true) - public HttpResult uploadFile(@RequestParam("file") MultipartFile file){ + public HttpResult uploadFile( MultipartFile file){ String methodDescribe = getMethodDescribe("uploadFile"); - String filePath = fileStorageUtil.getFileUrl( fileStorageUtil.uploadMultipart(file, OssPath.ELECTRICITY_QUALITY)); + String filePath = fileStorageUtil.uploadMultipart(file, OssPath.ELECTRICITY_QUALITY); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,new MinIoUploadResDTO(file.getOriginalFilename(),filePath), methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD) + @PostMapping("/getFileUrl") + @ApiOperation("根据文件地址获取文件服务器地址") + public HttpResult getFileUrl( String filePath){ + String methodDescribe = getMethodDescribe("getFileUrl"); + String url = fileStorageUtil.getFileUrl(filePath); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,url, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getFlowProcess") + @ApiOperation("查询申请单") + @ApiImplicitParam(name = "rFlowProcessQueryParm", value = "参数", required = true) + public HttpResult> getFlowProcess(@RequestBody @Validated RFlowProcessQueryParm rFlowProcessQueryParm){ + String methodDescribe = getMethodDescribe("getFlowProcess"); + Page out = rFlowProcessPOService.getFlowProcess(rFlowProcessQueryParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); + } + + + } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/userreport/UserReportManageController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/userreport/UserReportManageController.java new file mode 100644 index 000000000..2d71827f7 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/userreport/UserReportManageController.java @@ -0,0 +1,87 @@ +package com.njcn.process.controller.userreport; + +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.process.pojo.param.UserReportParam; +import com.njcn.process.pojo.param.UserReportQueryParm; +import com.njcn.process.pojo.vo.UserReportVO; +import com.njcn.process.service.UserReportPOService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 干扰源用户管理 + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/11/11 - 9:20 + */ +@Slf4j +@RestController +@RequestMapping("/userReport") +@Api(tags = "干扰源用户管理(新)") +@AllArgsConstructor +public class UserReportManageController extends BaseController { + + private final UserReportPOService userReportPOService; + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) + @PostMapping("/addUserReport") + @ApiOperation("新增干扰源用户（未建档干扰源用户管理）") + @ApiImplicitParam(name = "userReportParam", value = "实体参数", required = true) + public HttpResult addUserReport(@RequestBody @Validated UserReportParam userReportParam){ + String methodDescribe = getMethodDescribe("addUserReport"); + boolean res = userReportPOService.addUserReport(userReportParam); + + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe); + + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD) + @PostMapping("/auditUserReport") + @ApiOperation("修改干扰源用户（未建档干扰源用户管理）") + @ApiImplicitParam(name = "userReportUpdate", value = "实体参数", required = true) + public HttpResult auditUserReport(@RequestBody @Validated UserReportParam.UserReportUpdate userReportUpdate){ + String methodDescribe = getMethodDescribe("auditUserReport"); + boolean res = userReportPOService.auditUserReport(userReportUpdate); + + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe); + + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getUserReport") + @ApiOperation("查询干扰源用户") + @ApiImplicitParam(name = "userReportQueryParm", value = "参数", required = true) + public HttpResult> getUserReport(@RequestBody @Validated UserReportQueryParm userReportQueryParm){ + String methodDescribe = getMethodDescribe("getUserReport"); + Page out = userReportPOService.getUserReport(userReportQueryParm); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/removeUserReport") + @ApiOperation("查询干扰源用户") + @ApiImplicitParam(name = "userReportQueryParm", value = "参数", required = true) + public HttpResult removeUserReport(@RequestParam("ids") List ids){ + String methodDescribe = getMethodDescribe("removeUserReport"); + Boolean flag = userReportPOService.removeUserReport(ids); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); + } + +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportPOMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportPOMapper.java new file mode 100644 index 000000000..d1ef85579 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportPOMapper.java @@ -0,0 +1,15 @@ +package com.njcn.process.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.process.pojo.po.UserReportPO; + +/** + * + * Description: + * Date: 2024/4/25 10:07【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface UserReportPOMapper extends BaseMapper { +} \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportProjectPOMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportProjectPOMapper.java new file mode 100644 index 000000000..732d8121d --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportProjectPOMapper.java @@ -0,0 +1,15 @@ +package com.njcn.process.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.process.pojo.po.UserReportProjectPO; + +/** + * + * Description: + * Date: 2024/4/25 10:08【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface UserReportProjectPOMapper extends BaseMapper { +} \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSensitivePOMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSensitivePOMapper.java new file mode 100644 index 000000000..c84d105ed --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSensitivePOMapper.java @@ -0,0 +1,15 @@ +package com.njcn.process.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.process.pojo.po.UserReportSensitivePO; + +/** + * + * Description: + * Date: 2024/4/25 10:09【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface UserReportSensitivePOMapper extends BaseMapper { +} \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSubstationPOMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSubstationPOMapper.java new file mode 100644 index 000000000..8d277ef23 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/UserReportSubstationPOMapper.java @@ -0,0 +1,15 @@ +package com.njcn.process.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.process.pojo.po.UserReportSubstationPO; + +/** + * + * Description: + * Date: 2024/4/25 10:09【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface UserReportSubstationPOMapper extends BaseMapper { +} \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportPOMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportPOMapper.xml new file mode 100644 index 000000000..b194762b9 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportPOMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, reporter, report_date, org_id, expected_production_date, user_type, city, responsible_department, + user_status, substation, voltage_level, project_name, evaluation_dept, evaluation_conclusion, + Create_By, Create_Time, Update_By, Update_Time, `State` + + \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportProjectPOMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportProjectPOMapper.xml new file mode 100644 index 000000000..87c4a0096 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportProjectPOMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + id, agreement_capacity, nonlinear_device_type, need_governance, background_test_performed, + feasibility_report, preliminary_design_description, prediction_evaluation_report, + prediction_evaluation_review_opinions, additional_attachments, Create_By, Create_Time, + Update_By, Update_Time + + \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSensitivePOMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSensitivePOMapper.xml new file mode 100644 index 000000000..48278e1f4 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSensitivePOMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, pcc_point, industry, device_name, power_supply_count, energy_quality_index, evaluation_type, + anti_interference_test, evaluation_chek_dept, need_governance, background_test_performed, + 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 + + \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSubstationPOMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSubstationPOMapper.xml new file mode 100644 index 000000000..048732b57 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/UserReportSubstationPOMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, pcc_point, base_short_circuit_capacity, min_short_circuit_capacity, pcc_equipment_capacity, + user_agreement_capacity, evaluation_type, nonlinear_load_type, evaluation_chek_dept, + need_governance, background_test_performed, substation_main_wiring_diagram, feasibility_report, + preliminary_design_description, prediction_evaluation_report, prediction_evaluation_review_opinions, + additional_attachments, `state`, Create_By, Create_Time, Update_By, Update_Time + + \ No newline at end of file diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/RFlowProcessPOService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/RFlowProcessPOService.java index 338cef281..9462f6770 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/RFlowProcessPOService.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/RFlowProcessPOService.java @@ -1,9 +1,13 @@ package com.njcn.process.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.process.pojo.param.RFlowProcessParm; +import com.njcn.process.pojo.param.RFlowProcessQueryParm; import com.njcn.process.pojo.po.RFlowProcessPO; import com.baomidou.mybatisplus.extension.service.IService; - /** +import com.njcn.process.pojo.vo.applyform.RFlowProcessVO; + +/** * * Description: * Date: 2024/4/15 16:24【需求编号】 @@ -21,4 +25,8 @@ public interface RFlowProcessPOService extends IService{ Boolean check(RFlowProcessParm.RFlowProcessCheck rFlowProcessCheck); Boolean file(String id); - } + + Page getFlowProcess(RFlowProcessQueryParm rFlowProcessQueryParm); + + Boolean createCheckflow(String id); +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportPOService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportPOService.java new file mode 100644 index 000000000..9e4e757da --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportPOService.java @@ -0,0 +1,30 @@ +package com.njcn.process.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.process.pojo.param.UserReportParam; +import com.njcn.process.pojo.param.UserReportQueryParm; +import com.njcn.process.pojo.po.UserReportPO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.process.pojo.vo.UserReportVO; + +import java.util.List; + +/** + * + * Description: + * Date: 2024/4/25 10:07【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface UserReportPOService extends IService{ + + + boolean addUserReport(UserReportParam userReportParam); + + boolean auditUserReport(UserReportParam.UserReportUpdate userReportUpdate); + + Page getUserReport(UserReportQueryParm userReportQueryParm); + + Boolean removeUserReport(List ids); +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportProjectPOService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportProjectPOService.java new file mode 100644 index 000000000..138c69976 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportProjectPOService.java @@ -0,0 +1,16 @@ +package com.njcn.process.service; + +import com.njcn.process.pojo.po.UserReportProjectPO; +import com.baomidou.mybatisplus.extension.service.IService; + /** + * + * Description: + * Date: 2024/4/25 10:08【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface UserReportProjectPOService extends IService{ + + +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSensitivePOService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSensitivePOService.java new file mode 100644 index 000000000..9cef0f3fc --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSensitivePOService.java @@ -0,0 +1,16 @@ +package com.njcn.process.service; + +import com.njcn.process.pojo.po.UserReportSensitivePO; +import com.baomidou.mybatisplus.extension.service.IService; + /** + * + * Description: + * Date: 2024/4/25 10:09【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface UserReportSensitivePOService extends IService{ + + +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSubstationPOService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSubstationPOService.java new file mode 100644 index 000000000..4e1a58293 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/UserReportSubstationPOService.java @@ -0,0 +1,16 @@ +package com.njcn.process.service; + +import com.njcn.process.pojo.po.UserReportSubstationPO; +import com.baomidou.mybatisplus.extension.service.IService; + /** + * + * Description: + * Date: 2024/4/25 10:09【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface UserReportSubstationPOService extends IService{ + + +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RFlowProcessPOServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RFlowProcessPOServiceImpl.java index 72da946df..767f974c2 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RFlowProcessPOServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RFlowProcessPOServiceImpl.java @@ -1,18 +1,23 @@ package com.njcn.process.service.impl; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.process.enums.ProcessResponseEnum; -import com.njcn.process.enums.ThsFlowTypeEnum; import com.njcn.process.mapper.FlowFormAssMapper; import com.njcn.process.mapper.FlowableAssMapper; import com.njcn.process.mapper.RFlowProcessPOMapper; import com.njcn.process.pojo.param.RFlowProcessParm; +import com.njcn.process.pojo.param.RFlowProcessQueryParm; import com.njcn.process.pojo.po.FlowFormAss; import com.njcn.process.pojo.po.FlowableAss; import com.njcn.process.pojo.po.RFlowProcessPO; +import com.njcn.process.pojo.vo.applyform.RFlowProcessVO; import com.njcn.process.pojo.vo.flowable.FlowTaskVo; import com.njcn.process.service.RFlowProcessPOService; import com.njcn.process.service.flowable.IFlowDefinitionService; @@ -20,16 +25,22 @@ import com.njcn.process.service.flowable.IFlowInstanceService; import com.njcn.process.service.flowable.IFlowTaskService; import com.njcn.process.utils.FlowableUtils; import com.njcn.system.api.DicDataFeignClient; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.vo.PvTerminalTreeVO; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; import org.flowable.task.api.Task; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; /** * @@ -48,6 +59,7 @@ public class RFlowProcessPOServiceImpl extends ServiceImpl().eq(FlowableAss::getType, ThsFlowTypeEnum.monitoringReturned.getCode()).eq(FlowableAss::getThsIndex,rFlowProcessCheck.getId())); + FlowableAss flowableAss = flowableAssMapper.selectOne(new LambdaQueryWrapper().eq(FlowableAss::getThsIndex,rFlowProcessCheck.getId())); if(Objects.isNull(flowableAss)){ throw new BusinessException("当前功能未绑定流程,请联系管理员处理"); } @@ -119,7 +131,7 @@ public class RFlowProcessPOServiceImpl extends ServiceImpl().eq(FlowableAss::getType, ThsFlowTypeEnum.monitoringReturned.getCode()).eq(FlowableAss::getThsIndex,id)); + FlowableAss flowableAss = flowableAssMapper.selectOne(new LambdaQueryWrapper().eq(FlowableAss::getThsIndex,id)); if(Objects.isNull(flowableAss)){ throw new BusinessException("当前功能未绑定流程,请联系管理员处理"); } @@ -134,6 +146,45 @@ public class RFlowProcessPOServiceImpl extends ServiceImpl getFlowProcess(RFlowProcessQueryParm rFlowProcessQueryParm) { + Page page = new Page<> (rFlowProcessQueryParm.getPageNum(), rFlowProcessQueryParm.getPageSize()); + IPage tempPage = new Page<> (rFlowProcessQueryParm.getPageNum(), rFlowProcessQueryParm.getPageSize()); + + String loginUsrId = RequestUtil.getUserIndex(); + //部门处理：根据部门code取名称 + List dept = deptFeignClient.allDeptList().getData(); + Map pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, PvTerminalTreeVO::getName)); + QueryWrapper queryWrapper = new QueryWrapper<> (); + /*type=1：新建页面：查看自己负责的计划；type=2：审核页面：审核者==当前用户；结果页面：查看自己负责的计划*/ + if (Objects.equals(rFlowProcessQueryParm.getPageType(),"1") ) { + queryWrapper.lambda().eq(RFlowProcessPO::getCreateBy, loginUsrId); + queryWrapper.lambda().in(RFlowProcessPO::getProcessStatus, Stream.of(1,3,4,5).collect(Collectors.toList())); + } + if (Objects.equals(rFlowProcessQueryParm.getPageType(),"2")) { + queryWrapper.lambda().eq(RFlowProcessPO::getChecker, loginUsrId); + queryWrapper.lambda().in(RFlowProcessPO::getProcessStatus, Stream.of(2).collect(Collectors.toList())); + } + queryWrapper.lambda().eq(RFlowProcessPO::getApplyType,rFlowProcessQueryParm.getApplyType()) + .between(StringUtils.isNotBlank(rFlowProcessQueryParm.getStartTime()) && + StringUtils.isNotBlank(rFlowProcessQueryParm.getEndTime()) , + RFlowProcessPO::getCreateTime,rFlowProcessQueryParm.getStartTime()+" 00:00:00",rFlowProcessQueryParm.getEndTime()+" 23:59:59"); + + IPage rGeneralSurveyPlanDetailIPage = this.getBaseMapper().selectPage (tempPage, queryWrapper); + List collect = rGeneralSurveyPlanDetailIPage.getRecords().stream().map(temp->{ + RFlowProcessVO rFlowProcessVO = new RFlowProcessVO(); + BeanUtils.copyProperties(temp,rFlowProcessVO); + + Object bean = JSONUtil.toBean(temp.getApplicationFormText(), Object.class); + rFlowProcessVO.setApplyForm(bean); + rFlowProcessVO.setOrgName(pvTerminalTreeVOMap.get(temp.getOrgNo())); //单位名称 + return rFlowProcessVO; + }).collect(Collectors.toList()); + page.setRecords(collect); + page.setTotal(page.getTotal()); + return page; + } + //新建流程 public Boolean createflow(String businessId ,Integer applyType,Integer type ) { String userId = RequestUtil.getUserIndex(); @@ -149,7 +200,7 @@ public class RFlowProcessPOServiceImpl extends ServiceImpl().eq(FlowableAss::getType, ThsFlowTypeEnum.monitoringReturned.getCode()).eq(FlowableAss::getThsIndex,businessId)); + //流程审核 + FlowableAss flowableAss = flowableAssMapper.selectOne(new LambdaQueryWrapper().eq(FlowableAss::getThsIndex,businessId)); if(Objects.isNull(flowableAss)){ throw new BusinessException("当前功能未绑定流程,请联系管理员处理"); } @@ -178,7 +230,8 @@ public class RFlowProcessPOServiceImpl extends ServiceImpl implements UserReportPOService{ + + private final UserReportProjectPOService userReportProjectPOService; + private final UserReportSubstationPOService userReportSubstationPOService; + private final UserReportSensitivePOService userReportSensitivePOService; + private final DeptFeignClient deptFeignClient; + + + @Override + public boolean addUserReport(UserReportParam userReportParam) { + UserReportPO userReportPO = new UserReportPO(); + BeanUtils.copyProperties(userReportParam,userReportPO); + userReportPO.setState(1); + boolean save = this.save(userReportPO); + String id = userReportPO.getId(); + if(Objects.equals(userReportPO.getUserType(),"1")|| + Objects.equals(userReportPO.getUserType(),"2")){ + UserReportProjectPO userReportProjectPO = userReportParam.getUserReportProjectPO(); + userReportProjectPO.setId(id); + userReportProjectPO.setState(1); + userReportProjectPOService.saveOrUpdate(userReportProjectPO); + }else if(Objects.equals(userReportPO.getUserType(),"3")|| + Objects.equals(userReportPO.getUserType(),"4")){ + UserReportSubstationPO userReportSubstationPO = userReportParam.getUserReportSubstationPO(); + userReportSubstationPO.setId(id); + userReportSubstationPO.setState(1); + userReportSubstationPOService.saveOrUpdate(userReportSubstationPO); + }else if(Objects.equals(userReportPO.getUserType(),"5")){ + UserReportSensitivePO userReportSensitivePO = userReportParam.getUserReportSensitivePO(); + userReportSensitivePO.setId(id); + userReportSensitivePO.setState(1); + userReportSensitivePOService.saveOrUpdate(userReportSensitivePO); + } + + return save; + } + + @Override + public boolean auditUserReport(UserReportParam.UserReportUpdate userReportUpdate) { + String id = userReportUpdate.getId(); + UserReportPO byId = this.getById(id); + BeanUtils.copyProperties(userReportUpdate,byId); + this.updateById(byId); + if(Objects.equals(userReportUpdate.getUserType(),"1")|| + Objects.equals(userReportUpdate.getUserType(),"2")){ + UserReportProjectPO userReportProjectPO = userReportProjectPOService.getById(id); + BeanUtils.copyProperties(userReportUpdate.getUserReportProjectPO(),userReportProjectPO,getNullPropertyNames(userReportUpdate.getUserReportProjectPO())); + userReportProjectPOService.updateById(userReportProjectPO); + }else if(Objects.equals(userReportUpdate.getUserType(),"3")|| + Objects.equals(userReportUpdate.getUserType(),"4")){ + UserReportSubstationPO userReportSubstationPO = userReportSubstationPOService.getById(id); + BeanUtils.copyProperties(userReportUpdate.getUserReportSubstationPO(),userReportSubstationPO,getNullPropertyNames(userReportUpdate.getUserReportSubstationPO())); + userReportSubstationPOService.updateById(userReportSubstationPO); + }else if(Objects.equals(userReportUpdate.getUserType(),"5")){ + UserReportSensitivePO userReportSensitivePO = userReportSensitivePOService.getById(id); + BeanUtils.copyProperties(userReportUpdate.getUserReportSensitivePO(),userReportSensitivePO,getNullPropertyNames(userReportUpdate.getUserReportSensitivePO())); + userReportSensitivePOService.updateById(userReportSensitivePO); + } + + return false; + } + + @Override + public Page getUserReport(UserReportQueryParm userReportQueryParm) { + Page page = new Page<> (userReportQueryParm.getPageNum(), userReportQueryParm.getPageSize()); + IPage tempPage = new Page<> (userReportQueryParm.getPageNum(), userReportQueryParm.getPageSize()); + + String loginUsrId = RequestUtil.getUserIndex(); + //部门处理：根据部门code取名称 + List dept = deptFeignClient.allDeptList().getData(); + Map pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, PvTerminalTreeVO::getName)); + QueryWrapper queryWrapper = new QueryWrapper<> (); + /*type=1：新建页面：查看自己负责的计划；type=2：审核页面：审核者==当前用户；结果页面：查看自己负责的计划*/ +// if (Objects.equals(userReportQueryParm.getPageType(),"1") ) { +// queryWrapper.lambda().eq(UserReportPO::getCreateBy, loginUsrId); +// queryWrapper.lambda().in(UserReportPO::getProcessStatus, Stream.of(1,3,4,5).collect(Collectors.toList())); +// } +// if (Objects.equals(userReportQueryParm.getPageType(),"2")) { +// queryWrapper.lambda().eq(RFlowProcessPO::getChecker, loginUsrId); +// queryWrapper.lambda().in(RFlowProcessPO::getProcessStatus, Stream.of(2).collect(Collectors.toList())); +// } + queryWrapper.lambda().eq(UserReportPO::getUserType,userReportQueryParm.getType()) + .eq(UserReportPO::getState,1) + .between(StringUtils.isNotBlank(userReportQueryParm.getStartTime()) && + StringUtils.isNotBlank(userReportQueryParm.getEndTime()) , + UserReportPO::getCreateTime,userReportQueryParm.getStartTime()+" 00:00:00",userReportQueryParm.getEndTime()+" 23:59:59"); + + IPage tempPageList = this.getBaseMapper().selectPage (tempPage, queryWrapper); + List collect = tempPageList.getRecords().stream().map(temp->{ + UserReportVO userReportVO = new UserReportVO(); + BeanUtils.copyProperties(temp,userReportVO); + if(Objects.equals(userReportVO.getUserType(),"1")|| + Objects.equals(userReportVO.getUserType(),"2")){ + UserReportProjectPO userReportProjectPO = userReportProjectPOService.getById(temp.getId()); + userReportVO.setUserReportProjectPO(userReportProjectPO); + }else if(Objects.equals(userReportVO.getUserType(),"3")|| + Objects.equals(userReportVO.getUserType(),"4")){ + UserReportSubstationPO userReportSubstationPO = userReportSubstationPOService.getById(temp.getId()); + + userReportVO.setUserReportSubstationPO(userReportSubstationPO); + }else if(Objects.equals(userReportVO.getUserType(),"5")){ + UserReportSensitivePO userReportSensitivePO = userReportSensitivePOService.getById(temp.getId()); + userReportVO.setUserReportSensitivePO(userReportSensitivePO); + } + + return userReportVO; + }).collect(Collectors.toList()); + page.setRecords(collect); + page.setTotal(page.getTotal()); + return page; + } + + @Override + public Boolean removeUserReport(List ids) { + this.lambdaUpdate().set(UserReportPO::getState,0).in(UserReportPO::getId,ids).update(); + userReportProjectPOService.lambdaUpdate().set(UserReportProjectPO::getState,0).in(UserReportProjectPO::getId,ids).update(); + userReportSubstationPOService.lambdaUpdate().set(UserReportSubstationPO::getState,0).in(UserReportSubstationPO::getId,ids).update(); + userReportSensitivePOService.lambdaUpdate().set(UserReportSensitivePO::getState,0).in(UserReportSensitivePO::getId,ids).update(); + + return true; + } + + + /** + * 获取所有字段为null的属性名 + * @param source + * @return + */ + public String[] getNullPropertyNames (Object source) { + final BeanWrapper src = new BeanWrapperImpl(source); + java.beans.PropertyDescriptor[] pds = src.getPropertyDescriptors ( ); + + Set emptyNames = new HashSet ( ); + for (java.beans.PropertyDescriptor pd : pds) { + Object srcValue = src.getPropertyValue (pd.getName ( )); + if (srcValue == null){ + emptyNames.add (pd.getName ( )); + } + } + String[] result = new String[emptyNames.size ( )]; + return emptyNames.toArray (result); + + } + +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportProjectPOServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportProjectPOServiceImpl.java new file mode 100644 index 000000000..95ef36ae7 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportProjectPOServiceImpl.java @@ -0,0 +1,21 @@ +package com.njcn.process.service.impl; + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.process.mapper.UserReportProjectPOMapper; +import com.njcn.process.pojo.po.UserReportProjectPO; +import com.njcn.process.service.UserReportProjectPOService; +/** + * + * Description: + * Date: 2024/4/25 10:08【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class UserReportProjectPOServiceImpl extends ServiceImpl implements UserReportProjectPOService{ + +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSensitivePOServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSensitivePOServiceImpl.java new file mode 100644 index 000000000..4d8b00cd1 --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSensitivePOServiceImpl.java @@ -0,0 +1,21 @@ +package com.njcn.process.service.impl; + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.process.pojo.po.UserReportSensitivePO; +import com.njcn.process.mapper.UserReportSensitivePOMapper; +import com.njcn.process.service.UserReportSensitivePOService; +/** + * + * Description: + * Date: 2024/4/25 10:09【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class UserReportSensitivePOServiceImpl extends ServiceImpl implements UserReportSensitivePOService{ + +} diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSubstationPOServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSubstationPOServiceImpl.java new file mode 100644 index 000000000..fc8c1e1ce --- /dev/null +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/UserReportSubstationPOServiceImpl.java @@ -0,0 +1,21 @@ +package com.njcn.process.service.impl; + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.process.mapper.UserReportSubstationPOMapper; +import com.njcn.process.pojo.po.UserReportSubstationPO; +import com.njcn.process.service.UserReportSubstationPOService; +/** + * + * Description: + * Date: 2024/4/25 10:09【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class UserReportSubstationPOServiceImpl extends ServiceImpl implements UserReportSubstationPOService{ + +} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java index 6ef6597a1..c98c0e900 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java @@ -582,6 +582,16 @@ public enum DicDataEnum { PQ_ELE_RAILWAYS("电气化铁路","Ele_Railways"), PQ_POWER_STATION("光伏电站","Power_Station"), PQ_WIND_FARMS("风电场","Electrolytic_Load"), + + //所属地市local_municipality + //张家口市、廊坊市、唐山市、承德市、秦皇岛市、风光储、超高压 + ZHANGJIAKOU("张家口市","zhangjiakou"), + LANGFANG("廊坊市","langfang"), + TANGSHAN("唐山市","tangshan"), + CHENGDE("承德市","chengde"), + QINGHUANGDAO("秦皇岛市","qinghuangdao"), + FENGFENGRESERVE("风光储","fengfengreserve"), + EXTRA_HIGH_PRESSURE("超高压","extra_high_pressure"), ; private final String name; diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java index 508b7ed99..f5563eab8 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java @@ -131,6 +131,7 @@ public enum DicDataTypeEnum { CARRY_CAPCITY_CONNECTION_MODE("变压器连接方式","carry_capcity_connection_mode"), CARRY_CAPCITYUSER_MODE("用户模式","carry_capcity_user_mode"), + LOCAL_MUNICIPALITY("所属地市","local_municipality"), ; diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java index c550fccef..3549790f6 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java @@ -29,7 +29,38 @@ public enum DicTreeEnum { Lifting_Load("起重负荷（含电铲、升降机、门吊等吊装设备）","2308"), Electrolytic_Load("电解负荷","2309"), + //冀北主要非线性设备类型 + Nonlinear_Load_User("非线性负荷用户","nonlinear_load_user"), + New_Energy_Power("新能源发电","new_energy_power"), + Converter_Station("换流站","converter_station"), + //非线性负荷用户 + Electrified_Railway_JB("电气化铁路","Electrified_Railway_JB"), + + + Urban_Rail_Transit_JB("城市轨道交通","Urban_Rail_Transit_JB"), + Subways_Light_Rail_JB("有轨及无轨电车、地铁、轻轨","Urban_Rail_Transit_JB"), + + Charging_Stations_For_Electric_JB("电动汽车充电站","Charging_Stations_For_Electric_JB"), + + Electric_Heating_Load_JB("电加热负荷","Electric_Heating_Load_JB"), + + Ac_Arc_Furnace_JB("交流电弧炉","Ac_Arc_Furnace_JB"), + Furnace_JB("直流电弧炉、精炼炉","Furnace_JB"), + Electric_Heater_JB("电热炉","Electric_Heater_JB"), + Frequency_Furnace_JB("中频炉","Frequency_Furnace_JB"), + Production_Equipment("单(多)晶硅(锗)生产设备","Production_Equipment"), + + Rolling_Mill_JB("轧机","Rolling_Mill_JB"), + + Electrolytic_Load_JB("电解负荷","Electrolytic_Load_JB"), + Welding_Load_JB("电焊负荷","Welding_Load_JB"), + Lifting_Load_JB("起重负荷","Lifting_Load_JB"), + Variable_Frequency_Speed_Control_Load_JB("变频调速负荷","Variable_Frequency_Speed_Control_Load_JB"), + other_JB("其他","nonlinear_load_user"), + Wind_Farms_JB("风电场","Wind_Farms_JB"), + Power_Station_JB("光伏电站","Power_Station_JB"), + Converter_JB("换流站","Converter_JB"), ;