From 5cc21b6289bcd2f3011b35bf2ca7f97fdaec70f7 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Fri, 15 Nov 2024 15:50:10 +0800 Subject: [PATCH] =?UTF-8?q?1.pms=E5=8F=B0=E8=B4=A6=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/pojo/param/PowerClientParam.java | 26 +++--- .../njcn/device/pms/pojo/po/PowerClient.java | 16 ++++ .../impl/StatationStatServiceImpl.java | 87 +++++++++++-------- 3 files changed, 78 insertions(+), 51 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerClientParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerClientParam.java index 6aa748ed0..4c3c1835f 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerClientParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerClientParam.java @@ -86,49 +86,49 @@ public class PowerClientParam { * 合同容量 */ @ApiModelProperty(value = "合同容量",required = true) - @NotNull(message = "合同容量不可为空") + //@NotNull(message = "合同容量不可为空") private Float contractCapacity; /** * 运行容量 */ @ApiModelProperty(value = "运行容量",required = true) - @NotNull(message = "运行容量不可为空") + //@NotNull(message = "运行容量不可为空") private Float operatingCapacity; /** * 生产班次(字典) */ @ApiModelProperty(value = "生产班次(字典)",required = true) - @NotBlank(message = "生产班次不可为空") + //@NotBlank(message = "生产班次不可为空") private String productionShift; /** * 负荷性质(字典) */ @ApiModelProperty(value = "负荷性质(字典)",required = true) - @NotBlank(message = "负荷性质不可为空") + //@NotBlank(message = "负荷性质不可为空") private String loadNature; /** * 供电电压(字典) */ @ApiModelProperty(value = "供电电压(字典)",required = true) - @NotBlank(message = "供电电压不可为空") + //@NotBlank(message = "供电电压不可为空") private String voltageLevel; /** * 高耗能行业类别(字典) */ @ApiModelProperty(value = "高耗能行业类别(字典)",required = true) - @NotBlank(message = "高耗能行业类别不可为空") + //@NotBlank(message = "高耗能行业类别不可为空") private String highIndustryType; /** * 送电日期 */ @ApiModelProperty(value = "送电日期",required = true) - @NotNull(message = "送电日期不可为空") + //@NotNull(message = "送电日期不可为空") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDate powerTransmissionDate; @@ -136,42 +136,42 @@ public class PowerClientParam { * 重要性等级(字典) */ @ApiModelProperty(value = "重要性等级",required = true) - @NotBlank(message = "重要性等级不可为空") + //@NotBlank(message = "重要性等级不可为空") private String importanceLevel; /** * 用电客户状态(字典) */ @ApiModelProperty(value = "用电客户状态",required = true) - @NotBlank(message = "用电客户状态不可为空") + //@NotBlank(message = "用电客户状态不可为空") private String eccStat; /** * 是否敏感用户：0-否；1：是； */ @ApiModelProperty(value = "是否敏感用户",required = true) - @NotNull(message = "用户编号不可为空") + //@NotNull(message = "用户编号不可为空") private Integer ifSensitiveUser; /** * 是否影响电能质量：0-否；1：是； */ @ApiModelProperty(value = "是否影响电能质量：0-否；1：是；",required = true) - @NotNull(message = "是否影响电能质量不可为空") + //@NotNull(message = "是否影响电能质量不可为空") private Integer ifPowerQuality; /** * 是否重要客户：0-否；1：是； */ @ApiModelProperty(value = "是否重要客户：0-否；1：是；",required = true) - @NotNull(message = "是否重要客户不可为空") + //@NotNull(message = "是否重要客户不可为空") private Integer ifKeyCustomers; /** * 敏感用户类别(字典) */ @ApiModelProperty(value = "敏感用户类别",required = true) - @NotBlank(message = "敏感用户类别不可为空") + //@NotBlank(message = "敏感用户类别不可为空") private String sensitiveType; /** diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java index 92bc1215a..fba0b0be2 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java @@ -1,5 +1,7 @@ package com.njcn.device.pms.pojo.po; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; import lombok.Data; @@ -70,66 +72,79 @@ public class PowerClient extends BaseEntity { /** * 合同容量 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private Float contractCapacity; /** * 运行容量 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private Float operatingCapacity; /** * 生产班次(字典) */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String productionShift; /** * 负荷性质(字典) */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String loadNature; /** * 供电电压(字典) */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String voltageLevel; /** * 高耗能行业类别(字典) */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String highIndustryType; /** * 送电日期 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private LocalDate powerTransmissionDate; /** * 重要性等级(字典) */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String importanceLevel; /** * 用电客户状态(字典) */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String eccStat; /** * 是否敏感用户：0-否；1：是； */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private Integer ifSensitiveUser; /** * 是否影响电能质量：0-否；1：是； */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private Integer ifPowerQuality; /** * 是否重要客户：0-否；1：是； */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private Integer ifKeyCustomers; /** * 敏感用户类别(字典) */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String sensitiveType; /** @@ -150,6 +165,7 @@ public class PowerClient extends BaseEntity { /** * 用户标签 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String userTag; /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java index 8fc8e59be..d878a5a6a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java @@ -40,6 +40,7 @@ import com.njcn.web.pojo.param.BaseParam; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; @@ -119,6 +120,7 @@ public class StatationStatServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -130,51 +132,60 @@ public class StatationStatServiceImpl extends ServiceImpl monitorLambdaQueryWrapper = new LambdaQueryWrapper<>(); - monitorLambdaQueryWrapper.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).eq(Monitor::getPowerrId, statationStat.getPowerId()); + if(!res.getPowerName().equals(statationStatParam.getPowerName())) { + //修改单位名称时候要确保其他台账中的电站名同时修改 + LambdaQueryWrapper monitorLambdaQueryWrapper = new LambdaQueryWrapper<>(); + monitorLambdaQueryWrapper.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).eq(Monitor::getPowerrId, statationStat.getPowerId()); - //主网监测点 - List monitorList = iMonitorService.list(monitorLambdaQueryWrapper); - if (CollectionUtil.isNotEmpty(monitorList)) { - List monitorListP = monitorList.stream().map(item -> { - Monitor monitor = new Monitor(); - monitor.setPowerrName(statationStat.getPowerName()); - monitor.setId(item.getId()); - return monitor; - }).collect(Collectors.toList()); - iMonitorService.updateBatchById(monitorListP); - } - //台区 - LambdaQueryWrapper powerDistributionareaLambdaQueryWrapper = new LambdaQueryWrapper<>(); - powerDistributionareaLambdaQueryWrapper.eq(PowerDistributionarea::getStatus, DataStateEnum.ENABLE.getCode()).eq(PowerDistributionarea::getPowerStationId, statationStat.getPowerId()); + //主网监测点 + List monitorList = iMonitorService.list(monitorLambdaQueryWrapper); + if (CollectionUtil.isNotEmpty(monitorList)) { + List monitorListP = monitorList.stream().map(item -> { + Monitor monitor = new Monitor(); + monitor.setPowerrName(statationStat.getPowerName()); + monitor.setId(item.getId()); + return monitor; + }).collect(Collectors.toList()); + iMonitorService.updateBatchById(monitorListP); + } - List powerDistributionareaList = powerDistributionareaMapper.selectList(powerDistributionareaLambdaQueryWrapper); - if (CollectionUtil.isNotEmpty(powerDistributionareaList)) { - powerDistributionareaList.forEach(item -> { - PowerDistributionarea powerDistributionarea = new PowerDistributionarea(); - powerDistributionarea.setPowerrName(statationStat.getPowerName()); - powerDistributionarea.setId(item.getId()); - powerDistributionareaMapper.updateById(powerDistributionarea); - }); - } - //装置 - //台区 - LambdaQueryWrapper pmsTerminalLambdaQueryWrapper = new LambdaQueryWrapper<>(); - pmsTerminalLambdaQueryWrapper.eq(PmsTerminal::getStatus, DataStateEnum.ENABLE.getCode()).eq(PmsTerminal::getPowerStationId, statationStat.getPowerId()); + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(GeneratrixWire::getStationName,statationStatParam.getPowerName()) + .eq(GeneratrixWire::getStationId,statationStatParam.getPowerId()); + pmsGeneratrixWireMapper.update(null,lambdaUpdateWrapper); + //台区 + LambdaQueryWrapper powerDistributionareaLambdaQueryWrapper = new LambdaQueryWrapper<>(); + powerDistributionareaLambdaQueryWrapper.eq(PowerDistributionarea::getStatus, DataStateEnum.ENABLE.getCode()).eq(PowerDistributionarea::getPowerStationId, statationStat.getPowerId()); - List pmsTerminalList = terminalMapper.selectList(pmsTerminalLambdaQueryWrapper); - if (CollectionUtil.isNotEmpty(pmsTerminalList)) { - pmsTerminalList.forEach(item -> { - PmsTerminal pmsTerminalP = new PmsTerminal(); - pmsTerminalP.setPowerrName(statationStat.getPowerName()); - pmsTerminalP.setId(item.getId()); - terminalMapper.updateById(pmsTerminalP); - }); + List powerDistributionareaList = powerDistributionareaMapper.selectList(powerDistributionareaLambdaQueryWrapper); + if (CollectionUtil.isNotEmpty(powerDistributionareaList)) { + powerDistributionareaList.forEach(item -> { + PowerDistributionarea powerDistributionarea = new PowerDistributionarea(); + powerDistributionarea.setPowerrName(statationStat.getPowerName()); + powerDistributionarea.setId(item.getId()); + powerDistributionareaMapper.updateById(powerDistributionarea); + }); + } + //装置 + //台区 + LambdaQueryWrapper pmsTerminalLambdaQueryWrapper = new LambdaQueryWrapper<>(); + pmsTerminalLambdaQueryWrapper.eq(PmsTerminal::getStatus, DataStateEnum.ENABLE.getCode()).eq(PmsTerminal::getPowerStationId, statationStat.getPowerId()); + + List pmsTerminalList = terminalMapper.selectList(pmsTerminalLambdaQueryWrapper); + if (CollectionUtil.isNotEmpty(pmsTerminalList)) { + pmsTerminalList.forEach(item -> { + PmsTerminal pmsTerminalP = new PmsTerminal(); + pmsTerminalP.setPowerrName(statationStat.getPowerName()); + pmsTerminalP.setId(item.getId()); + terminalMapper.updateById(pmsTerminalP); + }); + } } return true; }