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 913fd3a17..5e3a4bde0 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 @@ -52,6 +52,7 @@ public enum GWSendEnum { COMM_POINT("commPoint","/powerQuality/publicConnection/pqBusMonitorDataStatisticalCreate"), MAIN_MONITOR("mainMonitor","/powerQuality/runStatistics/monitorStatisticsCreate"), TEMP_USER_CREATE("tempUserCreate","/powerQuality/process/tempUserCreate"), + TEMP_PROCESS_TRACK_CREATE("tempProcessTrackCreate","/powerQuality/process/processFollowCreate"), MONTH_REPORT_CREATE("monthReportCreate","/powerQuality/process/monthReportCreate"), PROCESS_APPROVAL_CREATE("processApprovalCreate","powerQuality/process/processApprovalCreate") ; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessApprovalParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessApprovalParam.java index 4fdc804e2..b1ae99d09 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessApprovalParam.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessApprovalParam.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; +import javax.validation.constraints.NotBlank; import java.time.LocalDateTime; /** @@ -31,11 +32,15 @@ public class PmsTemProcessApprovalParam { /** * 关联临时用户档案主键 */ + @NotBlank(message = "关联临时用户档案不可为空") private String tempUserDossierId; + private String tempUserDossierName; + /** * 验收参与人 */ + @NotBlank(message = "验收参与人不可为空") private String approvalJoinUserId; /** @@ -48,26 +53,17 @@ public class PmsTemProcessApprovalParam { */ private String approvalAdvise; - /** - * 新增时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime updateTime; /** * 遗留问题 */ + @NotBlank(message = "遗留问题不可为空") private String legacyProblem; /** * 整改状态（是否整改） */ + @NotBlank(message = "整改状态不可为空") private String rectificationStatus; /** diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java index 870f21794..d05d5979f 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java @@ -1,10 +1,11 @@ package com.njcn.harmonic.pojo.po.upload; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.time.LocalDateTime; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.njcn.db.bo.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,7 +22,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName(value = "pms_tem_process_approval") -public class PmsTemProcessApproval { +public class PmsTemProcessApproval extends BaseEntity { /** * 主键 */ @@ -34,6 +35,14 @@ public class PmsTemProcessApproval { @TableField(value = "temp_user_dossier_id") private String tempUserDossierId; + private String tempUserDossierName; + + @TableField(exist = false) + private String maintOrg; + + @TableField(exist = false) + private String maintOrgName; + /** * 验收参与人 */ @@ -52,17 +61,6 @@ public class PmsTemProcessApproval { @TableField(value = "approval_advise") private String approvalAdvise; - /** - * 新增时间 - */ - @TableField(value = "create_time") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @TableField(value = "update_time") - private LocalDateTime updateTime; /** * 遗留问题 @@ -79,7 +77,8 @@ public class PmsTemProcessApproval { /** * 整改时间 */ - @TableField(value = "rectification_time") + @TableField(value = "rectification_time",updateStrategy = FieldStrategy.IGNORED) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime rectificationTime; /** diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java index c4dddb29c..d6a8b89bd 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java @@ -1,5 +1,7 @@ package com.njcn.harmonic.pojo.po.upload; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -142,12 +144,14 @@ public class PmsTemUserPO extends BaseEntity { * 投运日期 */ @JsonFormat(pattern = "yyyy-MM-dd") + @TableField(updateStrategy = FieldStrategy.IGNORED) private LocalDate operateTime; /** * 发布时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(updateStrategy = FieldStrategy.IGNORED) private LocalDateTime releaseTime; /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java index c496c068f..5ebddc797 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java @@ -8,18 +8,22 @@ 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.mapper.upload.PmsTemUserMapper; import com.njcn.harmonic.pojo.param.upload.PmsTemProcessApprovalParam; import com.njcn.harmonic.pojo.param.upload.PmsTemProcessTrackParam; import com.njcn.harmonic.pojo.po.upload.PmsTemProcessApproval; import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO; +import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO; import com.njcn.harmonic.service.upload.PmsTemProcessApprovalService; import com.njcn.web.controller.BaseController; 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.*; import java.util.List; +import java.util.Objects; /** *

@@ -36,10 +40,12 @@ public class PmsTemProcessApprovalController extends BaseController { private final PmsTemProcessApprovalService pmsTemProcessApprovalService; + private final PmsTemUserMapper pmsTemUserMapper; + @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) @PostMapping("/create") @ApiOperation("新增电能质量评估问题整改数据") - public HttpResult createOrUpdate(@RequestBody PmsTemProcessApprovalParam param) { + public HttpResult createOrUpdate(@RequestBody @Validated PmsTemProcessApprovalParam param) { String methodDescribe = getMethodDescribe("createOrUpdate"); Boolean result = pmsTemProcessApprovalService.createOrUpdate(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); @@ -70,6 +76,11 @@ public class PmsTemProcessApprovalController extends BaseController { public HttpResult getById(@RequestParam("id") String id) { String methodDescribe = getMethodDescribe("getById"); PmsTemProcessApproval result = pmsTemProcessApprovalService.getById(id); + if(Objects.nonNull(result.getTempUserDossierId())){ + PmsTemUserPO temUserPO = pmsTemUserMapper.selectById(result.getTempUserDossierId()); + result.setMaintOrg(temUserPO.getMaintOrg()); + result.setMaintOrgName(temUserPO.getMaintOrgName()); + } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } 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 c08ff74ca..8a70904df 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,15 @@ 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.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.PmsTemUserParam; +import com.njcn.harmonic.pojo.po.upload.PmsTemProcessReport; +import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO; import com.njcn.harmonic.service.upload.IPmsTemProcessReportService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -45,5 +49,25 @@ public class PmsTemProcessReportController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getList") + @ApiOperation("查询月报") + public HttpResult> pageList(@RequestBody PmsTemUserParam.QueryPmsTemUserParam param) { + String methodDescribe = getMethodDescribe("getList"); + List result = iPmsTemProcessReportService.getList(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/dayCalReport") + @ApiOperation("每日计算评估问题") + public HttpResult dayCalReport() { + String methodDescribe = getMethodDescribe("dayCalReport"); + iPmsTemProcessReportService.dayCalReport(); + 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 82b2f2cc4..cf983f460 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 @@ -82,6 +82,16 @@ public class PmsTemUserController extends BaseController { } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/selectList") + @ApiOperation("查询下拉") + public HttpResult> selectList(@RequestBody PmsTemUserParam.QueryPmsTemUserParam param) { + String methodDescribe = getMethodDescribe("selectList"); + List result = iPmsTemUserService.selectList(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/upGwTemUser") 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 2691af8e9..2bd9dd503 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 @@ -1,8 +1,11 @@ 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.param.upload.PmsTemUserParam; import com.njcn.harmonic.pojo.po.upload.PmsTemProcessReport; +import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO; import java.util.List; @@ -18,4 +21,10 @@ public interface IPmsTemProcessReportService extends IService ids); + + + List getList(PmsTemUserParam.QueryPmsTemUserParam param); + + + Boolean dayCalReport(); } 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 899206cc0..518aa074d 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 @@ -34,6 +34,8 @@ public interface IPmsTemUserService extends IService { Page pageList(PmsTemUserParam.QueryPmsTemUserParam param); + List selectList(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 374b25b0e..f783a01a3 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 @@ -4,15 +4,20 @@ 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.plugins.pagination.Page; 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.mapper.upload.PmsTemUserMapper; +import com.njcn.harmonic.pojo.param.upload.PmsTemUserParam; import com.njcn.harmonic.pojo.po.upload.PmsTemProcessReport; import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO; +import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO; 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 lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; @@ -28,8 +33,10 @@ import java.util.stream.Collectors; * @since 2024-10-09 */ @Service +@RequiredArgsConstructor public class PmsTemProcessReportServiceImpl extends ServiceImpl implements IPmsTemProcessReportService { + private final PmsTemUserMapper pmsTemUserMapper; @Override @@ -64,4 +71,20 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl getList(PmsTemUserParam.QueryPmsTemUserParam param) { + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(PmsTemProcessReport::getStatisticalDate,param.getSearchBeginTime()); + return this.list(lambdaQueryWrapper); + } + + @Override + public Boolean dayCalReport() { + + + + return null; + } } 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 1471dc8e0..4027f612c 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 @@ -106,7 +106,7 @@ public class PmsTemProcessTrackServiceImpl extends ServiceImpl sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.TEMP_USER_CREATE); + Map sendRes = GwSendUtil.newSend(sendParam, GWSendEnum.TEMP_PROCESS_TRACK_CREATE); List TemProcessTrackPOIds = list.get(i).stream().map(PmsTemProcessTrackPO::getObjId).collect(Collectors.toList()); int count = GwSendUtil.returnInfoMsg(TemProcessTrackPOIds,sendRes); System.out.println("上送成功,上送成功返回"+count+"条"); 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 52df1cd6f..0a3c6e7c2 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 @@ -13,12 +13,15 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pms.enums.PmsEnum; +import com.njcn.harmonic.mapper.upload.PmsTemProcessTrackMapper; import com.njcn.harmonic.mapper.upload.PmsTemUserMapper; 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.PmsTemProcessTrackPO; import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO; import com.njcn.harmonic.pojo.po.upload.RUploadMainMonitorData; +import com.njcn.harmonic.service.upload.IPmsTemProcessTrackService; import com.njcn.harmonic.service.upload.IPmsTemUserService; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.vo.DeptTreeVO; @@ -30,7 +33,9 @@ import com.njcn.web.utils.GwSendUtil; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -51,6 +56,8 @@ public class PmsTemUserServiceImpl extends ServiceImpl ids) { - return this.removeByIds(ids); + this.removeByIds(ids); + pmsTemProcessTrackMapper.delete(new LambdaQueryWrapper().in(PmsTemProcessTrackPO::getTempUserDossierId,ids)); + return true; } @Override @@ -87,6 +97,18 @@ public class PmsTemUserServiceImpl extends ServiceImpl(PageFactory.getPageNum(parkQuery), PageFactory.getPageSize(parkQuery)), lambdaQueryWrapper); } + @Override + public List selectList(PmsTemUserParam.QueryPmsTemUserParam param) { + if(StrUtil.isBlank(param.getMaintOrg())){ + throw new BusinessException("请选择单位组织"); + } + List deptCodes = deptFeignClient.getDepSonSelfCodetByCode(param.getMaintOrg()).getData(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.select(PmsTemUserPO::getObjId,PmsTemUserPO::getConsName) + .in(PmsTemUserPO::getMaintOrg, deptCodes).orderByDesc(PmsTemUserPO::getCreateTime, PmsTemUserPO::getCityOrgName); + return this.list(lambdaQueryWrapper); + } + @Override public Boolean upGwTemUser(List ids) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();