功率曲线

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/Economic/EconomicController.java

@@ -91,7 +91,7 @@ public class EconomicController {
                               @RequestParam(value = "endtime", required = false) String  endtime,
                               @RequestParam(value = "dateType", required = false) String dateType
     ) throws Exception {
-        Map<String, List<List<Glqx>>> curvefitting = null;
+        List<List<Glqx>> curvefitting = null;
         if(StringUtils.isEmpty(type)) type = "-2";
         if(StringUtils.isEmpty(dateType)) dateType = "1";
 

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

@@ -346,12 +346,13 @@ public class EconomicService {
 
 
 
-    public Map<String, List<List<Glqx>>> curveFittingList(String wpids, String type, String starttime, String endtime, String dateType) throws Exception {
+    public  List<List<Glqx>>  curveFittingList(String wpids, String type, String starttime, String endtime, String dateType) throws Exception {
         Map<String, List<List<Glqx>>> resultMap = new HashMap<>();
 
 
         List<ProBasicOrganizeTree> wtls = CacheContext.wtls;
         List<EconomicVo> wt = new ArrayList<>();
+
         List<List<Glqx>> tempList = new ArrayList<>();
 
         List<Glqx> vo = new ArrayList<Glqx>();
@@ -413,11 +414,11 @@ public class EconomicService {
             }
             vo.add(vos);
             tempList.add(vo);
-            resultMap.put("list", tempList);
+
 
 
         }
 
-        return resultMap;
+        return tempList;
     }
 }