智能看板光伏发电、光伏盈利修改接口

src/main/java/com/sky/ioc/controller/dashboard/DashboardController.java

@@ -1,5 +1,6 @@
 package com.sky.ioc.controller.dashboard;
 
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.carbon.CarbonService;
 import com.sky.ioc.service.space.SpaceService;
 import com.sky.ioc.tool.ReturnMsg;
@@ -8,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -54,8 +56,8 @@ public class DashboardController {
      * */
     @ApiOperation("智能看板-光伏发电量")
     @PostMapping("getPhotovoltaicPower")
-    public ReturnMsg getPhotovoltaicPower(){
-        return carbonService.getPhotovoltaicPower();
+    public ReturnMsg getPhotovoltaicPower(@RequestBody IocParam iocParam){
+        return carbonService.getPhotovoltaicPower(iocParam);
     }
 
 

src/main/java/com/sky/ioc/service/carbon/CarbonService.java

@@ -54,7 +54,7 @@ public interface CarbonService {
 
     ReturnMsg  getPhotovoltaicCoreIndicators(IocParam iocParam);
 
-    ReturnMsg getPhotovoltaicPower();
+    ReturnMsg getPhotovoltaicPower(IocParam iocParam);
 
     ReturnMsg getAnalyseCoreIndicators(IocParam iocParam);
 

src/main/java/com/sky/ioc/service/carbon/impl/CarbonServiceImpl.java

@@ -506,7 +506,7 @@ public class CarbonServiceImpl implements CarbonService {
 
     @Override
     public ReturnMsg getPhotovoltaicInfo(IocParam iocParam) {
-        String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
+        String[] param = {"中迅","规划院","郑分","广分","上分","成分"};
         String startStr = iocParam.getTimeRange().getStartDate();
         String endStr = iocParam.getTimeRange().getEndDate();
         List<String> lists = DateUtil.getBetweenDays(startStr, endStr);
@@ -545,9 +545,12 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getPhotovoltaicPower() {
+    public ReturnMsg getPhotovoltaicPower(IocParam iocParam) {
         String[] param = {"realTime"};
-        String[] labelKey = {"8:00-10:00","10:00-12:00","12:00-14:00","14:00-16:00","16:00-18:00"};
+        String startStr = iocParam.getTimeRange().getStartDate();
+        String endStr = iocParam.getTimeRange().getEndDate();
+        List<String> lists = DateUtil.getBetweenDays(startStr, endStr);
+        String[] labelKey = lists.toArray(new String[0]);
         List<Label> labels = GeneralMethod.getInstance().dataGeneration(param, labelKey);
         return ReturnMsg.ok(labels);
     }

src/main/java/com/sky/ioc/service/energy/impl/EnergyServiceImpl.java

@@ -205,10 +205,10 @@ public class EnergyServiceImpl implements EnergyService {
 
         objects.get(2).put("value",-1.2);
 
-        objects.get(3).put("value","微量");
+        objects.get(3).put("value",8);
         objects.get(3).put("compare",compare);
 
-        objects.get(1).put("value","微量");
+        objects.get(1).put("value",16);
         objects.get(1).put("compare",compare);
         indeicator.setWorthAttention("建议合理搭配智慧场景调整⽤热策略");
         indeicator.setList(objects);