单机信息总览

src/main/java/com/gyee/frame/controller/singleanalysis/SingleAnalysisController.java

@@ -109,9 +109,9 @@ public class SingleAnalysisController {
 
             SingleAnalysisVo  tbzb =singleAnalysisService.SingleAnalysisListByWtId(byzb,tqzb);
 
-            map.put("byzb",byzb);
-            map.put("tqzb",tqzb);
-            map.put("tbzb",tbzb);
+            map.put("byzb",byzb);//本月指标
+            map.put("tqzb",tqzb);//全年同期
+            map.put("tbzb",tbzb);//同比指标
         }
 
         if (null!=map) {

src/main/resources/mybatis/auto/InputoroutputspeedtotalMapper.xml

@@ -1316,8 +1316,8 @@
   <select id="getInputoroutputspeedtotalByWtId"  resultType="com.gyee.frame.model.custom.SingleAnalysisVo">
     select WINDTURBINEID,avg(dayinputsmall)   xfqr,avg(dayinputsmallratio)   xfqrhgl
     from Inputoroutputspeedtotal
-    where   Windpowerstationid = #{wtId} and Recorddate >= #{beginDate} and Recorddate &lt; #{endDate}
-    ORDER BY Recorddate
+    where   WINDTURBINEID = #{wtId} and Recorddate >= #{beginDate} and Recorddate &lt; #{endDate}
+
   </select>
 
 </mapper>

src/test/java/test/SingleAnalysisTest.java

@@ -4,12 +4,11 @@ import com.gyee.SpringbootStart;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.controller.singleanalysis.SingleAnalysisController;
-import com.gyee.frame.model.custom.SingleAnalysisVo;
 import com.gyee.frame.model.custom.Tablepar;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
-import java.util.List;
+import java.util.Map;
 
 public class SingleAnalysisTest {
 
@@ -20,7 +19,7 @@ public class SingleAnalysisTest {
 
 
 
-
+        String wtId="MG01_03";
         String wpId="MHS_FDC";
         String year="2021";
         String month="1";
@@ -35,13 +34,22 @@ public class SingleAnalysisTest {
 
 
 
-        AjaxResult ar = singleAnalysisController.singleanalysisMain(tablepar,wpId,year,month);
+//        AjaxResult ar = singleAnalysisController.singleanalysisMain(tablepar,wpId,year,month);
+//
+//        List<SingleAnalysisVo> vos=( List<SingleAnalysisVo>)ar.get("data");
+//        for(SingleAnalysisVo wtd:vos)
+//        {
+//            System.out.println(wtd.getXfqr()+"----------------"+wtd.getXfqrhgl());
+//        }
+
+
+        AjaxResult ar = singleAnalysisController.singleanalysisSub(wtId,year,month);
 
-        List<SingleAnalysisVo> vos=( List<SingleAnalysisVo>)ar.get("data");
-        for(SingleAnalysisVo wtd:vos)
-        {
-            System.out.println(wtd.getXfqr()+"----------------"+wtd.getXfqrhgl());
-        }
+        Map<String,Object> map=( Map<String,Object>)ar.get("data");
+//        for(SingleAnalysisVo wtd:vos)
+//        {
+//            System.out.println(wtd.getXfqr()+"----------------"+wtd.getXfqrhgl());
+//        }
 
     }