功率曲线

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/Economic/EconomicService.java

@@ -402,7 +402,11 @@ public class EconomicService {
                     temp1 = sjglls.get(i).getPointValueInDouble();
 
                         if (sjgl.getWindturbineId().contains(wt2.getId())){
+//                            Date date = new Date(sjglls.get(i).getPointTime());
+//                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                            String formattedDate = sdf.format(date);
                             vos.setTime(sjglls.get(i).getPointTime());
+//                            vos.setTime(formattedDate);
                             vos.setId(wt2.getId());
                             vos.setName(wt2.getName());
                             vos.setSjgl(StringUtils.round(temp1, 2));

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -118,7 +118,7 @@ public class BenchmarkingService {
     }
     public List<ProBasicOrganizeEquipment> wtByWplistxin(String wpids) {
         return CacheContext.organizeEquipmentList.stream().filter(
-                oe -> wpids.contains(oe.getWindpowerstationId())&&(oe.getNemName().contains("风机"))).collect(Collectors.toList());
+                oe -> wpids.contains(oe.getWindpowerstationId())||(oe.getNemName().contains("风机"))).collect(Collectors.toList());
     }
 
     public List<FjjxbVo> performance(String companyid, String getype, String sttype, String beginDate, String endDate, String wpids, String projectids, String lineids, String target, String sort) {