Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

pms台账修改

Browse Source
This commit is contained in:
雨木c
2023-04-03 16:31:22 +08:00
parent 91bdf291ab
commit 7f6db2b66c
8 changed files with 196 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java
View File

@@ -1,5 +1,6 @@
package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import lombok.Data;
@@ -101,6 +102,12 @@ public class Monitor extends BaseEntity {
*/
private Float userAgreementCapacity;
/**
* 基准短路容量
*/
@TableField(exist = false)
private Float standShortCapacity;
/**
* 电压偏差限值（上）
*/

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.biz.utils.COverlimit;
import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
import com.njcn.device.pms.mapper.majornetwork.*;
import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
@@ -71,6 +72,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
private final IDistributionMonitorService iDistributionMonitorService;
@Override
public List<PmsMonitorBaseDTO> getMonitorByCondition(List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
return this.baseMapper.getMonitorByCondition(deptIdList, pmsDeviceInfoParam);
@@ -158,7 +160,13 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
.like(Monitor::getOrgName, baseParam.getSearchValue()))
.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode())
.orderByDesc(Monitor::getCreateTime);
return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
Page<Monitor> page = this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
Map<String, DictData> map = dictDataList.stream().collect(Collectors.toMap(DictData::getId,Function.identity()));
List<Monitor> tem = page.getRecords().stream().peek(item-> item.setStandShortCapacity(COverlimit.getStandShortCap(map.get(item.getVoltageLevel()).getValue()))).collect(Collectors.toList());
page.setRecords(tem);
return page;
}
@Override
@@ -203,6 +211,13 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
specialMonitor.setCapacity(100f);
specialMonitor.setType(1);
specialMonitorMapper.insert(specialMonitor);
//主网测点限值计算
DictData dictData = dicDataFeignClient.getDicDataById(monitor.getVoltageLevel()).getData();
float standShort = COverlimit.getStandShortCap(dictData.getValue());
Overlimit overlimit = new Overlimit(monitor.getId(),dictData.getValue(),monitor.getMinShortCircuitCapacity(),standShort,monitor.getUserAgreementCapacity(),monitor.getPowerSupplyEqCapacity());
overlimitMapper.deleteById(monitor.getId());
overlimitMapper.insert(overlimit);
return true;
}
@@ -222,6 +237,13 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
specialMonitor.setCapacity(100f);
specialMonitor.setType(1);
specialMonitorMapper.updateById(specialMonitor);
//主网测点限值计算
DictData dictData = dicDataFeignClient.getDicDataById(monitor.getVoltageLevel()).getData();
float standShort = COverlimit.getStandShortCap(dictData.getValue());
Overlimit overlimit = new Overlimit(monitor.getId(),dictData.getValue(),monitor.getMinShortCircuitCapacity(),standShort,monitor.getUserAgreementCapacity(),monitor.getPowerSupplyEqCapacity());
overlimitMapper.deleteById(monitor.getId());
overlimitMapper.insert(overlimit);
return true;
}
@@ -233,6 +255,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
iDistributionMonitorService.removeByIds(monitorIds);
this.removeByIds(monitorIds);
specialMonitorMapper.deleteBatchIds(monitorIds);
overlimitMapper.deleteBatchIds(monitorIds);
return true;
}
@@ -387,4 +410,8 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
}
}