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

修改电压等级

Browse Source
This commit is contained in:
huangzj
2023-11-20 14:45:36 +08:00
parent fc9e824d7f
commit ab8b70cd71
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java
View File

@@ -153,7 +153,8 @@ public class CommTerminalServiceImpl implements CommTerminalService {
lineDevGetDTO.setType(1); lineDevGetDTO.setType(1);
lineDevGetDTO.setLineType(1); lineDevGetDTO.setLineType(1);
lineDevGetDTO.setLineTag(it.getMonitorTag()); lineDevGetDTO.setLineTag(it.getMonitorTag());
lineDevGetDTO.setVoltageLevel(mapVoltage.get(it.getVoltageLevel()).getValue()); //预处理模块需要的id修改value为id
lineDevGetDTO.setVoltageLevel(it.getVoltageLevel());
lineList.add(lineDevGetDTO); lineList.add(lineDevGetDTO);
}); });
} }

6
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
View File

@@ -26,7 +26,7 @@
point.id pointId, point.id pointId,
lineDetail.Time_Interval as `interval`, lineDetail.Time_Interval as `interval`,
lineDetail.load_type lineTag, lineDetail.load_type lineTag,
dic.value voltageLevel, dic.id voltageLevel,
dev.id devId, dev.id devId,
device.com_flag comFlag, device.com_flag comFlag,
1 as lineType, 1 as lineType,
@@ -36,7 +36,7 @@
<if test="type == 2"> <if test="type == 2">
DISTINCT DISTINCT
pq_dept_line.id unitId, pq_dept_line.id unitId,
dic.value voltageLevel, dic.id voltageLevel,
voltage.id pointId, voltage.id pointId,
point.id devId point.id devId
</if> </if>
@@ -45,7 +45,7 @@
DISTINCT DISTINCT
pq_dept_line.id unitId, pq_dept_line.id unitId,
dev.id devId, dev.id devId,
dic.value voltageLevel, dic.id voltageLevel,
1 as type , 1 as type ,
device.update_time, device.update_time,
device.Com_Flag as comFlag device.Com_Flag as comFlag