pms pq代码调整
This commit is contained in:
@@ -947,4 +947,7 @@ public class Overlimit implements Serializable {
|
||||
this.uharm49=resultOdd;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.njcn.device.biz.pojo.po.Overlimit;
|
||||
import com.njcn.system.enums.DicDataEnum;
|
||||
import com.njcn.system.pojo.po.Dic;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
|
||||
@@ -37,7 +38,7 @@ public class COverlimitUtil {
|
||||
* @param devCapacity 设备容量
|
||||
* @param shortCapacity 短路容量
|
||||
* @param powerFlag 0.用户侧 1.电网侧
|
||||
* @param lineType 0.主网 1.配网
|
||||
* @param lineType 0.主网 1.配网 需要注意配网目前没有四种容量,谐波电流幅值限值,负序电流限值无法计算默认-3.14159
|
||||
*/
|
||||
public static Overlimit globalAssemble(Float voltageLevel, Float protocolCapacity, Float devCapacity, Float shortCapacity, Integer powerFlag, Integer lineType) {
|
||||
Overlimit overlimit = new Overlimit();
|
||||
@@ -48,9 +49,22 @@ public class COverlimitUtil {
|
||||
totalHarmonicDistortion(overlimit,voltageLevel);
|
||||
uHarm(overlimit,voltageLevel);
|
||||
threeVoltageUnbalance(overlimit);
|
||||
interharmonicCurrent(overlimit,voltageLevel);
|
||||
|
||||
if(lineType == 1) {
|
||||
//配网
|
||||
Float[] iHarmTem = new Float[49];
|
||||
for (int i = 0; i <= 48; i++) {
|
||||
|
||||
iHarmTem[i] = -3.14159f;
|
||||
}
|
||||
overlimit.buildIHarm(iHarmTem);
|
||||
overlimit.setINeg(-3.14159f);
|
||||
}else {
|
||||
//主网
|
||||
iHarm(overlimit, voltageLevel, protocolCapacity, devCapacity, shortCapacity);
|
||||
negativeSequenceCurrent(overlimit, voltageLevel, shortCapacity);
|
||||
interharmonicCurrent(overlimit,voltageLevel);
|
||||
}
|
||||
return overlimit;
|
||||
}
|
||||
|
||||
|
||||
@@ -174,4 +174,18 @@ public class CommTerminalController extends BaseController {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 重新计算限值
|
||||
*
|
||||
* @author cdf
|
||||
* @date 2022/5/17
|
||||
*/
|
||||
@ApiOperation("监测点-重新计算限值")
|
||||
@GetMapping(value = "updatePmsOverLimit")
|
||||
public HttpResult<String> updatePmsOverLimit() {
|
||||
String methodDescribe = getMethodDescribe("updatePmsOverLimit");
|
||||
String count = commTerminalService.updatePmsOverLimit();
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, count, methodDescribe);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,196 +0,0 @@
|
||||
/*
|
||||
package com.njcn.device.pms.controller.ledgerManger;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
||||
import com.njcn.common.pojo.constant.OperateType;
|
||||
import com.njcn.common.pojo.enums.common.LogEnum;
|
||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.common.utils.HttpResultUtil;
|
||||
import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
|
||||
import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO;
|
||||
import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO;
|
||||
import com.njcn.device.pms.pojo.param.ConditionParam;
|
||||
import com.njcn.device.pms.pojo.param.GeneratrixParam;
|
||||
import com.njcn.device.pms.pojo.param.PmsBaseParam;
|
||||
import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
|
||||
import com.njcn.device.pms.pojo.po.Generatrix;
|
||||
import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
import com.njcn.web.pojo.param.BaseParam;
|
||||
import io.swagger.annotations.*;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
*/
|
||||
/**
|
||||
* 母线信息
|
||||
*
|
||||
* @author yzh
|
||||
* @date 2022/10/18
|
||||
*//*
|
||||
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/pmsGeneratrix")
|
||||
@Slf4j
|
||||
@Api(tags = "台账-母线信息")
|
||||
@RequiredArgsConstructor
|
||||
public class PmsGeneratrixController extends BaseController {
|
||||
|
||||
private final IPmsGeneratrixService pmsGeneratrixService;
|
||||
|
||||
*/
|
||||
/**
|
||||
* 获取指定母线信息
|
||||
*
|
||||
* @param param 获取指定的监测点信息条件
|
||||
* @return 指定母线信息
|
||||
*//*
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/getGeneratrixInfo")
|
||||
@ApiOperation("获取指定母线信息")
|
||||
@ApiImplicitParam(name = "param", value = "获取指定母线信息条件", required = true)
|
||||
public HttpResult<List<PmsGeneratrixDTO>> getGeneratrixInfo(@RequestBody @Validated PmsGeneratrixParam param) {
|
||||
String methodDescribe = getMethodDescribe("getGeneratrixInfo");
|
||||
List<PmsGeneratrixDTO> monitorInfo = pmsGeneratrixService.getGeneratrixInfo(param);
|
||||
if (CollectionUtil.isEmpty(monitorInfo)) {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
|
||||
} else {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorInfo, methodDescribe);
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
/**
|
||||
* 获取母线与电站关联信息
|
||||
*
|
||||
* @param param 条件参数
|
||||
* @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO>>
|
||||
* @author yzh
|
||||
* @date 2022/11/3
|
||||
*//*
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/getGeneratrixAndPowerStationInfo")
|
||||
@ApiOperation("获取母线与电站关联信息")
|
||||
@ApiImplicitParam(name = "param", value = "条件参数", required = true)
|
||||
public HttpResult<List<GeneratrixAndPowerStationDTO>> getGeneratrixAndPowerStationInfo(@RequestBody @Validated PmsGeneratrixParam param) {
|
||||
String methodDescribe = getMethodDescribe("getGeneratrixAndPowerStationInfo");
|
||||
List<GeneratrixAndPowerStationDTO> monitorInfo = pmsGeneratrixService.getGeneratrixAndPowerStationInfo(param);
|
||||
if (CollectionUtil.isEmpty(monitorInfo)) {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
|
||||
} else {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorInfo, methodDescribe);
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
/**
|
||||
* @Description: 普测计划页面调用根据条件查询母线信息
|
||||
* @Param: [param]
|
||||
* @return: com.njcn.common.pojo.response.HttpResult<java.util.List<com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO>>
|
||||
* @Author: clam
|
||||
* @Date: 2022/12/5
|
||||
*//*
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/getGeneratrixByCondition")
|
||||
@ApiOperation("普测计划页面调用根据条件查询母线信息")
|
||||
@ApiImplicitParam(name = "param", value = "条件参数", required = true)
|
||||
public HttpResult<List<GeneratrixAndPowerStationSonDTO>> getGeneratrixByCondition(@RequestBody @Validated ConditionParam param) {
|
||||
String methodDescribe = getMethodDescribe("getGeneratrixByCondition");
|
||||
List<GeneratrixAndPowerStationSonDTO> monitorInfo = pmsGeneratrixService.getGeneratrixByCondition(param);
|
||||
if (CollectionUtil.isEmpty(monitorInfo)) {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
|
||||
} else {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorInfo, methodDescribe);
|
||||
}
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
|
||||
@PostMapping("/addGeneratrix")
|
||||
@ApiOperation("新增母线")
|
||||
@ApiImplicitParam(name = "generatrixParam", value = "母线实体", required = true)
|
||||
public HttpResult<Boolean> addGeneratrix(@RequestBody GeneratrixParam generatrixParam) {
|
||||
String methodDescribe = getMethodDescribe("addGeneratrix");
|
||||
boolean result = pmsGeneratrixService.addGeneratrix(generatrixParam);
|
||||
if (result) {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
|
||||
}
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
|
||||
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
|
||||
@PostMapping("/updateGeneratrix")
|
||||
@ApiOperation("修改母线")
|
||||
@ApiImplicitParam(name = "generatrixParam", value = "母线实体", required = true)
|
||||
public HttpResult<Boolean> updateGeneratrix(@RequestBody GeneratrixParam generatrixParam) {
|
||||
String methodDescribe = getMethodDescribe("updateGeneratrix");
|
||||
boolean result = pmsGeneratrixService.updateGeneratrix(generatrixParam);
|
||||
if (result) {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
|
||||
}
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
|
||||
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE)
|
||||
@DeleteMapping("/delGeneratrix")
|
||||
@ApiOperation("删除母线")
|
||||
@ApiImplicitParam(name = "generatrixIds", value = "母线ids", required = true)
|
||||
public HttpResult<Boolean> delGeneratrix(@RequestBody @NotEmpty(message = "母线id不可为空") List<String> generatrixIds) {
|
||||
String methodDescribe = getMethodDescribe("delGeneratrix");
|
||||
boolean result = pmsGeneratrixService.delGeneratrix(generatrixIds);
|
||||
if (result) {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
|
||||
}
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
|
||||
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@GetMapping("/getGeneratrixById")
|
||||
@ApiOperation("根据母线id获取母线")
|
||||
@ApiImplicitParam(name = "generatrixId", value = "母线id", required = true)
|
||||
public HttpResult<Generatrix> getGeneratrixById(@RequestParam("generatrixId") String generatrixId) {
|
||||
String methodDescribe = getMethodDescribe("getGeneratrixById");
|
||||
Generatrix result = pmsGeneratrixService.getGeneratrixById(generatrixId);
|
||||
if (Objects.nonNull(result)) {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
|
||||
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/getGeneratrixList")
|
||||
@ApiOperation("获取所有母线下拉框使用")
|
||||
public HttpResult<List<Generatrix>> getGeneratrixList(@RequestBody PmsBaseParam pmsBaseParam) {
|
||||
String methodDescribe = getMethodDescribe("getGeneratrixList");
|
||||
List<Generatrix> result = pmsGeneratrixService.getGeneratrixList(pmsBaseParam);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/getGeneratrixPageList")
|
||||
@ApiOperation("分页获取母线列表")
|
||||
@ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true)
|
||||
public HttpResult<Page<Generatrix>> getGeneratrixPageList(@RequestBody BaseParam baseParam) {
|
||||
String methodDescribe = getMethodDescribe("getGeneratrixPageList");
|
||||
Page<Generatrix> result = pmsGeneratrixService.getGeneratrixPageList(baseParam);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
}
|
||||
*/
|
||||
@@ -281,5 +281,9 @@ public class PmsMonitorController extends BaseController {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -77,4 +77,9 @@ public interface CommTerminalService {
|
||||
|
||||
|
||||
|
||||
String updatePmsOverLimit();
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.njcn.device.pms.service.ledgerManger.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.njcn.common.pojo.enums.common.ServerEnum;
|
||||
@@ -9,12 +10,11 @@ import com.njcn.common.utils.EnumUtils;
|
||||
import com.njcn.device.biz.pojo.dto.*;
|
||||
import com.njcn.device.biz.pojo.param.DeptGetLineParam;
|
||||
|
||||
import com.njcn.device.biz.pojo.po.Overlimit;
|
||||
import com.njcn.device.biz.utils.COverlimitUtil;
|
||||
import com.njcn.device.pms.mapper.majornetwork.*;
|
||||
import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
|
||||
import com.njcn.device.pms.pojo.po.GeneratrixWire;
|
||||
import com.njcn.device.pms.pojo.po.Monitor;
|
||||
import com.njcn.device.pms.pojo.po.PmsTerminal;
|
||||
import com.njcn.device.pms.pojo.po.StatationStat;
|
||||
import com.njcn.device.pms.pojo.po.*;
|
||||
import com.njcn.device.pms.service.DeptLineService;
|
||||
import com.njcn.device.pms.service.ledgerManger.CommTerminalService;
|
||||
import com.njcn.redis.utils.RedisUtil;
|
||||
@@ -27,6 +27,7 @@ import com.njcn.user.pojo.dto.DeptDTO;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -66,6 +67,14 @@ public class CommTerminalServiceImpl implements CommTerminalService {
|
||||
|
||||
private final RedisUtil redisUtil;
|
||||
|
||||
private final OverlimitMapper overlimitMapper;
|
||||
|
||||
private final PowerDistributionareaMapper powerDistributionareaMapper;
|
||||
|
||||
private final PowerClientMapper powerClientMapper;
|
||||
|
||||
private final PowerGenerationUserMapper powerGenerationUserMapper;
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -407,4 +416,60 @@ public class CommTerminalServiceImpl implements CommTerminalService {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public String updatePmsOverLimit() {
|
||||
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> monitorList = monitorMapper.selectList(new LambdaQueryWrapper<>());
|
||||
|
||||
int count = 0;
|
||||
for (Monitor monitor : monitorList) {
|
||||
Float voltage = Float.parseFloat(map.get(monitor.getVoltageLevel()).getValue());
|
||||
Overlimit overlimit = COverlimitUtil.globalAssemble(voltage, monitor.getUserAgreementCapacity(), monitor.getPowerSupplyEqCapacity(), monitor.getMinShortCircuitCapacity(), 1, 0);
|
||||
overlimit.setId(monitor.getId());
|
||||
overlimitMapper.deleteById(monitor.getId());
|
||||
overlimitMapper.insert(overlimit);
|
||||
count++;
|
||||
|
||||
}
|
||||
//二类监测点
|
||||
List<PowerDistributionarea> powerDistributionareaList = powerDistributionareaMapper.selectList(new LambdaQueryWrapper<>());
|
||||
int countArea = 0;
|
||||
for (PowerDistributionarea powerDistributionarea : powerDistributionareaList) {
|
||||
Float voltage = Float.parseFloat(map.get(powerDistributionarea.getVoltageLevel()).getValue());
|
||||
Overlimit overlimit = COverlimitUtil.globalAssemble(voltage, null, null, null, 1, 1);
|
||||
overlimit.setId(powerDistributionarea.getId());
|
||||
overlimitMapper.deleteById(powerDistributionarea.getId());
|
||||
overlimitMapper.insert(overlimit);
|
||||
countArea++;
|
||||
}
|
||||
//三类监测
|
||||
List<PowerClient> powerClientList = powerClientMapper.selectList(new LambdaQueryWrapper<>());
|
||||
int countClient = 0;
|
||||
for (PowerClient powerClient : powerClientList) {
|
||||
Float voltage = Float.parseFloat(map.get(powerClient.getVoltageLevel()).getValue());
|
||||
Overlimit overlimit = COverlimitUtil.globalAssemble(voltage, null, null, null, 1, 1);
|
||||
overlimit.setId(powerClient.getId());
|
||||
overlimitMapper.deleteById(powerClient.getId());
|
||||
overlimitMapper.insert(overlimit);
|
||||
countClient++;
|
||||
}
|
||||
|
||||
List<PowerGenerationUser> powerGenerationUserList = powerGenerationUserMapper.selectList(new LambdaQueryWrapper<>());
|
||||
|
||||
for (PowerGenerationUser powerGenerationUser : powerGenerationUserList) {
|
||||
Float voltage = Float.parseFloat(map.get(powerGenerationUser.getVoltageLevel()).getValue());
|
||||
Overlimit overlimit = COverlimitUtil.globalAssemble(voltage, null, null, null, 1, 1);
|
||||
overlimit.setId(powerGenerationUser.getId());
|
||||
overlimitMapper.deleteById(powerGenerationUser.getId());
|
||||
overlimitMapper.insert(overlimit);
|
||||
countClient++;
|
||||
}
|
||||
return "主网监测点限值更新"+count+"个,台区限值更新"+countArea+"个,发电用电用户"+countClient+"个";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -142,4 +142,7 @@ public interface IMonitorService extends IService<Monitor> {
|
||||
* @return
|
||||
*/
|
||||
List<DeptGetChildrenDTO> deptMonitor(DeptGetLineParam param);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
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.enums.response.CommonResponseEnum;
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
|
||||
import com.njcn.device.biz.pojo.param.DeptGetLineParam;
|
||||
@@ -24,6 +25,9 @@ import com.njcn.device.pms.pojo.vo.MonitorVO;
|
||||
import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
|
||||
import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService;
|
||||
import com.njcn.device.pms.service.majornetwork.IMonitorService;
|
||||
import com.njcn.device.pq.pojo.po.Line;
|
||||
import com.njcn.device.pq.pojo.po.LineDetail;
|
||||
import com.njcn.device.pq.pojo.po.Voltage;
|
||||
import com.njcn.system.enums.DicDataEnum;
|
||||
import com.njcn.system.enums.DicDataTypeEnum;
|
||||
import com.njcn.user.api.DeptFeignClient;
|
||||
@@ -490,7 +494,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
|
||||
//主网测点限值计算
|
||||
DictData dictData = dicDataFeignClient.getDicDataById(monitor.getVoltageLevel()).getData();
|
||||
float voltageLevel = Float.parseFloat(dictData.getValue());
|
||||
Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel,monitor.getUserAgreementCapacity(),monitor.getPowerSupplyEqCapacity(),monitor.getMinShortCircuitCapacity(),1,1);
|
||||
Overlimit overlimit = COverlimitUtil.globalAssemble(voltageLevel,monitor.getUserAgreementCapacity(),monitor.getPowerSupplyEqCapacity(),monitor.getMinShortCircuitCapacity(),1,0);
|
||||
if(Objects.nonNull(monitorParam.getVoltageDeviationUpperLimit())){
|
||||
monitor.setVoltageDeviationUpperLimit(monitorParam.getVoltageDeviationUpperLimit());
|
||||
overlimit.setVoltageDev(monitorParam.getVoltageDeviationUpperLimit());
|
||||
@@ -510,4 +514,5 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -663,7 +663,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
|
||||
float voltageLevel = Float.parseFloat(dictData.getValue());
|
||||
if (CollectionUtil.isNotEmpty(lineList)) {
|
||||
for (LineDetail lineDetail : lineList) {
|
||||
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, 0);
|
||||
overlimit.setId(lineDetail.getId());
|
||||
overlimitMapper.deleteById(lineDetail.getId());
|
||||
overlimitMapper.insert(overlimit);
|
||||
@@ -740,7 +740,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
|
||||
float scaTmp = Float.parseFloat(scaleResult.getValue());
|
||||
|
||||
//监测点限值
|
||||
Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 1);
|
||||
Overlimit overlimit = COverlimitUtil.globalAssemble(scaTmp, lineDetail.getDealCapacity(), lineDetail.getDevCapacity(), lineDetail.getShortCapacity(), 1, 0);
|
||||
if (Objects.isNull(updateLineBO.getVoltageDev())) {
|
||||
overlimit.setVoltageDev(overlimit.getVoltageDev());
|
||||
} else {
|
||||
@@ -1656,7 +1656,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, 0);
|
||||
overlimit.setId(lineDetail.getId());
|
||||
overlimitMapper.insert(overlimit);
|
||||
count++;
|
||||
|
||||
@@ -22,9 +22,9 @@ public enum DicDataTypeEnum {
|
||||
DEV_LEVEL("终端等级","Dev_Level"),
|
||||
DEV_CONNECT("接线方式","Dev_Connect"),
|
||||
DEV_MANUFACTURER("制造厂商","Dev_Manufacturers"),
|
||||
//电压等级用去pq不区分交直流
|
||||
//电压等级用于pq不区分交直流
|
||||
DEV_VOLTAGE("电压等级","Dev_Voltage"),
|
||||
//标准电压等级用去pms区分交直流
|
||||
//标准电压等级用于pms区分交直流
|
||||
DEV_VOLTAGE_STAND("标准电压等级","Dev_Voltage_Stand"),
|
||||
EVENT_REASON("暂降原因","Event_Reason"),
|
||||
EVENT_TYPE("暂降类型","Event_Type"),
|
||||
|
||||
Reference in New Issue
Block a user