修改电压等级

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

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

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

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