终端bug修改
This commit is contained in:
@@ -315,7 +315,7 @@ public class COverlimitUtil {
|
|||||||
* 负序电流限值
|
* 负序电流限值
|
||||||
*/
|
*/
|
||||||
public static void negativeSequenceCurrent(Overlimit overlimit,Float voltageLevel,Float shortCapacity){
|
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);
|
overlimit.setINeg((float) v);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.njcn.device.pq.mapper;
|
|||||||
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
import com.njcn.device.pq.pojo.po.LineDetail;
|
||||||
import com.njcn.device.pq.pojo.po.Voltage;
|
import com.njcn.device.pq.pojo.po.Voltage;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
@@ -24,4 +25,12 @@ public interface VoltageMapper extends BaseMapper<Voltage> {
|
|||||||
* @return 母线信息
|
* @return 母线信息
|
||||||
*/
|
*/
|
||||||
List<Voltage> getVoltageByNum(@Param("devIndex") String devIndex, @Param("num") List<Integer> num);
|
List<Voltage> getVoltageByNum(@Param("devIndex") String devIndex, @Param("num") List<Integer> num);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 通过母线id获取下层所有监测点详情
|
||||||
|
* @author cdf
|
||||||
|
* @date 2023/5/24
|
||||||
|
*/
|
||||||
|
List<LineDetail> getLineDetailByBusBarId(@Param("busBarId")String busBarId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
AND dev.id = devDetail.id
|
AND dev.id = devDetail.id
|
||||||
AND prov.NAME = area.id
|
AND prov.NAME = area.id
|
||||||
and devDetail.dev_model = 1
|
and devDetail.dev_model = 1
|
||||||
|
and devDetail.run_flag = 0
|
||||||
<if test="comFlag!=null">
|
<if test="comFlag!=null">
|
||||||
and devDetail.com_flag = #{comFlag}
|
and devDetail.com_flag = #{comFlag}
|
||||||
</if>
|
</if>
|
||||||
|
|||||||
@@ -14,4 +14,12 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
<select id="getLineDetailByBusBarId" resultType="LineDetail">
|
||||||
|
select pq_line_detail.* from pq_line pq_line
|
||||||
|
inner join pq_line_detail pq_line_detail on pq_line.id = pq_line_detail.id
|
||||||
|
where pid = #{busBarId}
|
||||||
|
and pq_line.state = 1
|
||||||
|
</select>
|
||||||
|
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
@@ -644,6 +644,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
|
|||||||
|
|
||||||
for (SubVoltageParam updateSubVoltageParam : subVoltageBOList) {
|
for (SubVoltageParam updateSubVoltageParam : subVoltageBOList) {
|
||||||
if (updateSubVoltageParam.getUpdateFlag() == 1) {
|
if (updateSubVoltageParam.getUpdateFlag() == 1) {
|
||||||
|
Voltage voltageTem = voltageMapper.selectById(updateSubVoltageParam.getSubvIndex());
|
||||||
Line subVoltage = new Line();
|
Line subVoltage = new Line();
|
||||||
subVoltage.setId(updateSubVoltageParam.getSubvIndex());
|
subVoltage.setId(updateSubVoltageParam.getSubvIndex());
|
||||||
subVoltage.setName(updateSubVoltageParam.getName());
|
subVoltage.setName(updateSubVoltageParam.getName());
|
||||||
@@ -653,6 +654,22 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
|
|||||||
BeanUtils.copyProperties(updateSubVoltageParam, voltage);
|
BeanUtils.copyProperties(updateSubVoltageParam, voltage);
|
||||||
voltage.setId(updateSubVoltageParam.getSubvIndex());
|
voltage.setId(updateSubVoltageParam.getSubvIndex());
|
||||||
voltageMapper.updateById(voltage);
|
voltageMapper.updateById(voltage);
|
||||||
|
|
||||||
|
//如果电压等级变化重新计算母线下面监测点的限值
|
||||||
|
if(!voltageTem.getScale().equals(voltage.getScale())) {
|
||||||
|
List<LineDetail> 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//监测点
|
//监测点
|
||||||
|
|||||||
Reference in New Issue
Block a user