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-11-18 16:35:15 +08:00
parent 5cc21b6289
commit 2f84ace8f1
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java
View File

@@ -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<PmsGeneratrixWireMapper, Gen
private final StatationStatMapper statationStatMapper;
private final MonitorMapper monitorMapper;
@Override
public boolean addGeneratrixWire(GeneratrixWireParam generatrixWireParam) {
checkName(generatrixWireParam, false);
@@ -68,12 +71,22 @@ public class GeneratrixWireImpl extends ServiceImpl<PmsGeneratrixWireMapper, Gen
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean updateGeneratrixWire(GeneratrixWireParam generatrixWireParam) {
checkName(generatrixWireParam, true);
GeneratrixWire generatrixWireVa = this.getById(generatrixWireParam.getId());
if (Objects.isNull(generatrixWireVa)) {
throw new BusinessException(PmsDeviceResponseEnum.VOLTAGE_EMPTY);
}
if(!generatrixWireParam.getName().equals(generatrixWireVa.getName())){
//名称变更需要同步修改其他台账表的母线测点名称
LambdaUpdateWrapper<Monitor> 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);

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
View File

@@ -661,7 +661,7 @@
AND B.Scale = C.Id
</select>
<select id="getLineInfo" resultType="PollutionLineDTO">
<select id="getLineInfo" resultType="com.njcn.device.biz.pojo.dto.PollutionLineDTO">
SELECT
A.Id,
A.Name,