diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java index ec8329141..2576c2244 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java @@ -315,7 +315,7 @@ public class COverlimitUtil { * 负序电流限值 */ public static void negativeSequenceCurrent(Overlimit overlimit,Float voltageLevel,Float shortCapacity){ - double v = (0.013*shortCapacity)/(getUl(voltageLevel)*Math.sqrt(3)); + double v = (0.013*shortCapacity*1000)/(getUl(voltageLevel)*Math.sqrt(3)); overlimit.setINeg((float) v); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/VoltageMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/VoltageMapper.java index 34876e86a..1e8831e92 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/VoltageMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/VoltageMapper.java @@ -2,6 +2,7 @@ package com.njcn.device.pq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pq.pojo.po.LineDetail; import com.njcn.device.pq.pojo.po.Voltage; import org.apache.ibatis.annotations.Param; @@ -24,4 +25,12 @@ public interface VoltageMapper extends BaseMapper { * @return 母线信息 */ List getVoltageByNum(@Param("devIndex") String devIndex, @Param("num") List num); + + + /** + * 通过母线id获取下层所有监测点详情 + * @author cdf + * @date 2023/5/24 + */ + List getLineDetailByBusBarId(@Param("busBarId")String busBarId); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMarkMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMarkMapper.xml index ff9832eac..42d4348a6 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMarkMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMarkMapper.xml @@ -32,7 +32,7 @@ AND dev.id = devDetail.id AND prov.NAME = area.id and devDetail.dev_model = 1 - + and devDetail.run_flag = 0 and devDetail.com_flag = #{comFlag} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/VoltageMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/VoltageMapper.xml index fddcb37a5..36c5a946a 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/VoltageMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/VoltageMapper.xml @@ -14,4 +14,12 @@ + + + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index 9cf1200af..9e3202c19 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -644,6 +644,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple for (SubVoltageParam updateSubVoltageParam : subVoltageBOList) { if (updateSubVoltageParam.getUpdateFlag() == 1) { + Voltage voltageTem = voltageMapper.selectById(updateSubVoltageParam.getSubvIndex()); Line subVoltage = new Line(); subVoltage.setId(updateSubVoltageParam.getSubvIndex()); subVoltage.setName(updateSubVoltageParam.getName()); @@ -653,6 +654,22 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple BeanUtils.copyProperties(updateSubVoltageParam, voltage); voltage.setId(updateSubVoltageParam.getSubvIndex()); voltageMapper.updateById(voltage); + + //如果电压等级变化重新计算母线下面监测点的限值 + if(!voltageTem.getScale().equals(voltage.getScale())) { + List lineList = voltageMapper.getLineDetailByBusBarId(voltage.getId()); + DictData dictData = dicDataFeignClient.getDicDataById(voltage.getScale()).getData(); + 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.setId(lineDetail.getId()); + overlimitMapper.deleteById(lineDetail.getId()); + overlimitMapper.insert(overlimit); + } + } + } + } //监测点