1.提交场站评估代码

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

@@ -364,6 +364,7 @@
         deviceDetail.login_Time AS loginTime,
         deviceDetail.id deviceId,
         pv.scale lineVoltage,
+        pqsub.scale subVoltage,
         lineDetail.monitor_id monitorId
         FROM
         pq_line line,
@@ -372,6 +373,7 @@
         pq_line device,
         pq_device deviceDetail,
         pq_line substation,
+        pq_substation pqsub,
         pq_line gdinfo,
         pq_voltage pv
         WHERE line.id in
@@ -384,6 +386,7 @@
         AND device.id = deviceDetail.id
         AND device.pid = substation.id
         AND substation.pid = gdinfo.id
+        AND substation.id = pqsub.id
         AND subv.id = pv.id
     </select>
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java

@@ -860,6 +860,11 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
             Optional<DictData> temp4 = voltageList.stream().filter(item -> item.getId().equals(pollutionLineInfoDTO.getLineVoltage())).findAny();
             pollutionLineInfoDTO.setLineVoltage(temp4.map(DictData::getName).orElse(null));
 
+            // 变电站电压等级
+            Optional<DictData> temp5 = voltageList.stream().filter(item -> item.getId().equals(pollutionLineInfoDTO.getSubVoltage())).findAny();
+            pollutionLineInfoDTO.setSubVoltage(temp5.map(DictData::getName).orElse(null));
+
+
             // 电网侧
             pollutionLineInfoDTO.setPowerFlag(pollutionLineInfoDTO.getPowerFlag().equals("0") ? "电网侧" : "非电网侧");
         }