From ba4f6124b661c3723c868eb8593c34dc3c318ba2 Mon Sep 17 00:00:00 2001 From: wurui Date: Fri, 24 Mar 2023 16:30:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8F=98=E5=8E=8B=E5=99=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=202.=E4=BC=98=E5=8C=96=E7=AD=96=E7=95=A5,?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E6=B7=BB=E5=8A=A0=E5=92=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9A=84=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/enums/PmsDeviceResponseEnum.java | 1 + .../pms/pojo/param/TransformerParam.java | 15 +++++++- .../njcn/device/pms/pojo/po/Transformer.java | 6 ++-- .../majornetwork/PowerClientMapper.java | 3 +- .../PowerGenerationUserMapper.java | 3 +- .../mapping/PowerClientMapper.xml | 3 ++ .../mapping/PowerGenerationUserMapper.xml | 3 ++ .../majornetwork/ITransformerService.java | 7 ++-- .../impl/PowerClientServiceImpl.java | 2 +- .../impl/PowerGenerationUserServiceImpl.java | 2 +- .../impl/TransformerServiceImpl.java | 16 +++++++-- .../process/enums/ProcessResponseEnum.java | 1 + .../process/pojo/param/TerminalParam.java | 4 +-- .../service/PmsTerminalDetectionService.java | 2 +- .../impl/PmsTerminalDetectionServiceImpl.java | 34 +++++++++++++------ .../impl/ThsWarnStrategyServiceImpl.java | 1 - 16 files changed, 75 insertions(+), 28 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java index dca56ec81..45575fbc5 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java @@ -55,6 +55,7 @@ public enum PmsDeviceResponseEnum { DIS_MONITOR_BIND_FIND("A00353","配网监测点存在绑定该装置关系,请先解除绑定关系"), TERMINAL_BIND_FIND("A00354","装置管理存在绑定该电站关系,请先解除绑定关系"), WIRE_BIND_FIND("A00355","线路台账存在绑定该电站关系,请先解除绑定关系"), + TRANSFORMER_ID_REPEAT("A00355","变压器编号重复"), ; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TransformerParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TransformerParam.java index 81f985505..e3f8dddad 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TransformerParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TransformerParam.java @@ -1,8 +1,12 @@ package com.njcn.device.pms.pojo.param; +import com.njcn.db.bo.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * <功能描述> * @@ -10,36 +14,45 @@ import lombok.Data; * @createTime: 2023-02-22 */ @Data -public class TransformerParam { +public class TransformerParam extends BaseEntity { @ApiModelProperty(value = "变压器id") + @NotBlank(message = "变压器编号不能为空") private String id; @ApiModelProperty(value = "变压器名称") + @NotBlank(message = "变压器名称不能为空") private String name; @ApiModelProperty(value = "变电站ID") + @NotBlank(message = "变电站编号不能为空") private String powerId; @ApiModelProperty(value = "变电站名称") + @NotBlank(message = "变电站名称不能为空") private String powerName; @ApiModelProperty(value = "所属部门id") + @NotBlank(message = "部门编号不能为空") private String orgId; @ApiModelProperty(value = "所属部门名称") + @NotBlank(message = "部门名称不能为空") private String orgName; @ApiModelProperty(value = "变压器类型") + @NotBlank(message = "变压器类型不能为空") private String type; @ApiModelProperty(value = "装机容量") private Float iCapacity; @ApiModelProperty(value = "额定容量") + @NotNull(message = "额定容量不能为空") private Float rCapacity; @ApiModelProperty(value = "额定电压（字典）") + @NotBlank(message = "额定电压不能为空") private String voltage; @ApiModelProperty(value = "额定功率") diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Transformer.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Transformer.java index d8024e61c..f5c0bd785 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Transformer.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Transformer.java @@ -1,9 +1,6 @@ package com.njcn.device.pms.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.njcn.db.bo.BaseEntity; import java.time.LocalDateTime; @@ -65,6 +62,7 @@ public class Transformer extends BaseEntity { @ApiModelProperty(value = "数据状态：0-删除；1-正常； ") @TableField("Status") + @TableLogic(value="1",delval="0") private Integer status; } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerClientMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerClientMapper.java index aa300d4b4..ed8a0f2b9 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerClientMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerClientMapper.java @@ -18,6 +18,7 @@ import java.util.List; public interface PowerClientMapper extends BaseMapper { - List getPowerClientSelect(@Param("orgIds") List orgIds); + List getPowerClientSelect(@Param("orgIds") List orgIds, + @Param("id") String id); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerGenerationUserMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerGenerationUserMapper.java index 10ac8fca0..68d0321cf 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerGenerationUserMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PowerGenerationUserMapper.java @@ -19,6 +19,7 @@ import java.util.List; public interface PowerGenerationUserMapper extends BaseMapper { - List getPowerGenerationUserSelect(@Param("orgIds") List orgIds); + List getPowerGenerationUserSelect(@Param("orgIds") List orgIds, + @Param("id") String id); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerClientMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerClientMapper.xml index cd53506a2..4ff085c0f 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerClientMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerClientMapper.xml @@ -23,5 +23,8 @@ #{item} + + and pms_power_client.id like CONCAT(CONCAT('%', #{id}), '%') + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerGenerationUserMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerGenerationUserMapper.xml index 7e25558a2..8a19a55d7 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerGenerationUserMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/PowerGenerationUserMapper.xml @@ -24,5 +24,8 @@ #{item} + + and pms_power_generation_user.id like CONCAT(CONCAT('%', #{id}), '%') + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITransformerService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITransformerService.java index 1b5f76a6c..dfb67b1b1 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITransformerService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITransformerService.java @@ -54,11 +54,12 @@ public interface ITransformerService extends IService { */ boolean delTransformer(List ids); - /** + /*** * 修改变压器台账数据状态 - * + * @author wr + * @date 2023-03-24 15:01 * @param monitorParam - * @return + * @return boolean */ boolean updateStatus(MonitorStatus.Status monitorParam); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java index 71b2a0fa7..bc8bfca49 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java @@ -90,7 +90,7 @@ public class PowerClientServiceImpl extends ServiceImpl implements ITransformerService { + private final DeptFeignClient deptFeignClient; + @Override public Page getAllTransformerList(MonitorAuditParam baseParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -43,11 +53,13 @@ public class TransformerServiceImpl extends ServiceImpl() - .eq(Transformer::getName, param.getName()) + .eq(Transformer::getId, param.getId()) .eq(Transformer::getStatus, DataStateEnum.ENABLE.getCode()) ); - Assert.isTrue(count == 0 , "变压器名称重复，请重新编写变压器名称"); + if(count>0){ + throw new BusinessException(PmsDeviceResponseEnum.TRANSFORMER_ID_REPEAT); + } Transformer transformer = BeanUtil.copyProperties(param, Transformer.class); transformer.setStatus(1); return this.save(transformer); diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java b/pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java index f626c224b..727065796 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java @@ -21,6 +21,7 @@ public enum ProcessResponseEnum { QUERY_IS_EMPTY("A00554","当前未查询到当前策略信息，无法删除!"), ENABLED_CANNOT_BE_DELETED("A00555","策略为启用状态不能删除!"), THERE_IS_ONLY_ONE_STRATEGY("A00556","各个策略等级，通用策略只能有一条!"), + TERMINAL_ID_REPEAT("A00351","终端编号已存在"), ; private final String code; diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/TerminalParam.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/TerminalParam.java index 2479b95db..644a22323 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/TerminalParam.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/TerminalParam.java @@ -89,7 +89,7 @@ public class TerminalParam { private String installPlace; @ApiModelProperty(value = "检测时间") - private String inspectionTime; + private LocalDate inspectionTime; @ApiModelProperty(value = "送检单位") private String inspectionUnit; @@ -129,7 +129,7 @@ public class TerminalParam { private String installPlace; @ApiModelProperty(value = "检测时间") - private String inspectionTime; + private LocalDate inspectionTime; @ApiModelProperty(value = "送检单位") private String inspectionUnit; diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/PmsTerminalDetectionService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/PmsTerminalDetectionService.java index d0132f6d0..ea6936166 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/PmsTerminalDetectionService.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/PmsTerminalDetectionService.java @@ -46,7 +46,7 @@ public interface PmsTerminalDetectionService extends IService() + List list = this.list(new LambdaQueryWrapper() .eq(PmsTerminalDetection::getId, param.getId()) .or(wrapper -> wrapper.eq(PmsTerminalDetection::getName, param.getName()) ) ); - if (count > 0) { - throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT, "或终端编号已存在"); + if (CollectionUtil.isNotEmpty(list)) { + List collect = list.stream().map(PmsTerminalDetection::getName).collect(Collectors.toList()); + if(collect.contains(param.getName())){ + throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT); + } + throw new BusinessException(ProcessResponseEnum.TERMINAL_ID_REPEAT); } PmsTerminalDetection detection = BeanUtil.copyProperties(param, PmsTerminalDetection.class); detection.setOriginalName(detection.getId() + "-原始数据报告.docx"); detection.setOrgNo(data.getCode()); detection.setOrgName(data.getName()); + + LocalDate inspectionTime = param.getInspectionTime(); + detection.setNextInspectionTime(inspectionTime.plusYears(5)); detection.setTestResults(0); detection.setStatus(1); return this.save(detection); @@ -160,17 +168,21 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl() + List list = this.list(new LambdaQueryWrapper() .ne(PmsTerminalDetection::getId, param.getId()) .and(wrapper -> wrapper.eq(PmsTerminalDetection::getName, param.getName()) ) - ); - if (ObjectUtil.isNotNull(one)) { - throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT); + if (CollectionUtil.isNotEmpty(list)) { + List collect = list.stream().map(PmsTerminalDetection::getName).collect(Collectors.toList()); + if(collect.contains(param.getName())){ + throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT); + } } PmsTerminalDetection detection = BeanUtil.copyProperties(param, PmsTerminalDetection.class); + LocalDate inspectionTime = param.getInspectionTime(); + detection.setNextInspectionTime(inspectionTime.plusYears(5)); boolean b = this.updateById(detection); if (b) { PmsTerminalDetection cc = this.getOne(new LambdaQueryWrapper() @@ -243,7 +255,8 @@ public class PmsTerminalDetectionServiceImpl extends ServiceImpl