APP预测电量

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/Application/ApplicationController.java

@@ -11,7 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -65,12 +67,12 @@ public class ApplicationController {
     })
     public AjaxResult getforecast(String type,String wpId) throws Exception {
 
-        Map<String, String> map = new HashMap<>();
+        List<Map> list = new ArrayList<>();
         if (wpId!=null) {
-            map = applicationService.forecast(type, wpId);
+            list = applicationService.forecast(type, wpId);
         }
-        if (null != map) {
-            return AjaxResult.successData(200, map);
+        if (null != list) {
+            return AjaxResult.successData(200, list);
         } else {
             return AjaxResult.error(500, "操作失败");
         }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Application/ApplicationService.java

@@ -186,9 +186,9 @@ public class ApplicationService {
         return map;
     }
 
-    public Map forecast(String type,String wpId) throws Exception {
+    public List<Map> forecast(String type,String wpId) throws Exception {
 
-        Map<String,Object> map = new HashMap<>();
+        List<Map> list = new ArrayList<>();
         Map<Integer,Object> zb = new HashMap<>();
         long longDate = System.currentTimeMillis();
         Date nowDate = new Date(longDate);
@@ -199,21 +199,22 @@ public class ApplicationService {
             if (type.equals("0")) {
                 QueryWrapper<ProEconStationPower> qw = new QueryWrapper<>();
                 qw.lambda().eq(ProEconStationPower::getRecordDate, nowDate);
-                qwt = powerService.list();
+                qwt = powerService.list(qw);
                 zb.put(i,qwt);
             }else {
                 QueryWrapper<ProEconStationPower> qw = new QueryWrapper<>();
                 qw.lambda().eq(ProEconStationPower::getRecordDate, nowDate);
                 qw.lambda().eq(ProEconStationPower::getWindpowerstationId,wpId);
-                qwt = powerService.list();
+                qwt = powerService.list(qw);
                 zb.put(i,qwt);
             }
+            list.add(zb);
             nowDate = DateUtils.addDays(nowDate, +1);
         }
 
 
 
 
-        return map;
+        return list;
     }
 }