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

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

Browse Source
This commit is contained in:
chendaofei
2024-10-24 20:30:22 +08:00
parent 0eeedf8f35
commit 448f76d646
24 changed files with 1000 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/SimpleDTO.java
View File

@@ -27,4 +27,6 @@ public class SimpleDTO implements Serializable {
private Integer sort;
private Integer algoDescribe;
}

2
pqs-common/common-core/src/main/java/com/njcn/common/pojo/dto/SimpleTreeDTO.java
View File

@@ -15,4 +15,6 @@ public class SimpleTreeDTO extends SimpleDTO implements Serializable {
private List<SimpleDTO> children;
}

6
pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java
View File

@@ -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")
;

46
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrack.java → pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessTrackParam.java
View File

@@ -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;
}
}

191
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemUserParam.java Normal file
View File

@@ -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;
}
}

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessReport.java
View File

@@ -142,5 +142,7 @@ public class PmsTemProcessReport extends BaseEntity {
*/
private BigDecimal runOvUserRate;
private Integer uploadStatus;
}

241
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrackPO.java Normal file
View File

@@ -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;
}

11
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUser.java → pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java
View File

@@ -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;
}

28
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessReportController.java
View File

@@ -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;
/**
* <p>
* 电能质量全过程月报 前端控制器
@@ -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<Boolean> upGwReport(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("upGwReport");
iPmsTemProcessReportService.upGw(ids);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
}
}

84
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessTrackController.java
View File

@@ -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;
/**
* <p>
* 电能质量全过程跟踪数据 前端控制器
@@ -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<Object> 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<Object> 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<Object> delTemProcessTrack(@RequestBody List<String> 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<Page<PmsTemProcessTrackPO>> pageList(@RequestBody PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam param) {
String methodDescribe = getMethodDescribe("pageList");
Page<PmsTemProcessTrackPO> result = iPmsTemProcessTrackService.pageList(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getById")
@ApiOperation("根据id获取详情")
public HttpResult<PmsTemProcessTrackPO> 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<Boolean> upGw(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("upGw");
iPmsTemProcessTrackService.upGw(ids);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
}
}

54
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemUserController.java
View File

@@ -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;
/**
* <p>
* 电能质量全过程管理用户 前端控制器
@@ -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<Object> 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<Object> 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<Object> delPmsTemUser(@RequestBody List<String> 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<Page<PmsTemUserPO>> pageList(@RequestBody PmsTemUserParam.QueryPmsTemUserParam param) {
String methodDescribe = getMethodDescribe("pageList");
Page<PmsTemUserPO> 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<Boolean> upGwTemUser(@RequestBody UploadDataParam param) {
public HttpResult<Boolean> upGwTemUser(@RequestBody List<String> ids) {
String methodDescribe = getMethodDescribe("upGwTemUser");
iPmsTemUserService.upGwTemUser(ids);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
}

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsTemProcessTrackMapper.java
View File

@@ -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;
/**
* <p>
@@ -12,6 +12,6 @@ import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrack;
* @author cdf
* @since 2024-10-09
*/
public interface PmsTemProcessTrackMapper extends BaseMapper<PmsTemProcessTrack> {
public interface PmsTemProcessTrackMapper extends BaseMapper<PmsTemProcessTrackPO> {
}

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsTemUserMapper.java
View File

@@ -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;
/**
* <p>
@@ -12,6 +12,6 @@ import com.njcn.harmonic.pojo.po.upload.PmsTemUser;
* @author cdf
* @since 2024-10-09
*/
public interface PmsTemUserMapper extends BaseMapper<PmsTemUser> {
public interface PmsTemUserMapper extends BaseMapper<PmsTemUserPO> {
}

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessReportService.java
View File

@@ -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;
/**
* <p>
* 电能质量全过程月报 服务类
@@ -14,4 +16,6 @@ import com.njcn.harmonic.pojo.po.upload.PmsTemProcessReport;
*/
public interface IPmsTemProcessReportService extends IService<PmsTemProcessReport> {
Boolean upGw(List<String> ids);
}

29
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessTrackService.java
View File

@@ -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;
/**
* <p>
@@ -12,6 +17,26 @@ import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrack;
* @author cdf
* @since 2024-10-09
*/
public interface IPmsTemProcessTrackService extends IService<PmsTemProcessTrack> {
public interface IPmsTemProcessTrackService extends IService<PmsTemProcessTrackPO> {
Boolean addTemProcessTrack(PmsTemProcessTrackParam param);
Boolean updateTemProcessTrack(PmsTemProcessTrackParam.UpdatePmsTemProcessTrackParam updateTemProcessTrackParam);
Boolean delTemProcessTrack(List<String> ids);
Page<PmsTemProcessTrackPO> pageList(PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam param);
PmsTemProcessTrackPO getById(PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam param);
Boolean upGw(List<String> ids);
}

28
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemUserService.java
View File

@@ -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;
/**
* <p>
@@ -11,6 +18,23 @@ import com.njcn.harmonic.pojo.po.upload.PmsTemUser;
* @author cdf
* @since 2024-10-09
*/
public interface IPmsTemUserService extends IService<PmsTemUser> {
public interface IPmsTemUserService extends IService<PmsTemUserPO> {
Boolean addPmsTemUser(PmsTemUserParam param);
Boolean updatePmsTemUser(PmsTemUserParam.UpdatePmsTemUserParam updatePmsTemUserParam);
Boolean delPmsTemUser(List<String> ids);
Page<PmsTemUserPO> pageList(PmsTemUserParam.QueryPmsTemUserParam param);
Boolean upGwTemUser(List<String> ids);
}

46
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java
View File

@@ -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;
/**
* <p>
* 电能质量全过程月报 服务实现类
@@ -18,4 +30,38 @@ import org.springframework.stereotype.Service;
@Service
public class PmsTemProcessReportServiceImpl extends ServiceImpl<PmsTemProcessReportMapper, PmsTemProcessReport> implements IPmsTemProcessReportService {
@Override
public Boolean upGw(List<String> ids) {
LambdaQueryWrapper<PmsTemProcessReport> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(PmsTemProcessReport::getObjId,ids);
List<PmsTemProcessReport> pmsTemProcessReportList = this.list(lambdaQueryWrapper);
if(CollUtil.isEmpty(pmsTemProcessReportList)){
throw new BusinessException("查询用户临时档案数据为空");
}
List<List<PmsTemProcessReport>> list = CollUtil.split(pmsTemProcessReportList,100);
for(int i=0;i<list.size();i++){
SendParam sendParam = new SendParam();
if(i==0){
sendParam.setIsAppend("0");
}else if(i==list.size()-1){
sendParam.setIsAppend("2");
}else {
sendParam.setIsAppend("1");
}
sendParam.setStats(list.get(i));
Map<String, String> sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.MONTH_REPORT_CREATE);
List<String> 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<PmsTemProcessReport> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.set(PmsTemProcessReport::getUploadStatus,1).in(PmsTemProcessReport::getObjId,ids);
this.update(lambdaUpdateWrapper);
}
}
return true;
}
}

105
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessTrackServiceImpl.java
View File

@@ -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;
/**
* <p>
* 电能质量全过程跟踪数据 服务实现类
@@ -16,6 +37,86 @@ import org.springframework.stereotype.Service;
* @since 2024-10-09
*/
@Service
public class PmsTemProcessTrackServiceImpl extends ServiceImpl<PmsTemProcessTrackMapper, PmsTemProcessTrack> implements IPmsTemProcessTrackService {
@RequiredArgsConstructor
public class PmsTemProcessTrackServiceImpl extends ServiceImpl<PmsTemProcessTrackMapper, PmsTemProcessTrackPO> 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<PmsTemProcessTrackPO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(PmsTemProcessTrackPO::getAllOvCountDay,updatePmsTemProcessTrackParam.getAllOvCountDay());
return this.updateById(pmsTemProcessTrackPO);
}
@Override
public Boolean delTemProcessTrack(List<String> ids) {
return this.removeByIds(ids);
}
@Override
public Page<PmsTemProcessTrackPO> pageList(PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam parkQuery) {
LambdaQueryWrapper<PmsTemProcessTrackPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
return this.page(new Page<>(PageFactory.getPageNum(parkQuery), PageFactory.getPageSize(parkQuery)), lambdaQueryWrapper);
}
@Override
public PmsTemProcessTrackPO getById(PmsTemProcessTrackParam.QueryPmsTemProcessTrackParam param) {
LambdaQueryWrapper<PmsTemProcessTrackPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PmsTemProcessTrackPO::getTempUserDossierId,param.getTempUserDossierId());
PmsTemProcessTrackPO pmsTemProcessTrackPO = this.getOne(lambdaQueryWrapper);
return pmsTemProcessTrackPO;
}
@Override
public Boolean upGw(List<String> ids) {
LambdaQueryWrapper<PmsTemProcessTrackPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(PmsTemProcessTrackPO::getObjId,ids);
List<PmsTemProcessTrackPO> TemProcessTrackPOList = this.list(lambdaQueryWrapper);
if(CollUtil.isEmpty(TemProcessTrackPOList)){
throw new BusinessException("查询用户临时档案数据为空");
}
List<List<PmsTemProcessTrackPO>> list = CollUtil.split(TemProcessTrackPOList,100);
for(int i=0;i<list.size();i++){
SendParam sendParam = new SendParam();
if(i==0){
sendParam.setIsAppend("0");
}else if(i==list.size()-1){
sendParam.setIsAppend("2");
}else {
sendParam.setIsAppend("1");
}
sendParam.setStats(list.get(i));
Map<String, String> sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.TEMP_USER_CREATE);
List<String> 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<PmsTemProcessTrackPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.set(PmsTemProcessTrackPO::getUploadStatus,1).in(PmsTemProcessTrackPO::getObjId,ids);
this.update(lambdaUpdateWrapper);
}
}
return true;
}
}

131
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java
View File

@@ -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;
/**
* <p>
* 电能质量全过程管理用户 服务实现类
@@ -16,6 +46,103 @@ import org.springframework.stereotype.Service;
* @since 2024-10-09
*/
@Service
public class PmsTemUserServiceImpl extends ServiceImpl<PmsTemUserMapper, PmsTemUser> implements IPmsTemUserService {
@RequiredArgsConstructor
public class PmsTemUserServiceImpl extends ServiceImpl<PmsTemUserMapper, PmsTemUserPO> 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<String> ids) {
return this.removeByIds(ids);
}
@Override
public Page<PmsTemUserPO> pageList(PmsTemUserParam.QueryPmsTemUserParam parkQuery) {
List<String> deptCodes = deptFeignClient.getDepSonSelfCodetByDeptId(parkQuery.getMaintOrg()).getData();
LambdaQueryWrapper<PmsTemUserPO> 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<String> ids) {
LambdaQueryWrapper<PmsTemUserPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(PmsTemUserPO::getObjId,ids);
List<PmsTemUserPO> pmsTemUserPOList = this.list(lambdaQueryWrapper);
if(CollUtil.isEmpty(pmsTemUserPOList)){
throw new BusinessException("查询用户临时档案数据为空");
}
List<List<PmsTemUserPO>> list = CollUtil.split(pmsTemUserPOList,100);
for(int i=0;i<list.size();i++){
SendParam sendParam = new SendParam();
if(i==0){
sendParam.setIsAppend("0");
}else if(i==list.size()-1){
sendParam.setIsAppend("2");
}else {
sendParam.setIsAppend("1");
}
sendParam.setStats(list.get(i));
Map<String, String> sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.TEMP_USER_CREATE);
List<String> 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<PmsTemUserPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.set(PmsTemUserPO::getUploadStatus,1).in(PmsTemUserPO::getObjId,ids);
this.update(lambdaUpdateWrapper);
}
}
return true;
}
private void assOrg(PmsTemUserPO pmsTemUserPO){
List<PvTerminalTreeVO> deptTreeVOList = deptFeignClient.allDeptList().getData();
List<PvTerminalTreeVO> provinceList = deptTreeVOList.stream().filter(item->item.getLevel() == 1).collect(Collectors.toList());
pmsTemUserPO.setProvinceOrg(provinceList.get(0).getCode());
pmsTemUserPO.setProvinceOrgName(provinceList.get(0).getName());
Map<String,PvTerminalTreeVO> deptCodeMap = deptTreeVOList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getCode, Function.identity()));
Map<String,PvTerminalTreeVO> 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("请选择正确的运维单位！");
}
}
}

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadMainMonitorServiceImpl.java
View File

@@ -147,7 +147,7 @@ public class RUploadMainMonitorServiceImpl extends ServiceImpl<RUploadMainMonito
}
sendParam.setStats(list.get(i));
Map<String, String> sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.COMM_POINT);
Map<String, String> sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.MAIN_MONITOR);
List<String> ids = list.get(i).stream().map(RUploadMainMonitorDataDTO::getObjId).collect(Collectors.toList());
int count = GwSendUtil.returnInfoMsg(ids,sendRes);
System.out.println("上送成功,上送成功返回"+count+"条");

4
pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataTypeEnum.java
View File

@@ -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"),

1
pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/DictDataCache.java
View File

@@ -28,5 +28,6 @@ public class DictDataCache implements Serializable {
private String typeCode;
private Integer algoDescribe;
}

1
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictTypeMapper.xml
View File

@@ -9,6 +9,7 @@
t1.code code,
t1.sort sort,
t1.value,
t1.Algo_Describe,
t2.id typeId,
t2.name typeName,
t2.code typeCode

1
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictTypeServiceImpl.java
View File

@@ -104,6 +104,7 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, DictType> 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);