表单提交
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
* 上传时间
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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 {
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -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<LocalDate> dateList;
|
||||
}
|
||||
@@ -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<Boolean> 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<MinIoUploadResDTO> uploadFile(@RequestParam("file") MultipartFile file){
|
||||
public HttpResult<MinIoUploadResDTO> 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<String> 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<IPage<RFlowProcessVO>> getFlowProcess(@RequestBody @Validated RFlowProcessQueryParm rFlowProcessQueryParm){
|
||||
String methodDescribe = getMethodDescribe("getFlowProcess");
|
||||
Page<RFlowProcessVO> out = rFlowProcessPOService.getFlowProcess(rFlowProcessQueryParm);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -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<Boolean> 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<Boolean> 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<IPage<UserReportVO>> getUserReport(@RequestBody @Validated UserReportQueryParm userReportQueryParm){
|
||||
String methodDescribe = getMethodDescribe("getUserReport");
|
||||
Page<UserReportVO> 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<Boolean> removeUserReport(@RequestParam("ids") List<String> ids){
|
||||
String methodDescribe = getMethodDescribe("removeUserReport");
|
||||
Boolean flag = userReportPOService.removeUserReport(ids);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<UserReportPO> {
|
||||
}
|
||||
@@ -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<UserReportProjectPO> {
|
||||
}
|
||||
@@ -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<UserReportSensitivePO> {
|
||||
}
|
||||
@@ -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<UserReportSubstationPO> {
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.njcn.process.mapper.UserReportPOMapper">
|
||||
<resultMap id="BaseResultMap" type="com.njcn.process.pojo.po.UserReportPO">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table user_report-->
|
||||
<id column="id" jdbcType="VARCHAR" property="id" />
|
||||
<result column="reporter" jdbcType="VARCHAR" property="reporter" />
|
||||
<result column="report_date" jdbcType="DATE" property="reportDate" />
|
||||
<result column="org_id" jdbcType="VARCHAR" property="orgId" />
|
||||
<result column="expected_production_date" jdbcType="DATE" property="expectedProductionDate" />
|
||||
<result column="user_type" jdbcType="VARCHAR" property="userType" />
|
||||
<result column="city" jdbcType="VARCHAR" property="city" />
|
||||
<result column="responsible_department" jdbcType="VARCHAR" property="responsibleDepartment" />
|
||||
<result column="user_status" jdbcType="VARCHAR" property="userStatus" />
|
||||
<result column="substation" jdbcType="VARCHAR" property="substation" />
|
||||
<result column="voltage_level" jdbcType="VARCHAR" property="voltageLevel" />
|
||||
<result column="project_name" jdbcType="VARCHAR" property="projectName" />
|
||||
<result column="evaluation_dept" jdbcType="VARCHAR" property="evaluationDept" />
|
||||
<result column="evaluation_conclusion" jdbcType="VARCHAR" property="evaluationConclusion" />
|
||||
<result column="Create_By" jdbcType="CHAR" property="createBy" />
|
||||
<result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="Update_By" jdbcType="CHAR" property="updateBy" />
|
||||
<result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
<result column="State" jdbcType="BIT" property="state" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
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`
|
||||
</sql>
|
||||
</mapper>
|
||||
@@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.njcn.process.mapper.UserReportProjectPOMapper">
|
||||
<resultMap id="BaseResultMap" type="com.njcn.process.pojo.po.UserReportProjectPO">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table user_report_project-->
|
||||
<id column="id" jdbcType="VARCHAR" property="id" />
|
||||
<result column="agreement_capacity" jdbcType="DOUBLE" property="agreementCapacity" />
|
||||
<result column="nonlinear_device_type" jdbcType="VARCHAR" property="nonlinearDeviceType" />
|
||||
<result column="need_governance" jdbcType="BIT" property="needGovernance" />
|
||||
<result column="background_test_performed" jdbcType="BIT" property="backgroundTestPerformed" />
|
||||
<result column="feasibility_report" jdbcType="VARCHAR" property="feasibilityReport" />
|
||||
<result column="preliminary_design_description" jdbcType="VARCHAR" property="preliminaryDesignDescription" />
|
||||
<result column="prediction_evaluation_report" jdbcType="VARCHAR" property="predictionEvaluationReport" />
|
||||
<result column="prediction_evaluation_review_opinions" jdbcType="VARCHAR" property="predictionEvaluationReviewOpinions" />
|
||||
<result column="additional_attachments" jdbcType="VARCHAR" property="additionalAttachments" />
|
||||
<result column="Create_By" jdbcType="CHAR" property="createBy" />
|
||||
<result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="Update_By" jdbcType="CHAR" property="updateBy" />
|
||||
<result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
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
|
||||
</sql>
|
||||
</mapper>
|
||||
@@ -0,0 +1,42 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.njcn.process.mapper.UserReportSensitivePOMapper">
|
||||
<resultMap id="BaseResultMap" type="com.njcn.process.pojo.po.UserReportSensitivePO">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table user_report_sensitive-->
|
||||
<id column="id" jdbcType="VARCHAR" property="id" />
|
||||
<result column="pcc_point" jdbcType="VARCHAR" property="pccPoint" />
|
||||
<result column="industry" jdbcType="VARCHAR" property="industry" />
|
||||
<result column="device_name" jdbcType="VARCHAR" property="deviceName" />
|
||||
<result column="power_supply_count" jdbcType="INTEGER" property="powerSupplyCount" />
|
||||
<result column="energy_quality_index" jdbcType="VARCHAR" property="energyQualityIndex" />
|
||||
<result column="evaluation_type" jdbcType="VARCHAR" property="evaluationType" />
|
||||
<result column="anti_interference_test" jdbcType="VARCHAR" property="antiInterferenceTest" />
|
||||
<result column="evaluation_chek_dept" jdbcType="VARCHAR" property="evaluationChekDept" />
|
||||
<result column="need_governance" jdbcType="BIT" property="needGovernance" />
|
||||
<result column="background_test_performed" jdbcType="BIT" property="backgroundTestPerformed" />
|
||||
<result column="substation_main_wiring_diagram" jdbcType="VARCHAR" property="substationMainWiringDiagram" />
|
||||
<result column="sensitive_devices" jdbcType="VARCHAR" property="sensitiveDevices" />
|
||||
<result column="anti_interference_report" jdbcType="VARCHAR" property="antiInterferenceReport" />
|
||||
<result column="power_quality_report" jdbcType="VARCHAR" property="powerQualityReport" />
|
||||
<result column="feasibility_report" jdbcType="VARCHAR" property="feasibilityReport" />
|
||||
<result column="preliminary_design_description" jdbcType="VARCHAR" property="preliminaryDesignDescription" />
|
||||
<result column="prediction_evaluation_report" jdbcType="VARCHAR" property="predictionEvaluationReport" />
|
||||
<result column="prediction_evaluation_review_opinions" jdbcType="VARCHAR" property="predictionEvaluationReviewOpinions" />
|
||||
<result column="additional_attachments" jdbcType="VARCHAR" property="additionalAttachments" />
|
||||
<result column="state" jdbcType="BIT" property="state" />
|
||||
<result column="Create_By" jdbcType="CHAR" property="createBy" />
|
||||
<result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="Update_By" jdbcType="CHAR" property="updateBy" />
|
||||
<result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
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
|
||||
</sql>
|
||||
</mapper>
|
||||
@@ -0,0 +1,38 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.njcn.process.mapper.UserReportSubstationPOMapper">
|
||||
<resultMap id="BaseResultMap" type="com.njcn.process.pojo.po.UserReportSubstationPO">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table user_report_substation-->
|
||||
<id column="id" jdbcType="VARCHAR" property="id" />
|
||||
<result column="pcc_point" jdbcType="VARCHAR" property="pccPoint" />
|
||||
<result column="base_short_circuit_capacity" jdbcType="DECIMAL" property="baseShortCircuitCapacity" />
|
||||
<result column="min_short_circuit_capacity" jdbcType="DECIMAL" property="minShortCircuitCapacity" />
|
||||
<result column="pcc_equipment_capacity" jdbcType="DECIMAL" property="pccEquipmentCapacity" />
|
||||
<result column="user_agreement_capacity" jdbcType="DECIMAL" property="userAgreementCapacity" />
|
||||
<result column="evaluation_type" jdbcType="VARCHAR" property="evaluationType" />
|
||||
<result column="nonlinear_load_type" jdbcType="VARCHAR" property="nonlinearLoadType" />
|
||||
<result column="evaluation_chek_dept" jdbcType="VARCHAR" property="evaluationChekDept" />
|
||||
<result column="need_governance" jdbcType="BIT" property="needGovernance" />
|
||||
<result column="background_test_performed" jdbcType="BIT" property="backgroundTestPerformed" />
|
||||
<result column="substation_main_wiring_diagram" jdbcType="VARCHAR" property="substationMainWiringDiagram" />
|
||||
<result column="feasibility_report" jdbcType="VARCHAR" property="feasibilityReport" />
|
||||
<result column="preliminary_design_description" jdbcType="VARCHAR" property="preliminaryDesignDescription" />
|
||||
<result column="prediction_evaluation_report" jdbcType="VARCHAR" property="predictionEvaluationReport" />
|
||||
<result column="prediction_evaluation_review_opinions" jdbcType="VARCHAR" property="predictionEvaluationReviewOpinions" />
|
||||
<result column="additional_attachments" jdbcType="VARCHAR" property="additionalAttachments" />
|
||||
<result column="state" jdbcType="BIT" property="state" />
|
||||
<result column="Create_By" jdbcType="CHAR" property="createBy" />
|
||||
<result column="Create_Time" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="Update_By" jdbcType="CHAR" property="updateBy" />
|
||||
<result column="Update_Time" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
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
|
||||
</sql>
|
||||
</mapper>
|
||||
@@ -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<RFlowProcessPO>{
|
||||
Boolean check(RFlowProcessParm.RFlowProcessCheck rFlowProcessCheck);
|
||||
|
||||
Boolean file(String id);
|
||||
}
|
||||
|
||||
Page<RFlowProcessVO> getFlowProcess(RFlowProcessQueryParm rFlowProcessQueryParm);
|
||||
|
||||
Boolean createCheckflow(String id);
|
||||
}
|
||||
|
||||
@@ -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<UserReportPO>{
|
||||
|
||||
|
||||
boolean addUserReport(UserReportParam userReportParam);
|
||||
|
||||
boolean auditUserReport(UserReportParam.UserReportUpdate userReportUpdate);
|
||||
|
||||
Page<UserReportVO> getUserReport(UserReportQueryParm userReportQueryParm);
|
||||
|
||||
Boolean removeUserReport(List<String> ids);
|
||||
}
|
||||
@@ -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<UserReportProjectPO>{
|
||||
|
||||
|
||||
}
|
||||
@@ -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<UserReportSensitivePO>{
|
||||
|
||||
|
||||
}
|
||||
@@ -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<UserReportSubstationPO>{
|
||||
|
||||
|
||||
}
|
||||
@@ -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<RFlowProcessPOMapper,
|
||||
private final FlowFormAssMapper flowFormAssMapper;
|
||||
|
||||
private final DicDataFeignClient dicDataFeignClient;
|
||||
private final DeptFeignClient deptFeignClient;
|
||||
|
||||
|
||||
private final IFlowDefinitionService iFlowDefinitionService;
|
||||
@@ -68,12 +80,12 @@ public class RFlowProcessPOServiceImpl extends ServiceImpl<RFlowProcessPOMapper,
|
||||
//生成新建工作流
|
||||
createflow(businessId, rFlowProcessParm.getApplyType(), rFlowProcessParm.getType());
|
||||
//生成提交审核工作流
|
||||
if(Objects.equals(rFlowProcessParm.getOperate(),"2")){
|
||||
createCheckflow(businessId);
|
||||
}
|
||||
//修改状态
|
||||
rFlowProcessPO.setProcessStatus(2);
|
||||
this.updateById(rFlowProcessPO);
|
||||
// if(Objects.equals(rFlowProcessParm.getOperate(),"2")){
|
||||
// createCheckflow(businessId);
|
||||
// //修改状态
|
||||
//
|
||||
// }
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -103,7 +115,7 @@ public class RFlowProcessPOServiceImpl extends ServiceImpl<RFlowProcessPOMapper,
|
||||
updateWrapper.set("process_status",rFlowProcessCheck.getCheckStatus()==1?3:4);
|
||||
result = this.update(updateWrapper);
|
||||
//流程审核
|
||||
FlowableAss flowableAss = flowableAssMapper.selectOne(new LambdaQueryWrapper<FlowableAss>().eq(FlowableAss::getType, ThsFlowTypeEnum.monitoringReturned.getCode()).eq(FlowableAss::getThsIndex,rFlowProcessCheck.getId()));
|
||||
FlowableAss flowableAss = flowableAssMapper.selectOne(new LambdaQueryWrapper<FlowableAss>().eq(FlowableAss::getThsIndex,rFlowProcessCheck.getId()));
|
||||
if(Objects.isNull(flowableAss)){
|
||||
throw new BusinessException("当前功能未绑定流程,请联系管理员处理");
|
||||
}
|
||||
@@ -119,7 +131,7 @@ public class RFlowProcessPOServiceImpl extends ServiceImpl<RFlowProcessPOMapper,
|
||||
updateWrapper.set("process_status",5);
|
||||
result = this.update(updateWrapper);
|
||||
//流程审核
|
||||
FlowableAss flowableAss = flowableAssMapper.selectOne(new LambdaQueryWrapper<FlowableAss>().eq(FlowableAss::getType, ThsFlowTypeEnum.monitoringReturned.getCode()).eq(FlowableAss::getThsIndex,id));
|
||||
FlowableAss flowableAss = flowableAssMapper.selectOne(new LambdaQueryWrapper<FlowableAss>().eq(FlowableAss::getThsIndex,id));
|
||||
if(Objects.isNull(flowableAss)){
|
||||
throw new BusinessException("当前功能未绑定流程,请联系管理员处理");
|
||||
}
|
||||
@@ -134,6 +146,45 @@ public class RFlowProcessPOServiceImpl extends ServiceImpl<RFlowProcessPOMapper,
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<RFlowProcessVO> getFlowProcess(RFlowProcessQueryParm rFlowProcessQueryParm) {
|
||||
Page<RFlowProcessVO> page = new Page<> (rFlowProcessQueryParm.getPageNum(), rFlowProcessQueryParm.getPageSize());
|
||||
IPage<RFlowProcessPO> tempPage = new Page<> (rFlowProcessQueryParm.getPageNum(), rFlowProcessQueryParm.getPageSize());
|
||||
|
||||
String loginUsrId = RequestUtil.getUserIndex();
|
||||
//部门处理:根据部门code取名称
|
||||
List<PvTerminalTreeVO> dept = deptFeignClient.allDeptList().getData();
|
||||
Map<String, String> pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, PvTerminalTreeVO::getName));
|
||||
QueryWrapper<RFlowProcessPO> 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<RFlowProcessPO> rGeneralSurveyPlanDetailIPage = this.getBaseMapper().selectPage (tempPage, queryWrapper);
|
||||
List<RFlowProcessVO> 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<RFlowProcessPOMapper,
|
||||
}
|
||||
//如何applyType==3 电能质量管理下有3个子流程
|
||||
map.put("type",type);
|
||||
String processId = iFlowDefinitionService.startProcessInstanceById(flowFormAss.getDefinitionId(), businessId, ThsFlowTypeEnum.monitoringReturned.getCode(), map);
|
||||
String processId = iFlowDefinitionService.startProcessInstanceById(flowFormAss.getDefinitionId(), businessId, applyType, map);
|
||||
Task task = iFlowTaskService.getTask(processId);
|
||||
FlowTaskVo flowTaskVo = new FlowTaskVo();
|
||||
flowTaskVo.setTaskId(task.getId());
|
||||
@@ -166,9 +217,10 @@ public class RFlowProcessPOServiceImpl extends ServiceImpl<RFlowProcessPOMapper,
|
||||
}
|
||||
|
||||
//提交审核工作流
|
||||
@Override
|
||||
public Boolean createCheckflow(String businessId ) {
|
||||
//流程审核
|
||||
FlowableAss flowableAss = flowableAssMapper.selectOne(new LambdaQueryWrapper<FlowableAss>().eq(FlowableAss::getType, ThsFlowTypeEnum.monitoringReturned.getCode()).eq(FlowableAss::getThsIndex,businessId));
|
||||
//流程审核
|
||||
FlowableAss flowableAss = flowableAssMapper.selectOne(new LambdaQueryWrapper<FlowableAss>().eq(FlowableAss::getThsIndex,businessId));
|
||||
if(Objects.isNull(flowableAss)){
|
||||
throw new BusinessException("当前功能未绑定流程,请联系管理员处理");
|
||||
}
|
||||
@@ -178,7 +230,8 @@ public class RFlowProcessPOServiceImpl extends ServiceImpl<RFlowProcessPOMapper,
|
||||
flowTaskVoNext.setTaskId(taskNext.getId());
|
||||
flowTaskVoNext.setAssignee(byId.getChecker());
|
||||
iFlowTaskService.toNextTaskUser(flowTaskVoNext);
|
||||
|
||||
byId.setProcessStatus(2);
|
||||
this.updateById(byId);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,186 @@
|
||||
package com.njcn.process.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
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.process.mapper.UserReportPOMapper;
|
||||
import com.njcn.process.pojo.param.UserReportParam;
|
||||
import com.njcn.process.pojo.param.UserReportQueryParm;
|
||||
import com.njcn.process.pojo.po.UserReportPO;
|
||||
import com.njcn.process.pojo.po.UserReportProjectPO;
|
||||
import com.njcn.process.pojo.po.UserReportSensitivePO;
|
||||
import com.njcn.process.pojo.po.UserReportSubstationPO;
|
||||
import com.njcn.process.pojo.vo.UserReportVO;
|
||||
import com.njcn.process.service.UserReportPOService;
|
||||
import com.njcn.process.service.UserReportProjectPOService;
|
||||
import com.njcn.process.service.UserReportSensitivePOService;
|
||||
import com.njcn.process.service.UserReportSubstationPOService;
|
||||
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.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.BeanWrapper;
|
||||
import org.springframework.beans.BeanWrapperImpl;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* Date: 2024/4/25 10:07【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, UserReportPO> 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<UserReportVO> getUserReport(UserReportQueryParm userReportQueryParm) {
|
||||
Page<UserReportVO> page = new Page<> (userReportQueryParm.getPageNum(), userReportQueryParm.getPageSize());
|
||||
IPage<UserReportPO> tempPage = new Page<> (userReportQueryParm.getPageNum(), userReportQueryParm.getPageSize());
|
||||
|
||||
String loginUsrId = RequestUtil.getUserIndex();
|
||||
//部门处理:根据部门code取名称
|
||||
List<PvTerminalTreeVO> dept = deptFeignClient.allDeptList().getData();
|
||||
Map<String, String> pvTerminalTreeVOMap = dept.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, PvTerminalTreeVO::getName));
|
||||
QueryWrapper<UserReportPO> 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<UserReportPO> tempPageList = this.getBaseMapper().selectPage (tempPage, queryWrapper);
|
||||
List<UserReportVO> 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<String> 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<String> emptyNames = new HashSet<String> ( );
|
||||
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);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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<UserReportProjectPOMapper, UserReportProjectPO> implements UserReportProjectPOService{
|
||||
|
||||
}
|
||||
@@ -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<UserReportSensitivePOMapper, UserReportSensitivePO> implements UserReportSensitivePOService{
|
||||
|
||||
}
|
||||
@@ -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<UserReportSubstationPOMapper, UserReportSubstationPO> implements UserReportSubstationPOService{
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -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"),
|
||||
;
|
||||
|
||||
|
||||
|
||||
@@ -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"),
|
||||
|
||||
|
||||
;
|
||||
|
||||
Reference in New Issue
Block a user