测试功能接口并修复BUG

src/main/java/com/gyee/frame/controller/goodness/WindturbineGoodnessDetailController.java

@@ -1,11 +1,11 @@
 package com.gyee.frame.controller.goodness;
 
-import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.DataVo;
+import com.gyee.frame.model.custom.StatisticalAnalysisWarningTopVo;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.model.custom.ValueVo;
 import com.gyee.frame.service.*;
@@ -142,7 +142,7 @@ public class WindturbineGoodnessDetailController {
     @ResponseBody
     public AjaxResult bjphlist(Tablepar tablepar, String wtId, String beginDate, String endDate) {
 
-        PageInfo<Brownoutsevent2> resultList = brownoutsevent2Service.getBrownoutsevent2List(tablepar, wtId, beginDate, endDate);
+        List<StatisticalAnalysisWarningTopVo> resultList = warningRecordsService.getWarningRecordsTop5(tablepar, wtId, beginDate, endDate);
         if (resultList != null) {
             return AjaxResult.successData(AjaxStatus.success.code, resultList);
         } else {

src/main/java/com/gyee/frame/controller/scatter/ScatterController.java

@@ -0,0 +1,186 @@
+package com.gyee.frame.controller.scatter;
+
+import com.gyee.frame.common.conf.AjaxStatus;
+import com.gyee.frame.common.dao.IRealTimeDataBaseUtil;
+import com.gyee.frame.common.dao.golden.EdosUtil;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.common.spring.Constant;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
+import com.gyee.frame.model.auto.WindTurbineTestingPointAi2;
+import com.gyee.frame.model.auto.Windturbinecurvefittingmonth;
+import com.gyee.frame.model.custom.PointData;
+import com.gyee.frame.service.WindturbinecurvefittingmonthService;
+import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.text.DecimalFormat;
+import java.util.*;
+
+@Controller
+@RequestMapping("/scatter")
+public class ScatterController {
+
+    @Autowired
+    private WindturbinecurvefittingmonthService windturbinecurvefittingmonthService;
+    IRealTimeDataBaseUtil realApiUtil = new EdosUtil();
+    /**
+     *
+     * @Title: scatterAjax
+     * @Description: 获得选择场站、项目、线路、年份、月份相关散点图
+     * @throws
+     */
+    @PostMapping("/scatterAjax")
+    @ResponseBody
+    public AjaxResult scatterAjax(String wpId, String pjId,String lnId, String year, String month) throws Exception {
+
+        List<List<Double>> vos = new ArrayList<List<Double>>();
+        if (StringUtils.notEmp(year) && StringUtils.notEmp(month)) {
+
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.HOUR_OF_DAY, 0);
+            cal.set(Calendar.MINUTE, 0);
+            cal.set(Calendar.SECOND, 0);
+
+            cal.set(Calendar.YEAR, Integer.valueOf(year));
+            cal.set(Calendar.MONTH, Integer.valueOf(month) - 1);
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+            Date beginDate = cal.getTime();
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+            Date endDate = cal.getTime();
+
+            Map<String, WindPowerStationTestingPoint2> map = null;
+            if (StringUtils.notEmp(wpId) && InitialRunner.stationPointmap.containsKey(wpId)) {
+                map = InitialRunner.stationPointmap.get(wpId);
+            } else if (StringUtils.notEmp(pjId) && InitialRunner.stationPointmap.containsKey(pjId)) {
+                map = InitialRunner.stationPointmap.get(pjId);
+            } else if (StringUtils.notEmp(lnId) && InitialRunner.stationPointmap.containsKey(lnId)) {
+                map = InitialRunner.stationPointmap.get(lnId);
+            }
+            WindPowerStationTestingPoint2 gl = map.get(Constant.TPOINT_WP_SJGL);
+
+            int daynum= DateUtils.daysDiff(beginDate, endDate);
+            long pried=60*10;
+            long count=6*24*daynum;
+
+            DecimalFormat dcmFmt = new DecimalFormat("0.00");
+            List<PointData> gls = realApiUtil.getHistoryDatasSnap(gl, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+            WindPowerStationTestingPoint2 fs = map.get(Constant.TPOINT_WP_SSFS);
+            List<PointData> fss = realApiUtil.getHistoryDatasSnap(fs, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+
+
+            if (!gls.isEmpty() && !fss.isEmpty()) {
+                for (int i = 0; i < fss.size(); i++) {
+
+                    List<Double> ds = new ArrayList<Double>();
+
+                    double f = fss.get(i).getPointValueInDouble();
+                    ds.add(Double.valueOf(dcmFmt.format(f)));
+                    f = gls.get(i).getPointValueInDouble();
+                    ds.add(Double.valueOf(dcmFmt.format(f)));
+                    vos.add(ds);
+                }
+            }
+
+        }
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+
+    }
+
+    /**
+     *
+     * @Title: scatterAjax
+     * @Description: 获得选择风机、年份、月份相关散点图
+     * @throws
+     */
+    @PostMapping("/scatterWtAjax")
+    @ResponseBody
+    public AjaxResult scatterWtAjax(String wtId, String year, String month) throws Exception {
+
+        Map<String, List<List<Double>>> result = new HashMap<String, List<List<Double>>>();
+        if (StringUtils.notEmp(year) && StringUtils.notEmp(month)) {
+
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.HOUR_OF_DAY, 0);
+            cal.set(Calendar.MINUTE, 0);
+            cal.set(Calendar.SECOND, 0);
+
+            cal.set(Calendar.YEAR, Integer.valueOf(year));
+            cal.set(Calendar.MONTH, Integer.valueOf(month) - 1);
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+            Date beginDate = cal.getTime();
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+            Date endDate = cal.getTime();
+
+            Map<String, WindTurbineTestingPointAi2> map = null;
+            if (StringUtils.notEmp(wtId) && InitialRunner.wtpAimap.containsKey(wtId)) {
+                map = InitialRunner.wtpAimap.get(wtId);
+            }
+            WindTurbineTestingPointAi2 gl = map.get(Constant.TPOINT_WT_FJGL);
+            int daynum=DateUtils.daysDiff(beginDate, endDate);
+            long pried=60*10;
+            long count=6*24*daynum;
+            DecimalFormat dcmFmt = new DecimalFormat("0.00");
+            List<PointData> gls = realApiUtil.getHistoryDatasSnap(gl, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+            WindTurbineTestingPointAi2 fs = map.get(Constant.TPOINT_WT_FJSSFS);
+            List<PointData> fss = realApiUtil.getHistoryDatasSnap(fs, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
+
+
+            List<List<Double>> vos = new ArrayList<List<Double>>();
+            if (!gls.isEmpty() && !fss.isEmpty()) {
+                for (int i = 0; i < fss.size(); i++) {
+
+                    List<Double> ds = new ArrayList<Double>();
+
+                    double f = fss.get(i).getPointValueInDouble();
+                    ds.add(Double.valueOf(dcmFmt.format(f)));
+                    f = gls.get(i).getPointValueInDouble();
+                    ds.add(Double.valueOf(dcmFmt.format(f)));
+                    vos.add(ds);
+                }
+            }
+
+            List<List<Double>> vos2 = new ArrayList<List<Double>>();
+
+            List<Windturbinecurvefittingmonth> wcls = windturbinecurvefittingmonthService.getWindturbinecurvefittingmonthList(wtId,year,month);
+
+            for (Windturbinecurvefittingmonth wc : wcls) {
+
+                List<Double> ds = new ArrayList<Double>();
+                int c = (int) wc.getSpeed().intValue();
+
+                if (c == wc.getSpeed()) {
+                    ds.add(wc.getSpeed());
+                    ds.add(wc.getActualpower());
+                    // vo.setValue1(wc.getSpeed());// 风速
+                    // vo.setValue2(wc.getActualpower());// 实际拟合功率
+                    // vo.setValue3(wc.getOptimalpower());// 最优拟合功率
+                    vos2.add(ds);
+                }
+            }
+            result.put("scatter", vos);
+            result.put("line", vos2);
+
+        }
+
+        if (null!=result) {
+            return AjaxResult.successData(AjaxStatus.success.code, result);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, result);
+        }
+
+    }
+
+
+
+}

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

@@ -105,11 +105,11 @@ public class Inputoroutputspeedtotal2Service implements BaseService<Inputoroutpu
 			if (StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate)) {
 
 				Inputoroutputspeedtotal2Example.Criteria criteria =example.createCriteria();
-				example.createCriteria().andWindturbineidEqualTo(wtId);
-
-				list = inputoroutputspeedtotal2Mapper.selectByExample(example);
+				criteria.andWindturbineidEqualTo(wtId);
 				Date endDate= DateUtils.addDays(recorddate,1);
 				criteria.andRecorddateGreaterThanOrEqualTo(recorddate).andRecorddateLessThan(endDate);
+				list = inputoroutputspeedtotal2Mapper.selectByExample(example);
+
 			} else {
 				list = new ArrayList<>();
 			}

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

@@ -105,11 +105,13 @@ public class WindpowerstationthewindinfoService implements BaseService<Windpower
 			if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recorddate)) {
 
 				WindpowerstationthewindinfoExample.Criteria criteria =example.createCriteria();
-				example.createCriteria().andWindpowerstationidEqualTo(wpId);
+				criteria.andWindpowerstationidEqualTo(wpId);
+
 
-				list = windpowerstationthewindinfoMapper.selectByExample(example);
 				Date endDate= DateUtils.addDays(recorddate,1);
 				criteria.andRecorddateGreaterThanOrEqualTo(recorddate).andRecorddateLessThan(endDate);
+
+				list = windpowerstationthewindinfoMapper.selectByExample(example);
 			} else {
 				list = new ArrayList<>();
 			}

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

@@ -162,7 +162,7 @@ public class WindturbinecurvefittingService implements BaseService<Windturbinecu
 			}
 			example.setOrderByClause(String.valueOf(sb));
 		}else {
-			example.setOrderByClause("windturbineid ASC");
+			example.setOrderByClause("speed ASC");
 		}
 		PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
 
@@ -194,7 +194,7 @@ public class WindturbinecurvefittingService implements BaseService<Windturbinecu
 			}
 			example.setOrderByClause(String.valueOf(sb));
 		}else {
-			example.setOrderByClause("windturbineid ASC");
+			example.setOrderByClause("speed ASC");
 		}
 		PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
 

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

@@ -163,7 +163,7 @@ public class WindturbinecurvefittingmonthService implements BaseService<Windturb
 		List<Windturbinecurvefittingmonth> list =new ArrayList<>();
 
 		WindturbinecurvefittingmonthExample example=new WindturbinecurvefittingmonthExample();
-		example.setOrderByClause("windturbineid ASC");
+		example.setOrderByClause("speed ASC");
 
 		WindturbinecurvefittingmonthExample.Criteria criteria =example.createCriteria();
 
@@ -189,7 +189,7 @@ public class WindturbinecurvefittingmonthService implements BaseService<Windturb
 		List<Windturbinecurvefittingmonth> list =new ArrayList<>();
 
 		WindturbinecurvefittingmonthExample example=new WindturbinecurvefittingmonthExample();
-		example.setOrderByClause("windturbineid ASC");
+		example.setOrderByClause("speed ASC");
 
 		WindturbinecurvefittingmonthExample.Criteria criteria =example.createCriteria();
 
@@ -224,7 +224,7 @@ public class WindturbinecurvefittingmonthService implements BaseService<Windturb
 			}
 			example.setOrderByClause(String.valueOf(sb));
 		}else {
-			example.setOrderByClause("windturbineid ASC");
+			example.setOrderByClause("speed ASC");
 		}
 		PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
 

src/test/java/test/GoodnessTest.java

@@ -1,10 +1,8 @@
 package test;
 
 import com.gyee.SpringbootStart;
-import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.controller.goodness.WindturbineGoodnessDetailController;
-import com.gyee.frame.model.auto.Windturbineanalysisday;
 import com.gyee.frame.model.custom.Tablepar;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
@@ -56,11 +54,72 @@ public class GoodnessTest {
 //            System.out.println(wtd.getDaytop()+"----------------"+wtd.getDaygoodness()+"----------------"+wtd.getDayspeed());
 //        }
 
-        AjaxResult ajaxResult =windturbineGoodnessDetailController.wadAjax(wtid,"2021-01-02");
-
-        Windturbineanalysisday wtd=(Windturbineanalysisday)ajaxResult.get("data");
+//        AjaxResult ajaxResult =windturbineGoodnessDetailController.wadAjax(wtid,"2021-01-02");
+//
+//        Windturbineanalysisday wtd=(Windturbineanalysisday)ajaxResult.get("data");
+//
+//        System.out.println(wtd.getWindturbineid()+"----------------"+wtd.getC1()+"----------------"+wtd.getC2());
+//
+//        AjaxResult ajaxResult =windturbineGoodnessDetailController.bjphlist(tablepar,wtid,"2021-01-01","2021-01-04");
+//
+//        List<StatisticalAnalysisWarningTopVo> test=( List<StatisticalAnalysisWarningTopVo> )ajaxResult.get("data");
+//
+//        for(StatisticalAnalysisWarningTopVo wtd:test)
+//        {
+//            System.out.println(wtd.getFrequency()+"----------------"+wtd.getName()+"----------------"+wtd.getName());
+//        }
+//
+//
+//
+//        WindturbineDetailLineChartController windturbineDetailLineChartController= SpringUtils.getBean("windturbineDetailLineChartController");
+//
+//        AjaxResult ajaxResult1 =windturbineDetailLineChartController.bjjllist(tablepar,wtid,"2021-01-01","2021-01-04");
+//
+//        PageInfo<WarningRecords> test1=(PageInfo<WarningRecords>)ajaxResult1.get("data");
+//
+//        for(WarningRecords wtd:test1.getList())
+//        {
+//            System.out.println(wtd.getWarningtime()+"----------------"+wtd.getWindturbineid()+"----------------"+wtd.getWarnDesc());
+//        }
+//
+//        AjaxResult ajaxResult2 =windturbineDetailLineChartController.gzjllist(tablepar,wtid,"2021-01-01","2021-01-04");
+//
+//        PageInfo<ShutdowneventVo> test2=(PageInfo<ShutdowneventVo>)ajaxResult2.get("data");
+//
+//        for(ShutdowneventVo wtd:test2.getList())
+//        {
+//            System.out.println(wtd.getWarnDesc()+"----------------"+wtd.getStartTime()+"----------------"+wtd.getStopTime());
+//        }
+//
+//        AjaxResult ajaxResult3 =windturbineDetailLineChartController.xdjllist(tablepar,wtid,"2021-01-01","2021-01-04");
+//
+//        PageInfo<Brownoutsevent2> test3=(PageInfo<Brownoutsevent2>)ajaxResult3.get("data");
+//
+//        for(Brownoutsevent2 wtd:test3.getList())
+//        {
+//            System.out.println(wtd.getLimitload()+"----------------"+wtd.getStoptime()+"----------------"+wtd.getLosspower());
+//        }
+//
+//
+//
+//        AjaxResult ajaxResult4 =windturbineGoodnessDetailController.glchat(wtid,"2021-01-01");
+//
+//        List<DataVo> test4=(List<DataVo> )ajaxResult4.get("data");
+//
+//        for(DataVo wtd:test4)
+//        {
+//            System.out.println(wtd.getValue1()+"----------------"+wtd.getName()+"----------------"+wtd.getName());
+//        }
+//
+//        AjaxResult ajaxResult5 =windturbineGoodnessDetailController.fjfzy(wtid,"2021-01-01");
+//
+//        Map<String, Object> test5=(Map<String, Object>)ajaxResult5.get("data");
+//
+//        for(ValueVo wtd:(List<ValueVo>)test5.get("data"))
+//        {
+//            System.out.println(wtd.getValue()+"----------------"+wtd.getName()+"----------------"+wtd.getData1());
+//        }
 
-        System.out.println(wtd.getWindturbineid()+"----------------"+wtd.getC1()+"----------------"+wtd.getC2());
 
 //        ajaxResult =compareController.fzyDay(wtid,date);
 //