1.pms全过程用户临时档案功能

2024-10-24 20:30:22 +08:00
parent 0eeedf8f35
commit 448f76d646
24 changed files with 1000 additions and 27 deletions
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessTrackParam.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessTrackParam.java
@@ -1,13 +1,17 @@
-package com.njcn.harmonic.pojo.po.upload;
+package com.njcn.harmonic.pojo.param.upload;

 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import com.njcn.web.pojo.param.BaseParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;

+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
 /**
 * <p>
 * 电能质量全过程跟踪数据
@@ -18,10 +22,8 @@ import lombok.Setter;
 */
@Getter
@Setter
-@TableName("pms_tem_process_track")
-public class PmsTemProcessTrack extends BaseEntity {
+public class PmsTemProcessTrackParam {

-    private static final long serialVersionUID = 1L;

    /**
     * 主键
@@ -61,6 +63,7 @@ public class PmsTemProcessTrack extends BaseEntity {
    /**
     * 规划可研-审查时间
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime auditTime;

    /**
@@ -86,6 +89,7 @@ public class PmsTemProcessTrack extends BaseEntity {
    /**
     * 竣工验收-验收时间
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime approvalTime;

    /**
@@ -111,6 +115,7 @@ public class PmsTemProcessTrack extends BaseEntity {
    /**
     * 开始监测日期
     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private LocalDate startMonitorDate;

    /**
@@ -121,6 +126,7 @@ public class PmsTemProcessTrack extends BaseEntity {
    /**
     * 投运日期
     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private LocalDate operateDate;

    /**
@@ -131,6 +137,7 @@ public class PmsTemProcessTrack extends BaseEntity {
    /**
     * 审查完成时间
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime auditFinalTime;

    /**
@@ -156,6 +163,7 @@ public class PmsTemProcessTrack extends BaseEntity {
    /**
     * 验收完成时间
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime approvalFinalTime;

    /**
@@ -176,6 +184,7 @@ public class PmsTemProcessTrack extends BaseEntity {
    /**
     * 关联营销档案时间
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime relConsTime;

    /**
@@ -201,6 +210,7 @@ public class PmsTemProcessTrack extends BaseEntity {
    /**
     * 监测日期
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime monitorDate;

    /**
@@ -209,4 +219,26 @@ public class PmsTemProcessTrack extends BaseEntity {
    private String consObjId;


+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdatePmsTemProcessTrackParam extends PmsTemProcessTrackParam {
+
+        private String objId;
+    }
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class QueryPmsTemProcessTrackParam extends BaseParam {
+
+        private String objId;
+
+        private String tempUserDossierId;
+
+        /**
+         * 运维单位
+         */
+        private String maintOrg;
+    }
+
+
 }
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemUserParam.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemUserParam.java
@@ -0,0 +1,191 @@
+package com.njcn.harmonic.pojo.param.upload;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.db.bo.BaseEntity;
+import com.njcn.device.pms.pojo.param.PmsParkParam;
+import com.njcn.web.pojo.param.BaseParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电能质量全过程管理用户
+ * </p>
+ *
+ * @author cdf
+ * @since 2024-10-09
+ */
+@Getter
+@Setter
+public class PmsTemUserParam {
+
+
+    private String objId;
+
+    /**
+     * 所属网省
+     */
+    private String provinceOrg;
+
+    /**
+     * 所属网省名称
+     */
+    private String provinceOrgName;
+
+    /**
+     * 所属地市
+     */
+    private String cityOrg;
+
+    /**
+     * 所属地市名称
+     */
+    private String cityOrgName;
+
+    /**
+     * 运维单位
+     */
+    @NotBlank(message = "单位不可为空")
+    private String maintOrg;
+
+    /**
+     * 运维单位名称
+     */
+    private String maintOrgName;
+
+    /**
+     * 用户/项目名称
+     */
+    @NotBlank(message = "用户/项目名称不可为空")
+    private String consName;
+
+    /**
+     * 干扰源类型
+     */
+    @NotBlank(message = "干扰源类型不可为空")
+    private String sourceType;
+
+    /**
+     * 干扰源类别
+     */
+    @NotBlank(message = "干扰源类别不可为空")
+    private String sourceCategory;
+
+    /**
+     * 场站属性
+     */
+    @NotBlank(message = "场站属性不可为空")
+    private String sourceAttr;
+
+    /**
+     * 并网/供电电压等级
+     */
+    @NotBlank(message = "并网/供电电压等级不可为空")
+    private String gcVoltageLevel;
+
+    /**
+     * 并网/供电变电站
+     */
+    private String gcSubstationId;
+    /**
+     * 并网/供电变电站名称
+     */
+    @NotBlank(message = "并网/供电变电站不可为空")
+    private String gcSubstationName;
+
+    /**
+     * 并网/供电变电站电压等级
+     */
+    @NotBlank(message = "并网/供电变电站电压等级不可为空")
+    private String gcSubstationVoltageLevel;
+
+    /**
+     * 并网/供电线路
+     */
+    private String gcFeederId;
+
+    /**
+     * 并网/供电线路名称
+     */
+    private String gcFeederName;
+
+    /**
+     * 总装机容量（MVA）
+     */
+    @NotNull(message = "总装机容量（MVA）不可为空")
+    private Double ratedCapacity;
+
+    /**
+     * 档案状态
+     */
+    @NotBlank(message = "档案状态不可为空")
+    private String userDossierStatus;
+
+
+
+
+
+    /**
+     * 发布人
+     */
+    private String releaseUserName;
+
+    /**
+     * 所属电站类型
+     */
+    private String gcSubstationType;
+
+    /**
+     * 投运日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate operateTime;
+
+    /**
+     * 发布时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime releaseTime;
+
+    /**
+     * 营销用户编号
+     */
+    private String consNo;
+
+    /**
+     * 用户id
+     */
+    private String consObjId;
+
+
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdatePmsTemUserParam extends PmsTemUserParam {
+        @NotBlank(message = "主键索引不可为空")
+        private String objId;
+    }
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class QueryPmsTemUserParam extends BaseParam {
+
+        private String objId;
+
+        /**
+         * 运维单位
+         */
+        private String maintOrg;
+    }
+
+
+}
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessReport.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessReport.java
@@ -142,5 +142,7 @@ public class PmsTemProcessReport extends BaseEntity {
     */
    private BigDecimal runOvUserRate;

+    private Integer uploadStatus;
+

 }
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrackPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrackPO.java
@@ -0,0 +1,241 @@
+package com.njcn.harmonic.pojo.po.upload;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.db.bo.BaseEntity;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 电能质量全过程跟踪数据
+ * </p>
+ *
+ * @author cdf
+ * @since 2024-10-09
+ */
+@Getter
+@Setter
+@TableName("pms_tem_process_track")
+public class PmsTemProcessTrackPO extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String objId;
+
+    @TableField(exist = false)
+    private String consName;
+
+    /**
+     * 关联临时用户档案主键
+     */
+    @TableId
+    private String tempUserDossierId;
+
+
+    private String tempUserDossierName;
+
+    /**
+     * 项目阶段
+     */
+    private String proStage;
+
+    /**
+     * 规划可研-评估状态
+     */
+    private String auditStatus;
+
+    /**
+     * 规划可研-评估结论
+     */
+    private String auditResult;
+
+    /**
+     * 规划可研-审查人
+     */
+    private String auditUserId;
+
+    /**
+     * 规划可研-审查人名称
+     */
+    private String auditUserName;
+
+    /**
+     * 规划可研-审查时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private LocalDateTime auditTime;
+
+    /**
+     * 竣工验收-验收状态
+     */
+    private String approvalStatus;
+
+    /**
+     * 竣工验收-验收结论
+     */
+    private String approvalResult;
+
+    /**
+     * 竣工验收-验收负责人
+     */
+    private String approvalDutyUserId;
+
+    /**
+     * 竣工验收-验收负责人名称
+     */
+    private String approvalDutyUserName;
+
+    /**
+     * 竣工验收-验收时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private LocalDateTime approvalTime;
+
+    /**
+     * 营销用户编号
+     */
+    private String consNo;
+
+    /**
+     * 试运行-是否超标
+     */
+    private String testIsOv;
+
+    /**
+     * 总超标天数
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer allOvCountDay;
+
+    /**
+     * 监测天数
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer monitorDay;
+
+    /**
+     * 开始监测日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private LocalDate startMonitorDate;
+
+    /**
+     * 关联监测点
+     */
+    private String monitorIds;
+
+    /**
+     * 投运日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private LocalDate operateDate;
+
+    /**
+     * 运行天数
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Integer testRunDay;
+
+    /**
+     * 审查完成时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private LocalDateTime auditFinalTime;
+
+    /**
+     * 审查出具单位名称
+     */
+    private String auditIssueOrgName;
+
+    /**
+     * 电能质量专业审查意见
+     */
+    private String professionalAuditOpinion;
+
+    /**
+     * 审查单位
+     */
+    private String auditOrg;
+
+    /**
+     * 审查单位名称
+     */
+    private String auditOrgName;
+
+    /**
+     * 验收完成时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private LocalDateTime approvalFinalTime;
+
+    /**
+     * 遗留问题
+     */
+    private String legacyProblem;
+
+    /**
+     * 验收建议
+     */
+    private String approvalAdvise;
+
+    /**
+     * 验收参与人名称
+     */
+    private String approvalJoinUserName;
+
+    /**
+     * 关联营销档案时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private LocalDateTime relConsTime;
+
+    /**
+     * 操作人名称
+     */
+    private String operateUserName;
+
+    /**
+     * 测试结论
+     */
+    private String testResult;
+
+    /**
+     * 试运行出具单位名称
+     */
+    private String testRunIssueOrgName;
+
+    /**
+     * 越限指标
+     */
+    private String ovIndexs;
+
+    /**
+     * 监测日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private LocalDateTime monitorDate;
+
+    /**
+     * 用户id
+     */
+    private String consObjId;
+
+    private Integer uploadStatus;
+
+
+}
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java
@@ -1,8 +1,10 @@
 package com.njcn.harmonic.pojo.po.upload;

+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import lombok.Getter;
@@ -19,10 +21,11 @@ import lombok.Setter;
@Getter
@Setter
@TableName("pms_tem_user")
-public class PmsTemUser extends BaseEntity {
+public class PmsTemUserPO extends BaseEntity {

    private static final long serialVersionUID = 1L;

+    @TableId
    private String objId;

    /**
@@ -138,11 +141,13 @@ public class PmsTemUser extends BaseEntity {
    /**
     * 投运日期
     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
    private LocalDate operateTime;

    /**
     * 发布时间
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime releaseTime;

    /**
@@ -155,5 +160,7 @@ public class PmsTemUser extends BaseEntity {
     */
    private String consObjId;

+    private Integer uploadStatus;
+

 }