单机信息总览线路明细功率曲线接口

src/main/java/com/gyee/frame/service/Windturbineinfoday3Service.java

@@ -1044,13 +1044,16 @@ public class Windturbineinfoday3Service implements BaseService<Windturbineinfoda
                 Map.Entry<String, Windturbineinfoday3> entry = (Map.Entry<String, Windturbineinfoday3>) it.next();
                 Windturbineinfoday3 wi = entry.getValue();
                 double temp = 1.0;
-                if (wi.getDaydl2() != 0) {
+                if (StringUtils.notEmp(wi.getDaydl2()) && wi.getDaydl2() != 0) {
                     temp = wi.getDaydl2();
                 }
 
-                wi.setDaynhgzssdl2(new BigDecimal(wi.getDaynhgzssdl2()).divide(new BigDecimal(temp), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-                wi.setDaynhwhssdl2(new BigDecimal(wi.getDaynhwhssdl2()).divide(new BigDecimal(temp), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-                wi.setDaynhxdssdl2(new BigDecimal(wi.getDaynhxdssdl2()).divide(new BigDecimal(temp), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+                double gzssdl=null!=wi.getDaynhgzssdl2()?wi.getDaynhgzssdl2():0.0;
+                double whssdl=null!=wi.getDaynhwhssdl2()?wi.getDaynhwhssdl2():0.0;
+                double xdssdl=null!=wi.getDaynhxdssdl2()?wi.getDaynhxdssdl2():0.0;
+                wi.setDaynhgzssdl2(new BigDecimal(gzssdl).divide(new BigDecimal(temp), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+                wi.setDaynhwhssdl2(new BigDecimal(whssdl).divide(new BigDecimal(temp), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+                wi.setDaynhxdssdl2(new BigDecimal(xdssdl).divide(new BigDecimal(temp), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
                 wi.setDayspeed(0.0);
                 vos.add(wi);

src/test/java/test/LeaderboardTest.java

@@ -4,7 +4,7 @@ import com.gyee.SpringbootStart;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.controller.leaderboard.LeaderboardController;
-import com.gyee.frame.model.auto.Windturbineinfoday3;
+import com.gyee.frame.model.auto.Curvefittingmonthmain;
 import com.gyee.frame.model.custom.Tablepar;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
@@ -66,13 +66,13 @@ public class LeaderboardTest {
 //        }
 
 
-        AjaxResult ajaxResult =leaderboardController.utilizationList(tablepar,null,"2021-01-01","2021-01-03","0");
-
-        List<Windturbineinfoday3> test2=(List<Windturbineinfoday3>)ajaxResult.get("data");
-        for(Windturbineinfoday3 wtd:test2)
-        {
-            System.out.println(wtd.getDaydl2()+"----------------"+wtd.getDaylldl()+"----------------"+wtd.getDayspeed());
-        }
+//        AjaxResult ajaxResult =leaderboardController.utilizationList(tablepar,null,"2021-01-01","2021-01-03","0");
+//
+//        List<Windturbineinfoday3> test2=(List<Windturbineinfoday3>)ajaxResult.get("data");
+//        for(Windturbineinfoday3 wtd:test2)
+//        {
+//            System.out.println(wtd.getDaydl2()+"----------------"+wtd.getDaylldl()+"----------------"+wtd.getDayspeed());
+//        }
 
 
 //        AjaxResult ajaxResult =leaderboardController.querywarningStatistical(tablepar,"1",beginDate,endDate);
@@ -123,6 +123,16 @@ public class LeaderboardTest {
 //            System.out.println(wtd.getDeviationrate1()+"----------------"+wtd.getDeviationrate2()+"----------------"+wtd.getDeviationrate3());
 //        }
 
+                AjaxResult ajaxResult2 =leaderboardController.curveMonthchatAjax("sjzy",  "MG01_01",  "2021", "1");
+
+
+        List<Curvefittingmonthmain> list=(List<Curvefittingmonthmain>)ajaxResult2.get("data");
+
+        for(Curvefittingmonthmain wtd:list)
+        {
+            System.out.println(wtd.getDeviationrate1()+"----------------"+wtd.getDeviationrate2()+"----------------"+wtd.getDeviationrate3());
+        }
+
     }