From 448f76d6463185992c7e191ebb3655d356904eba Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Thu, 24 Oct 2024 20:30:22 +0800 Subject: [PATCH] =?UTF-8?q?1.pms=E5=85=A8=E8=BF=87=E7=A8=8B=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=B8=B4=E6=97=B6=E6=A1=A3=E6=A1=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/common/pojo/dto/SimpleDTO.java | 2 + .../njcn/common/pojo/dto/SimpleTreeDTO.java | 2 + .../java/com/njcn/web/enums/GWSendEnum.java | 6 +- .../upload/PmsTemProcessTrackParam.java} | 46 +++- .../pojo/param/upload/PmsTemUserParam.java | 191 ++++++++++++++ .../pojo/po/upload/PmsTemProcessReport.java | 2 + .../pojo/po/upload/PmsTemProcessTrackPO.java | 241 ++++++++++++++++++ .../{PmsTemUser.java => PmsTemUserPO.java} | 11 +- .../upload/PmsTemProcessReportController.java | 28 ++ .../upload/PmsTemProcessTrackController.java | 84 ++++++ .../upload/PmsTemUserController.java | 54 +++- .../upload/PmsTemProcessTrackMapper.java | 4 +- .../mapper/upload/PmsTemUserMapper.java | 4 +- .../upload/IPmsTemProcessReportService.java | 4 + .../upload/IPmsTemProcessTrackService.java | 29 ++- .../service/upload/IPmsTemUserService.java | 28 +- .../impl/PmsTemProcessReportServiceImpl.java | 46 ++++ .../impl/PmsTemProcessTrackServiceImpl.java | 105 +++++++- .../upload/impl/PmsTemUserServiceImpl.java | 131 +++++++++- .../impl/RUploadMainMonitorServiceImpl.java | 2 +- .../njcn/system/enums/DicDataTypeEnum.java | 4 + .../njcn/system/pojo/vo/DictDataCache.java | 1 + .../system/mapper/mapping/DictTypeMapper.xml | 1 + .../service/impl/DictTypeServiceImpl.java | 1 + 24 files changed, 1000 insertions(+), 27 deletions(-) rename pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/{po/upload/PmsTemProcessTrack.java => param/upload/PmsTemProcessTrackParam.java} (72%) create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemUserParam.java create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrackPO.java rename pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/{PmsTemUser.java => PmsTemUserPO.java} (89%) diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/SimpleDTO.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/SimpleDTO.java index 5a0b4204b..44962e786 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/SimpleDTO.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/SimpleDTO.java @@ -27,4 +27,6 @@ public class SimpleDTO implements Serializable { private Integer sort; + private Integer algoDescribe; + } diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/SimpleTreeDTO.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/SimpleTreeDTO.java index 0785c99e7..710eefee5 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/SimpleTreeDTO.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/SimpleTreeDTO.java @@ -15,4 +15,6 @@ public class SimpleTreeDTO extends SimpleDTO implements Serializable { private List children; + + } diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java b/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java index cd1d0b636..091938c8f 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java @@ -49,8 +49,10 @@ public enum GWSendEnum { REPORT_CREATE("reportCreate", "/powerQuality/report/create"), - COMM_POINT("commPoint","/powerQuality/publicConnection/pqBusMonitorDataStatisticalCreate") - + COMM_POINT("commPoint","/powerQuality/publicConnection/pqBusMonitorDataStatisticalCreate"), + MAIN_MONITOR("mainMonitor","/powerQuality/runStatistics/monitorStatisticsCreate"), + TEMP_USER_CREATE("tempUserCreate","/powerQuality/process/tempUserCreate"), + MONTH_REPORT_CREATE("monthReportCreate","/powerQuality/process/monthReportCreate") ; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrack.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessTrackParam.java similarity index 72% rename from pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrack.java rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessTrackParam.java index 2ca3d96f9..fc73205cf 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrack.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; + /** *

* 电能质量全过程跟踪数据 @@ -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; + } + + } diff --git 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 new file mode 100644 index 000000000..2aee9e959 --- /dev/null +++ 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; + +/** + *

+ * 电能质量全过程管理用户 + *

+ * + * @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; + } + + +} diff --git 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 index 6fface872..8028f126d 100644 --- 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; + } diff --git 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 new file mode 100644 index 000000000..5d78e07b6 --- /dev/null +++ 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; + +/** + *

+ * 电能质量全过程跟踪数据 + *

+ * + * @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; + + +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUser.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java similarity index 89% rename from pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUser.java rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java index a401d31c5..c4dddb29c 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUser.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; + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessReportController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessReportController.java index a2a7f12a3..b482700db 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessReportController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessReportController.java @@ -1,11 +1,24 @@ package com.njcn.harmonic.controller.upload; +import com.njcn.common.pojo.annotation.OperateInfo; +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.harmonic.service.upload.IPmsTemProcessReportService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.njcn.web.controller.BaseController; +import java.util.List; + /** *

* 电能质量全过程月报 前端控制器 @@ -16,7 +29,22 @@ import com.njcn.web.controller.BaseController; */ @RestController @RequestMapping("/process/pmsTemProcessReport") +@RequiredArgsConstructor public class PmsTemProcessReportController extends BaseController { + private final IPmsTemProcessReportService iPmsTemProcessReportService; + + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/upGwReport") + @ApiOperation("上送国网") + @ApiImplicitParam(name = "param", value = "实体参数", required = true) + public HttpResult upGwReport(@RequestBody List ids) { + String methodDescribe = getMethodDescribe("upGwReport"); + iPmsTemProcessReportService.upGw(ids); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); + } + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessTrackController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessTrackController.java index 5c301c301..0f5d3111b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessTrackController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessTrackController.java @@ -1,11 +1,29 @@ package com.njcn.harmonic.controller.upload; +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.harmonic.pojo.param.upload.PmsTemProcessTrackParam; +import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO; +import com.njcn.harmonic.service.upload.IPmsTemProcessTrackService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.njcn.web.controller.BaseController; +import java.util.List; +import java.util.Objects; + /** *

* 电能质量全过程跟踪数据 前端控制器 @@ -16,7 +34,73 @@ import com.njcn.web.controller.BaseController; */ @RestController @RequestMapping("/process/pmsTemProcessTrack") +@RequiredArgsConstructor public class PmsTemProcessTrackController extends BaseController { + + private final IPmsTemProcessTrackService iPmsTemProcessTrackService; + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addTemProcessTrack") + @ApiOperation("新增用户") + public HttpResult addTemProcessTrack(@RequestBody PmsTemProcessTrackParam param) { + String methodDescribe = getMethodDescribe("addTemProcessTrack"); + Boolean result = iPmsTemProcessTrackService.addTemProcessTrack(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE) + @PostMapping("/updateTemProcessTrack") + @ApiOperation("修改用户") + public HttpResult updateTemProcessTrack(@RequestBody PmsTemProcessTrackParam.UpdatePmsTemProcessTrackParam param) { + String methodDescribe = getMethodDescribe("updateTemProcessTrack"); + Boolean result = iPmsTemProcessTrackService.updateTemProcessTrack(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.DELETE) + @PostMapping("/delTemProcessTrack") + @ApiOperation("删除用户") + public HttpResult delTemProcessTrack(@RequestBody List ids) { + String methodDescribe = getMethodDescribe("delTemProcessTrack"); + Boolean result = iPmsTemProcessTrackService.delTemProcessTrack(ids); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/pageList") + @ApiOperation("分页查询用户") + public HttpResult> pageList(@RequestBody PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam param) { + String methodDescribe = getMethodDescribe("pageList"); + Page result = iPmsTemProcessTrackService.pageList(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getById") + @ApiOperation("根据id获取详情") + public HttpResult getById(@RequestBody PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam param) { + String methodDescribe = getMethodDescribe("getById"); + PmsTemProcessTrackPO result = iPmsTemProcessTrackService.getById(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/upGw") + @ApiOperation("上送国网") + @ApiImplicitParam(name = "param", value = "实体参数", required = true) + public HttpResult upGw(@RequestBody List ids) { + String methodDescribe = getMethodDescribe("upGw"); + iPmsTemProcessTrackService.upGw(ids); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemUserController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemUserController.java index a964f0fff..8724f4a78 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemUserController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemUserController.java @@ -1,17 +1,21 @@ package com.njcn.harmonic.controller.upload; +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.harmonic.pojo.param.UploadDataParam; +import com.njcn.harmonic.pojo.param.upload.PmsTemUserParam; +import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO; import com.njcn.harmonic.service.upload.IPmsTemUserService; -import com.njcn.harmonic.service.upload.impl.PmsTemUserServiceImpl; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.njcn.web.controller.BaseController; +import java.util.List; + /** *

* 电能质量全过程管理用户 前端控制器 @@ -35,13 +41,55 @@ public class PmsTemUserController extends BaseController { private final IPmsTemUserService iPmsTemUserService; + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @PostMapping("/addPmsTemUser") + @ApiOperation("新增用户") + public HttpResult addPmsTemUser(@RequestBody @Validated PmsTemUserParam param) { + String methodDescribe = getMethodDescribe("addPmsTemUser"); + Boolean result = iPmsTemUserService.addPmsTemUser(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE) + @PostMapping("/updatePmsTemUser") + @ApiOperation("修改用户") + public HttpResult updatePmsTemUser(@RequestBody @Validated PmsTemUserParam.UpdatePmsTemUserParam param) { + String methodDescribe = getMethodDescribe("updatePmsTemUser"); + Boolean result = iPmsTemUserService.updatePmsTemUser(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.DELETE) + @PostMapping("/delPmsTemUser") + @ApiOperation("删除用户") + public HttpResult delPmsTemUser(@RequestBody List ids) { + String methodDescribe = getMethodDescribe("delPmsTemUser"); + Boolean result = iPmsTemUserService.delPmsTemUser(ids); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/pageList") + @ApiOperation("分页查询用户") + public HttpResult> pageList(@RequestBody PmsTemUserParam.QueryPmsTemUserParam param) { + String methodDescribe = getMethodDescribe("pageList"); + Page result = iPmsTemUserService.pageList(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/upGwTemUser") @ApiOperation("上送国网") @ApiImplicitParam(name = "param", value = "实体参数", required = true) - public HttpResult upGwTemUser(@RequestBody UploadDataParam param) { + public HttpResult upGwTemUser(@RequestBody List ids) { String methodDescribe = getMethodDescribe("upGwTemUser"); - + iPmsTemUserService.upGwTemUser(ids); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsTemProcessTrackMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsTemProcessTrackMapper.java index deb1f59be..4c25229d4 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsTemProcessTrackMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsTemProcessTrackMapper.java @@ -2,7 +2,7 @@ package com.njcn.harmonic.mapper.upload; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrack; +import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO; /** *

@@ -12,6 +12,6 @@ import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrack; * @author cdf * @since 2024-10-09 */ -public interface PmsTemProcessTrackMapper extends BaseMapper { +public interface PmsTemProcessTrackMapper extends BaseMapper { } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsTemUserMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsTemUserMapper.java index 2ab703b3a..df57b8146 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsTemUserMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsTemUserMapper.java @@ -2,7 +2,7 @@ package com.njcn.harmonic.mapper.upload; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.harmonic.pojo.po.upload.PmsTemUser; +import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO; /** *

@@ -12,6 +12,6 @@ import com.njcn.harmonic.pojo.po.upload.PmsTemUser; * @author cdf * @since 2024-10-09 */ -public interface PmsTemUserMapper extends BaseMapper { +public interface PmsTemUserMapper extends BaseMapper { } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessReportService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessReportService.java index 384723a97..2691af8e9 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessReportService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessReportService.java @@ -4,6 +4,8 @@ package com.njcn.harmonic.service.upload; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.harmonic.pojo.po.upload.PmsTemProcessReport; +import java.util.List; + /** *

* 电能质量全过程月报 服务类 @@ -14,4 +16,6 @@ import com.njcn.harmonic.pojo.po.upload.PmsTemProcessReport; */ public interface IPmsTemProcessReportService extends IService { + + Boolean upGw(List ids); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessTrackService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessTrackService.java index 248c9a0d8..872485bc3 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessTrackService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessTrackService.java @@ -1,8 +1,13 @@ package com.njcn.harmonic.service.upload; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrack; +import com.njcn.harmonic.pojo.param.upload.PmsTemProcessTrackParam; +import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO; + + +import java.util.List; /** *

@@ -12,6 +17,26 @@ import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrack; * @author cdf * @since 2024-10-09 */ -public interface IPmsTemProcessTrackService extends IService { +public interface IPmsTemProcessTrackService extends IService { + + Boolean addTemProcessTrack(PmsTemProcessTrackParam param); + + + + Boolean updateTemProcessTrack(PmsTemProcessTrackParam.UpdatePmsTemProcessTrackParam updateTemProcessTrackParam); + + + Boolean delTemProcessTrack(List ids); + + + + Page pageList(PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam param); + + + PmsTemProcessTrackPO getById(PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam param); + + + Boolean upGw(List ids); + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemUserService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemUserService.java index 1c7e2229a..899206cc0 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemUserService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemUserService.java @@ -1,7 +1,14 @@ package com.njcn.harmonic.service.upload; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.harmonic.pojo.po.upload.PmsTemUser; + +import com.njcn.harmonic.pojo.param.UploadDataParam; +import com.njcn.harmonic.pojo.param.upload.PmsTemUserParam; +import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; /** *

@@ -11,6 +18,23 @@ import com.njcn.harmonic.pojo.po.upload.PmsTemUser; * @author cdf * @since 2024-10-09 */ -public interface IPmsTemUserService extends IService { +public interface IPmsTemUserService extends IService { + + + Boolean addPmsTemUser(PmsTemUserParam param); + + + + Boolean updatePmsTemUser(PmsTemUserParam.UpdatePmsTemUserParam updatePmsTemUserParam); + + + Boolean delPmsTemUser(List ids); + + + + Page pageList(PmsTemUserParam.QueryPmsTemUserParam param); + + + Boolean upGwTemUser(List ids); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java index 3884c849f..374b25b0e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java @@ -1,12 +1,24 @@ package com.njcn.harmonic.service.upload.impl; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.exception.BusinessException; import com.njcn.harmonic.mapper.upload.PmsTemProcessReportMapper; import com.njcn.harmonic.pojo.po.upload.PmsTemProcessReport; +import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO; import com.njcn.harmonic.service.upload.IPmsTemProcessReportService; +import com.njcn.web.enums.GWSendEnum; +import com.njcn.web.pojo.param.SendParam; +import com.njcn.web.utils.GwSendUtil; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** *

* 电能质量全过程月报 服务实现类 @@ -18,4 +30,38 @@ import org.springframework.stereotype.Service; @Service public class PmsTemProcessReportServiceImpl extends ServiceImpl implements IPmsTemProcessReportService { + + + @Override + public Boolean upGw(List ids) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(PmsTemProcessReport::getObjId,ids); + List pmsTemProcessReportList = this.list(lambdaQueryWrapper); + if(CollUtil.isEmpty(pmsTemProcessReportList)){ + throw new BusinessException("查询用户临时档案数据为空"); + } + + List> list = CollUtil.split(pmsTemProcessReportList,100); + for(int i=0;i sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.MONTH_REPORT_CREATE); + List TemProcessTrackPOIds = list.get(i).stream().map(PmsTemProcessReport::getObjId).collect(Collectors.toList()); + int count = GwSendUtil.returnInfoMsg(TemProcessTrackPOIds,sendRes); + System.out.println("上送成功,上送成功返回"+count+"条"); + if(count == list.get(i).size()){ + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(PmsTemProcessReport::getUploadStatus,1).in(PmsTemProcessReport::getObjId,ids); + this.update(lambdaUpdateWrapper); + } + } + return true; + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java index e3d1b9ee0..1471dc8e0 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java @@ -1,12 +1,33 @@ package com.njcn.harmonic.service.upload.impl; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.common.pojo.exception.BusinessException; import com.njcn.harmonic.mapper.upload.PmsTemProcessTrackMapper; -import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrack; +import com.njcn.harmonic.pojo.param.upload.PmsTemProcessTrackParam; +import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO; +import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO; import com.njcn.harmonic.service.upload.IPmsTemProcessTrackService; +import com.njcn.harmonic.service.upload.IPmsTemUserService; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.web.enums.GWSendEnum; +import com.njcn.web.factory.PageFactory; +import com.njcn.web.pojo.param.SendParam; +import com.njcn.web.utils.GwSendUtil; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + /** *

* 电能质量全过程跟踪数据 服务实现类 @@ -16,6 +37,86 @@ import org.springframework.stereotype.Service; * @since 2024-10-09 */ @Service -public class PmsTemProcessTrackServiceImpl extends ServiceImpl implements IPmsTemProcessTrackService { +@RequiredArgsConstructor +public class PmsTemProcessTrackServiceImpl extends ServiceImpl implements IPmsTemProcessTrackService { + private final IPmsTemUserService iPmsTemUserService; + + + @Override + public Boolean addTemProcessTrack(PmsTemProcessTrackParam param) { + PmsTemProcessTrackPO pmsTemProcessTrackPO = new PmsTemProcessTrackPO(); + BeanUtil.copyProperties(param, pmsTemProcessTrackPO); + pmsTemProcessTrackPO.setObjId(IdUtil.simpleUUID()); + PmsTemUserPO pmsTemUserPO = iPmsTemUserService.getById(param.getTempUserDossierId()); + pmsTemProcessTrackPO.setTempUserDossierName(pmsTemUserPO.getConsName()); + pmsTemProcessTrackPO.setUploadStatus(DataStateEnum.DELETED.getCode()); + return this.save(pmsTemProcessTrackPO); + } + + @Override + public Boolean updateTemProcessTrack(PmsTemProcessTrackParam.UpdatePmsTemProcessTrackParam updatePmsTemProcessTrackParam) { + //PmsTemProcessTrackPO result = this.getById(updatePmsTemProcessTrackParam.getObjId()); + PmsTemProcessTrackPO pmsTemProcessTrackPO = new PmsTemProcessTrackPO(); + BeanUtil.copyProperties(updatePmsTemProcessTrackParam, pmsTemProcessTrackPO); + PmsTemUserPO pmsTemUserPO = iPmsTemUserService.getById(updatePmsTemProcessTrackParam.getTempUserDossierId()); + pmsTemProcessTrackPO.setTempUserDossierName(pmsTemUserPO.getConsName()); + + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(PmsTemProcessTrackPO::getAllOvCountDay,updatePmsTemProcessTrackParam.getAllOvCountDay()); + return this.updateById(pmsTemProcessTrackPO); + } + + @Override + public Boolean delTemProcessTrack(List ids) { + return this.removeByIds(ids); + } + + @Override + public Page pageList(PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam parkQuery) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + return this.page(new Page<>(PageFactory.getPageNum(parkQuery), PageFactory.getPageSize(parkQuery)), lambdaQueryWrapper); + } + + @Override + public PmsTemProcessTrackPO getById(PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam param) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(PmsTemProcessTrackPO::getTempUserDossierId,param.getTempUserDossierId()); + PmsTemProcessTrackPO pmsTemProcessTrackPO = this.getOne(lambdaQueryWrapper); + return pmsTemProcessTrackPO; + } + + @Override + public Boolean upGw(List ids) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(PmsTemProcessTrackPO::getObjId,ids); + List TemProcessTrackPOList = this.list(lambdaQueryWrapper); + if(CollUtil.isEmpty(TemProcessTrackPOList)){ + throw new BusinessException("查询用户临时档案数据为空"); + } + + List> list = CollUtil.split(TemProcessTrackPOList,100); + for(int i=0;i sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.TEMP_USER_CREATE); + List TemProcessTrackPOIds = list.get(i).stream().map(PmsTemProcessTrackPO::getObjId).collect(Collectors.toList()); + int count = GwSendUtil.returnInfoMsg(TemProcessTrackPOIds,sendRes); + System.out.println("上送成功,上送成功返回"+count+"条"); + if(count == list.get(i).size()){ + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(PmsTemProcessTrackPO::getUploadStatus,1).in(PmsTemProcessTrackPO::getObjId,ids); + this.update(lambdaUpdateWrapper); + } + } + return true; + } + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java index bc8a1c8a7..52df1cd6f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java @@ -1,12 +1,42 @@ package com.njcn.harmonic.service.upload.impl; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pms.enums.PmsEnum; + + import com.njcn.harmonic.mapper.upload.PmsTemUserMapper; -import com.njcn.harmonic.pojo.po.upload.PmsTemUser; +import com.njcn.harmonic.pojo.dto.upload.RUploadMainMonitorDataDTO; +import com.njcn.harmonic.pojo.param.UploadDataParam; +import com.njcn.harmonic.pojo.param.upload.PmsTemUserParam; +import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO; +import com.njcn.harmonic.pojo.po.upload.RUploadMainMonitorData; import com.njcn.harmonic.service.upload.IPmsTemUserService; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.vo.DeptTreeVO; +import com.njcn.user.pojo.vo.PvTerminalTreeVO; +import com.njcn.web.enums.GWSendEnum; +import com.njcn.web.factory.PageFactory; +import com.njcn.web.pojo.param.SendParam; +import com.njcn.web.utils.GwSendUtil; +import com.njcn.web.utils.RequestUtil; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + /** *

* 电能质量全过程管理用户 服务实现类 @@ -16,6 +46,103 @@ import org.springframework.stereotype.Service; * @since 2024-10-09 */ @Service -public class PmsTemUserServiceImpl extends ServiceImpl implements IPmsTemUserService { +@RequiredArgsConstructor +public class PmsTemUserServiceImpl extends ServiceImpl implements IPmsTemUserService { + + private final DeptFeignClient deptFeignClient; + + + + + @Override + public Boolean addPmsTemUser(PmsTemUserParam param) { + PmsTemUserPO pmsTemUserPO = new PmsTemUserPO(); + BeanUtil.copyProperties(param, pmsTemUserPO); + assOrg(pmsTemUserPO); + pmsTemUserPO.setUploadStatus(DataStateEnum.DELETED.getCode()); + return this.save(pmsTemUserPO); + } + + @Override + public Boolean updatePmsTemUser(PmsTemUserParam.UpdatePmsTemUserParam updatePmsTemUserParam) { + PmsTemUserPO result = this.getById(updatePmsTemUserParam.getObjId()); + PmsTemUserPO pmsTemUserPO = new PmsTemUserPO(); + BeanUtil.copyProperties(updatePmsTemUserParam, pmsTemUserPO); + if(!result.getMaintOrg().equals(updatePmsTemUserParam.getMaintOrg())){ + assOrg(pmsTemUserPO); + } + return this.updateById(pmsTemUserPO); + } + + @Override + public Boolean delPmsTemUser(List ids) { + return this.removeByIds(ids); + } + + @Override + public Page pageList(PmsTemUserParam.QueryPmsTemUserParam parkQuery) { + List deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(parkQuery.getMaintOrg()).getData(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(PmsTemUserPO::getMaintOrg, deptCodes).orderByDesc(PmsTemUserPO::getCreateTime, PmsTemUserPO::getCityOrgName); + return this.page(new Page<>(PageFactory.getPageNum(parkQuery), PageFactory.getPageSize(parkQuery)), lambdaQueryWrapper); + } + + @Override + public Boolean upGwTemUser(List ids) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(PmsTemUserPO::getObjId,ids); + List pmsTemUserPOList = this.list(lambdaQueryWrapper); + if(CollUtil.isEmpty(pmsTemUserPOList)){ + throw new BusinessException("查询用户临时档案数据为空"); + } + + List> list = CollUtil.split(pmsTemUserPOList,100); + for(int i=0;i sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.TEMP_USER_CREATE); + List pmsTemUserPOIds = list.get(i).stream().map(PmsTemUserPO::getObjId).collect(Collectors.toList()); + int count = GwSendUtil.returnInfoMsg(pmsTemUserPOIds,sendRes); + System.out.println("上送成功,上送成功返回"+count+"条"); + if(count == list.get(i).size()){ + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(PmsTemUserPO::getUploadStatus,1).in(PmsTemUserPO::getObjId,ids); + this.update(lambdaUpdateWrapper); + } + } + return true; + } + + private void assOrg(PmsTemUserPO pmsTemUserPO){ + List deptTreeVOList = deptFeignClient.allDeptList().getData(); + List provinceList = deptTreeVOList.stream().filter(item->item.getLevel() == 1).collect(Collectors.toList()); + pmsTemUserPO.setProvinceOrg(provinceList.get(0).getCode()); + pmsTemUserPO.setProvinceOrgName(provinceList.get(0).getName()); + Map deptCodeMap = deptTreeVOList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getCode, Function.identity())); + Map deptIdMap = deptTreeVOList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, Function.identity())); + PvTerminalTreeVO pvTerminalTreeVO = deptCodeMap.get(pmsTemUserPO.getMaintOrg()); + if(pvTerminalTreeVO.getLevel() == 4){ + //运维单位是县级 + PvTerminalTreeVO parent = deptIdMap.get(pvTerminalTreeVO.getPid()); + pmsTemUserPO.setCityOrg(parent.getCode()); + pmsTemUserPO.setCityOrgName(parent.getName()); + }else if(pvTerminalTreeVO.getLevel() == 3){ + pmsTemUserPO.setCityOrg(pvTerminalTreeVO.getCode()); + pmsTemUserPO.setCityOrgName(pvTerminalTreeVO.getName()); + }else if(pvTerminalTreeVO.getLevel() == 2){ + + }else { + throw new BusinessException("请选择正确的运维单位！"); + } + + + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java index 1f3888c7e..7928bb523 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java @@ -147,7 +147,7 @@ public class RUploadMainMonitorServiceImpl extends ServiceImpl sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.COMM_POINT); + Map sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.MAIN_MONITOR); List ids = list.get(i).stream().map(RUploadMainMonitorDataDTO::getObjId).collect(Collectors.toList()); int count = GwSendUtil.returnInfoMsg(ids,sendRes); System.out.println("上送成功,上送成功返回"+count+"条"); 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 d6b0e1acf..20c2c9cb4 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 @@ -120,6 +120,10 @@ public enum DicDataTypeEnum { DEVICE_UNIT("数据单位类型","Device_Unit"), //国网上送 + pms_disturb_type("pms国网上送干扰源类型","pms_disturb_type"), + pms_disturb_sort("pms国网上送干扰源类别","pms_disturb_sort"), + type_of_station("站房类型","type_of_station"), + File_status("档案状态","File_status"), USER_CLASS("用户分类","User_Class"), IMPORTANCE_LEVEL("重要性等级","Importance_Level"), ELE_CLASS("用电类别","Ele_Class"), diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictDataCache.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictDataCache.java index 79d1cb73e..f4d168588 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictDataCache.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictDataCache.java @@ -28,5 +28,6 @@ public class DictDataCache implements Serializable { private String typeCode; + private Integer algoDescribe; } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictTypeMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictTypeMapper.xml index 7405a5949..0e074a026 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictTypeMapper.xml +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictTypeMapper.xml @@ -9,6 +9,7 @@ t1.code code, t1.sort sort, t1.value, + t1.Algo_Describe, t2.id typeId, t2.name typeName, t2.code typeCode diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictTypeServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictTypeServiceImpl.java index f139a677e..62e1b8384 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictTypeServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictTypeServiceImpl.java @@ -104,6 +104,7 @@ public class DictTypeServiceImpl extends ServiceImpl i simpleDTO.setName(dictDataCache.getName()); simpleDTO.setSort(dictDataCache.getSort()); simpleDTO.setValue(dictDataCache.getValue()); + simpleDTO.setAlgoDescribe(dictDataCache.getAlgoDescribe()); return simpleDTO; }).sorted(Comparator.comparing(SimpleDTO::getSort)).collect(Collectors.toList()); simpleTreeDTO.setChildren(simpleDTOList);