From 2f84ace8f1659e7b5c1acac3ec3756202c424008 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Mon, 18 Nov 2024 16:35:15 +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 --- .../majornetwork/impl/GeneratrixWireImpl.java | 19 ++++++++++++++++--- .../device/pq/mapper/mapping/LineMapper.xml | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java index 6c9a49cad..5cebdeecd 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java @@ -11,9 +11,7 @@ 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.PmsDeviceResponseEnum; -import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixWireMapper; -import com.njcn.device.pms.mapper.majornetwork.PmsMidLedgerMapper; -import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper; +import com.njcn.device.pms.mapper.majornetwork.*; import com.njcn.device.pms.mapper.majornetwork.PmsMidLedgerMapper; import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO; @@ -23,16 +21,19 @@ import com.njcn.device.pms.pojo.param.GeneratrixWireParam; import com.njcn.device.pms.pojo.param.PmsBaseParam; import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; import com.njcn.device.pms.pojo.po.GeneratrixWire; +import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.device.pms.pojo.po.PmsMidLedger; import com.njcn.device.pms.pojo.po.StatationStat; import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService; import com.njcn.device.pms.service.majornetwork.IStatationStatService; +import com.njcn.event.pojo.po.PmsMonitorPO; import com.njcn.user.api.DeptFeignClient; import com.njcn.web.factory.PageFactory; 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.util.ArrayList; import java.util.List; @@ -57,6 +58,8 @@ public class GeneratrixWireImpl extends ServiceImpl lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.set(Monitor::getLineName,generatrixWireParam.getName()) + .eq(Monitor::getLineId,generatrixWireVa.getId()); + monitorMapper.update(null,lambdaUpdateWrapper); + } + GeneratrixWire generatrixWire = new GeneratrixWire(); BeanUtils.copyProperties(generatrixWireParam, generatrixWire); return this.updateById(generatrixWire); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 5ec762138..fee2b7491 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -661,7 +661,7 @@ AND B.Scale = C.Id - SELECT A.Id, A.Name,