逆变器分析7

power-fitting-JN/src/main/java/com.gyee.power.fitting/controller/gf/PhotovoltaicAnalysisController.java

@@ -59,14 +59,13 @@ public class PhotovoltaicAnalysisController {
         }
 
         QueryWrapper<PhotovoltaicAnalysis> wrapper = new QueryWrapper<>();
-        wrapper.select("station_id,equipment_id,avg(scatter) scatter,(sum(average_theory_power)*100/sum(conversion_efficiency))" +
+        wrapper.select("station_id,equipment_id,avg(scatter) scatter,avg(conversion_efficiency)" +
                         " conversion_efficiency,sum(equivalent_generating_time) equivalent_generating_time," +
                         "avg(device_availability) device_availability").between("data_date", startDate, endDate)
                 .groupBy("station_id,equipment_id").orderByAsc("equipment_id");
         List<PhotovoltaicAnalysis> list = photovoltaicAnalysisService.list(wrapper);
 
-        List<ProBasicEquipment> in = proBasicEquipmentService.getStationMap("IN").get(stationId);
-        Map<String, String> collect = in.stream().collect(Collectors.toMap(ProBasicEquipment::getId, ProBasicEquipment::getAname));
+        Map<String, String> collect = proBasicEquipmentService.getStationMap("IN");
         list = list.stream().peek(pa -> pa.setEquipmentId(collect.get(pa.getEquipmentId()))).collect(Collectors.toList());
         return JsonResult.successData(ResultCode.SUCCESS, list);
     }

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/ProBasicEquipmentService.java

@@ -21,5 +21,5 @@ public interface ProBasicEquipmentService extends IService<ProBasicEquipment> {
 
     List<ProBasicEquipment> selectList(String station);
 
-    Map<String, List<ProBasicEquipment>> getStationMap(String type);
+    Map<String, String> getStationMap(String type);
 }

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/ProBasicEquipmentServiceImpl.java

@@ -49,11 +49,12 @@ public class ProBasicEquipmentServiceImpl extends ServiceImpl<ProBasicEquipmentM
         return list;
     }
 
-    @Cacheable
-    public Map<String, List<ProBasicEquipment>> getStationMap(String type) {
+    @Cacheable("getStationMap")
+    public Map<String, String> getStationMap(String type) {
         QueryWrapper<ProBasicEquipment> eWrapper = new QueryWrapper<>();
         eWrapper.eq("spare1", type);
         List<ProBasicEquipment> eList = baseMapper.selectList(eWrapper);
-        return eList.stream().collect(Collectors.groupingBy(ProBasicEquipment::getWindpowerstationId));
+        Map<String, String> collect = eList.stream().collect(Collectors.toMap(ProBasicEquipment::getId, ProBasicEquipment::getNemCode));
+        return collect;
     }
 }