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

bug修改

Browse Source
This commit is contained in:
雨木c
2023-05-18 15:00:49 +08:00
parent 13b6ae6f13
commit 16c933d631
7 changed files with 147 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqLedgerDeptController.java
View File

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
/**
@@ -35,6 +36,7 @@ public class PqLedgerDeptController extends BaseController {
* @date 2023/5/17
*/
@PostMapping("update")
@ApiIgnore
public HttpResult<Object> updateLedger(@RequestBody Dept dept){
String methodDescribe = getMethodDescribe("updateLedger");
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);

58
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -395,34 +395,44 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
//删除与当前线路号重复的项
listLineNum.removeIf(lineNo -> lineNo.equals(lineParam.getNum()));
HttpResult<DictData> httpScale = dicDataFeignClient.getDicDataById(subVoltageParam.getScale());
Float jcap = DeviceUtil.getJCAPByScale(httpScale.getData().getName());
Line line = assembleLine(lineParam.getName(), LineBaseEnum.LINE_LEVEL.getCode(), subvIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex + StrUtil.COMMA + subIndex + StrUtil.COMMA + devIdIndex + StrUtil.COMMA + subvIndex, lineParam.getSort());
this.baseMapper.insert(line);
LineDetail lineDetail = new LineDetail();
BeanUtils.copyProperties(lineParam, lineDetail);
lineDetail.setId(line.getId());
lineDetail.setStandardCapacity(jcap);
//判断国网监测点id
if (StrUtil.isNotBlank(lineDetail.getMonitorId())) {
lineDetail.setMonitorFlag(1);
} else {
lineDetail.setMonitorFlag(0);
}
lineDetailMapper.insert(lineDetail);
//通过监测点id获取母线电压等级
Voltage voltage = lineMapper.getVoltageByLineId(line.getId());
//监测点限值
HttpResult<DictData> scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale());
String scaTmp = scaleResult.getData().getValue();
Overlimit overlimit = new Overlimit(line.getId(), scaTmp, lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity());
DictData scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()).getData();
float scaTmp = Float.parseFloat(scaleResult.getValue());
Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp,lineDetail.getDealCapacity(),lineDetail.getDevCapacity(),lineDetail.getShortCapacity(),1,1);
if(Objects.isNull(lineParam.getVoltageDev())){
overlimit.setVoltageDev(overlimit.getVoltageDev());
}else {
overlimit.setVoltageDev(lineParam.getVoltageDev());
}
if(Objects.isNull(lineParam.getUvoltageDev())){
overlimit.setUvoltageDev(overlimit.getUvoltageDev());
}else {
overlimit.setUvoltageDev(lineParam.getUvoltageDev());
}
//Overlimit overlimit = new Overlimit(line.getId(), scaTmp, lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity());
overlimitMapper.deleteById(line.getId());
//页面存在自己填写的电压上下偏差
overlimit.setVoltageDev(lineParam.getVoltageDev());
overlimit.setUvoltageDev(lineParam.getUvoltageDev());
overlimit.setId(line.getId());
overlimitMapper.insert(overlimit);
}
}
@@ -706,15 +716,25 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
|| ((!overlimitTem.getUvoltageDev().equals(updateLineBO.getUvoltageDev()))))
) {
overlimitMapper.deleteById(line.getId());
//监测点限值
HttpResult<DictData> scaleResult = dicDataFeignClient.getDicDataById(updateSubVoltageParam.getScale());
if (Objects.isNull(scaleResult.getData())) {
throw new BusinessException(CommonResponseEnum.DIC_DATA);
DictData scaleResult = dicDataFeignClient.getDicDataById(updateSubVoltageParam.getScale()).getData();
float scaTmp = Float.parseFloat(scaleResult.getValue());
//监测点限值
Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp,lineDetail.getDealCapacity(),lineDetail.getDevCapacity(),lineDetail.getShortCapacity(),1,1);
if(Objects.isNull(updateLineBO.getVoltageDev())){
overlimit.setVoltageDev(overlimit.getVoltageDev());
}else {
overlimit.setVoltageDev(updateLineBO.getVoltageDev());
}
Overlimit overlimit = new Overlimit(line.getId(), scaleResult.getData().getValue(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity());
overlimit.setVoltageDev(updateLineBO.getVoltageDev());
overlimit.setUvoltageDev(updateLineBO.getUvoltageDev());
if(Objects.isNull(updateLineBO.getUvoltageDev())){
overlimit.setUvoltageDev(overlimit.getUvoltageDev());
}else {
overlimit.setUvoltageDev(updateLineBO.getUvoltageDev());
}
overlimit.setId(line.getId());
overlimitMapper.deleteById(line.getId());
overlimitMapper.insert(overlimit);
}
if (!Objects.equals(lineDetail.getCt1(), lineDetailRes.getCt1()) || !Objects.equals(lineDetail.getCt2(), lineDetailRes.getCt2())
@@ -1604,10 +1624,10 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
List<LineDetail> lineDetailList = lineDetailMapper.selectList(new LambdaQueryWrapper<>());
int count = 0;
for(LineDetail lineDetail:lineDetailList){
for (LineDetail lineDetail : lineDetailList) {
overlimitMapper.deleteById(lineDetail.getId());
Line line = lineMapper.selectById(lineDetail.getId());
if(Objects.nonNull(line)) {
if (Objects.nonNull(line)) {
Voltage voltage = voltageMapper.selectById(line.getPid());
//监测点限值
DictData scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()).getData();
@@ -1617,7 +1637,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
float voltageLevel = Float.parseFloat(scaleResult.getValue());
Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1,1);
Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 1);
overlimit.setId(lineDetail.getId());
overlimitMapper.insert(overlimit);
count++;