添加智能看板信息报表数据

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

@@ -38,7 +38,15 @@ public class DashboardController {
     public ReturnMsg getBuildingSituation(){
         return spaceService.getBuildingSituation();
     }
-
+    /**
+     *
+     * 空间概览
+     * */
+    @ApiOperation("智能看板-空间概览")
+    @GetMapping("getSpaceOverview")
+    public ReturnMsg getSpaceOverview(){
+        return spaceService.getSpaceOverview();
+    }
 
     /**
      *

src/main/java/com/sky/ioc/service/canteen/impl/RestaurantServiceImpl.java

@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
+import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.canteen.RestaurantService;
 import com.sky.ioc.tool.FalseData;
+import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
@@ -141,6 +143,9 @@ public class RestaurantServiceImpl implements RestaurantService {
      */
     @Override
     public ReturnMsg getRestaurantConsumptionChart() {
-        return ReturnMsg.ok(FalseData.REPORTFORMSMAP);
+        String[] param = {"consumptionAmount","consumptionOrder"};
+        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 }

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

@@ -69,4 +69,5 @@ public interface CarbonService {
     ReturnMsg getAnalyseCpvCoreIndicators(IocDateParam iocDateParam);
 
     ReturnMsg getPhotovoltaicProfit();
+
 }

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

@@ -39,27 +39,10 @@ public class CarbonServiceImpl implements CarbonService {
      */
     @Override
     public ReturnMsg getCarbonQuota() {
-        List<Map<String,Object>> listMap = new ArrayList<>();
-        listMap.get(0).put("info","上分");
-        listMap.get(0).put("consumed",500);
-        listMap.get(0).put("carbonQuota",100);
-
-        listMap.get(1).put("info","广分");
-        listMap.get(1).put("consumed",500);
-        listMap.get(1).put("carbonQuota",200);
-
-        listMap.get(2).put("info","郑分");
-        listMap.get(2).put("consumed",500);
-        listMap.get(2).put("carbonQuota",402);
-
-        listMap.get(3).put("info","规划院");
-        listMap.get(3).put("consumed",500);
-        listMap.get(3).put("carbonQuota",520);
-
-        listMap.get(4).put("info","总部");
-        listMap.get(4).put("consumed",500);
-        listMap.get(4).put("carbonQuota",520);
-        return ReturnMsg.ok(listMap);
+        String[] param = {"consumed","carbonQuota"};
+        String[] labelKey = {"总部","规划院","郑分","广分","上分"};
+        List<Label> labels = GeneralMethod.getInstance().dataGeneration(param, labelKey);
+        return ReturnMsg.ok(labels);
     }
 
     @Override
@@ -389,7 +372,8 @@ public class CarbonServiceImpl implements CarbonService {
         ThreadLocalRandom current = ThreadLocalRandom.current();
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("amountSubsidy",current.nextInt(50,150));
-        jsonObject.put("Savings",current.nextInt(50,150));
+        jsonObject.put("saving",current.nextInt(50,150));
         return ReturnMsg.ok(jsonObject);
     }
+
 }

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

@@ -2,8 +2,10 @@ package com.sky.ioc.service.energy.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
+import com.sky.ioc.entity.Label;
 import com.sky.ioc.service.energy.EnergyService;
 import com.sky.ioc.tool.FalseData;
+import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
@@ -39,7 +41,10 @@ public class EnergyServiceImpl implements EnergyService {
 
     @Override
     public ReturnMsg getElectricityInfoList() {
-        return ReturnMsg.ok( FalseData.REPORTFORMSMAP);
+        String[] param = {"powerConsumption"};
+        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override
@@ -68,7 +73,10 @@ public class EnergyServiceImpl implements EnergyService {
 
     @Override
     public ReturnMsg getWaterInfoList() {
-        return ReturnMsg.ok( FalseData.REPORTFORMSMAP);
+        String[] param = {"water"};
+        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override
@@ -96,7 +104,10 @@ public class EnergyServiceImpl implements EnergyService {
 
     @Override
     public ReturnMsg getUseColdInfoList() {
-        return ReturnMsg.ok( FalseData.REPORTFORMSMAP);
+        String[] param = {"coolingCapacity","temperature"};
+        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override
@@ -119,6 +130,9 @@ public class EnergyServiceImpl implements EnergyService {
 
     @Override
     public ReturnMsg getUseHeatInfoList() {
-        return ReturnMsg.ok( FalseData.REPORTFORMSMAP);
+        String[] param = {"heatConsumption","temperature"};
+        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 }

src/main/java/com/sky/ioc/service/space/SpaceService.java

@@ -28,4 +28,6 @@ public interface SpaceService {
     ReturnMsg getSpaceInfo(IocDateParam iocDateParam);
 
     ReturnMsg getSpaceCoreIndicators(IocDateParam iocDateParam);
+
+    ReturnMsg getSpaceOverview();
 }

src/main/java/com/sky/ioc/service/space/impl/SpaceServiceImpl.java

@@ -121,4 +121,31 @@ public class SpaceServiceImpl implements SpaceService {
         indeicator.setList(objects);
         return ReturnMsg.ok(indeicator);
     }
+
+    @Override
+    public ReturnMsg getSpaceOverview() {
+        JSONArray jsonArray = new JSONArray();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("total",2000);
+        jsonObject.put("occupancy",1800);
+        jsonObject.put("percentage",0.75);
+
+        JSONObject jsonObject2 = new JSONObject();
+        jsonObject2.put("total",2000);
+        jsonObject2.put("occupancy",1800);
+        jsonObject2.put("percentage",0.97);
+
+        JSONObject jsonObject3 = new JSONObject();
+        jsonObject3.put("total",2000);
+        jsonObject3.put("occupancy",1800);
+        jsonObject3.put("percentage",0.93);
+        jsonArray.add(jsonObject);
+        jsonArray.add(jsonObject2);
+        jsonArray.add(jsonObject3);
+
+
+        JSONObject jsonObject1 = new JSONObject();
+        jsonObject1.put("data",jsonArray);
+        return ReturnMsg.ok(jsonObject1);
+    }
 }

src/main/java/com/sky/ioc/service/supermarket/impl/SupermarketServiceImpl.java

@@ -2,9 +2,11 @@ package com.sky.ioc.service.supermarket.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
+import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.supermarket.SupermarketService;
 import com.sky.ioc.tool.FalseData;
+import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
@@ -51,7 +53,10 @@ public class SupermarketServiceImpl implements SupermarketService {
 
     @Override
     public ReturnMsg getSupermarketInfoList() {
-       return ReturnMsg.ok( FalseData.REPORTFORMSMAP);
+        String[] param = {"consumptionAmount","consumptionOrder"};
+        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override