添加智能运营，智慧安防数据创建

src/main/java/com/sky/ioc/controller/operation/AnalyseController.java

@@ -74,46 +74,104 @@ public class AnalyseController {
 
     @ApiOperation("总能源趋势")
     @PostMapping("/getEnergyTrendsTotal")
-    public ReturnMsg getEnergyTrendsTotal(){
-        return carbonService.getEnergyTrendsTotal();
+    public ReturnMsg getEnergyTrendsTotal(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyTrendsTotal(iocDateParam);
     }
 
 
     @ApiOperation("光伏能源趋势")
     @PostMapping("/getEnergyTrendsAnalyseCpv")
-    public ReturnMsg getEnergyTrendsAnalyseCpv(){
-        return carbonService.getEnergyTrendsAnalyseCpv();
+    public ReturnMsg getEnergyTrendsAnalyseCpv(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyTrendsAnalyseCpv(iocDateParam);
     }
     @ApiOperation("光伏能源分布中的图表")
     @PostMapping("/getEnergyTrendsAnalyseCpvInfo")
-    public ReturnMsg getEnergyTrendsAnalyseCpvInfo(){
-        return carbonService.getEnergyTrendsAnalyseCpvInfo();
+    public ReturnMsg getEnergyTrendsAnalyseCpvInfo(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyTrendsAnalyseCpvInfo(iocDateParam);
     }
 
     @ApiOperation("用冷能源趋势")
     @PostMapping("/getEnergyTrendsAnalyseCold")
-    public ReturnMsg getEnergyTrendsAnalyseCold(){
-        return carbonService.getEnergyTrendsAnalyseCold();
+    public ReturnMsg getEnergyTrendsAnalyseCold(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyTrendsAnalyseCold(iocDateParam);
     }
 
     @ApiOperation("用热能源趋势")
     @PostMapping("/getEnergyTrendsAnalyseHot")
-    public ReturnMsg getEnergyTrendsAnalyseHot(){
-        return carbonService.getEnergyTrendsAnalyseHot();
+    public ReturnMsg getEnergyTrendsAnalyseHot(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyTrendsAnalyseHot(iocDateParam);
     }
 
 
     @ApiOperation("用电能源趋势")
     @PostMapping("/getEnergyTrendsAnalysePower")
-    public ReturnMsg getEnergyTrendsAnalysePower(){
-        return carbonService.getEnergyTrendsAnalysePower();
+    public ReturnMsg getEnergyTrendsAnalysePower(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyTrendsAnalysePower(iocDateParam);
     }
 
     @ApiOperation("用热能源趋势")
     @PostMapping("/getEnergyTrendsAnalyseWater")
-    public ReturnMsg getEnergyTrendsAnalyseWater(){
-        return carbonService.getEnergyTrendsAnalyseWater();
+    public ReturnMsg getEnergyTrendsAnalyseWater(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyTrendsAnalyseWater(iocDateParam);
     }
 
 
+    @ApiOperation("总能源分析(饼状图)")
+    @PostMapping("/getEnergyAnalysisTotal")
+    public ReturnMsg getEnergyAnalysisTotal(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyAnalysisTotal(iocDateParam);
+    }
+    @ApiOperation("水能源分析(饼状图)")
+    @PostMapping("/getEnergyAnalysisWater")
+    public ReturnMsg getEnergyAnalysisWater(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyAnalysisWater(iocDateParam);
+    }
+
+    @ApiOperation("用电能源分析(饼状图)")
+    @PostMapping("/getEnergyAnalysisPower")
+    public ReturnMsg getEnergyAnalysisPower(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyAnalysisPower(iocDateParam);
+    }
+    @ApiOperation("热能源分析(饼状图)")
+    @PostMapping("/getEnergyAnalysisHot")
+    public ReturnMsg getEnergyAnalysisHot(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyAnalysisHot(iocDateParam);
+    }
+
+    @ApiOperation("总能源分析统计")
+    @PostMapping("/getEnergyAnalysisTotalInfo")
+    public ReturnMsg getEnergyAnalysisTotalInfo(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyAnalysisTotalInfo(iocDateParam);
+    }
+    @ApiOperation("水能源分析统计")
+    @PostMapping("/getEnergyAnalysisWaterInfo")
+    public ReturnMsg getEnergyAnalysisWaterInfo(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyAnalysisWaterInfo(iocDateParam);
+    }
+
+    @ApiOperation("用电能源分析统计")
+    @PostMapping("/getEnergyAnalysisPowerInfo")
+    public ReturnMsg getEnergyAnalysisPowerInfo(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyAnalysisPowerInfo(iocDateParam);
+    }
+    @ApiOperation("热能源分析统计")
+    @PostMapping("/getEnergyAnalysisHotInfo")
+    public ReturnMsg getEnergyAnalysisHotInfo(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyAnalysisHotInfo(iocDateParam);
+    }
+
+    @ApiOperation("冷能源分析(饼状图)")
+    @PostMapping("/getEnergyAnalysisClod")
+    public ReturnMsg getEnergyAnalysisClod(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyAnalysisClod(iocDateParam);
+    }
+    @ApiOperation("光伏能源分析(饼状图)")
+    @PostMapping("/getEnergyAnalysisCpv")
+    public ReturnMsg getEnergyAnalysisCpv(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getEnergyAnalysisCpv(iocDateParam);
+    }
+
+
+
+
 }

src/main/java/com/sky/ioc/controller/security/LinkageController.java

@@ -57,4 +57,12 @@ public class LinkageController {
         return securityService.getEquipmentOnline(iocDateParam);
     }
 
+
+
+    @ApiOperation("告警管理--楼层告警分布")
+    @PostMapping("/getFloorAlarmDistribution")
+    public ReturnMsg getFloorAlarmDistribution(@RequestBody IocDateParam iocDateParam){
+        return securityService.getFloorAlarmDistribution(iocDateParam);
+    }
+
 }

src/main/java/com/sky/ioc/entity/result/dashboard/Personnel.java

@@ -1,31 +0,0 @@
-package com.sky.ioc.entity.result.dashboard;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author LunCe
- * 智能看板 人员报表信息
- */
-@Data
-public class Personnel {
-
-
-    /**自有员工*/
-    private Integer ownEmployees;
-    /**外协员工*/
-    private Integer outsourcingStaff;
-    /**外协员工*/
-    private Integer visitors;
-    /**时间*/
-    private Date startDate;
-
-
-    public Personnel(int i, int i1, int i2, Date date) {
-        ownEmployees = i;
-        outsourcingStaff =i1;
-        visitors =i2;
-        startDate=date;
-    }
-}

src/main/java/com/sky/ioc/service/Parking/impl/ParkingServiceImpl.java

@@ -3,6 +3,7 @@ package com.sky.ioc.service.Parking.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
+import com.sky.ioc.entity.cake;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.Parking.ParkingService;
 import com.sky.ioc.tool.FalseData;
@@ -10,6 +11,7 @@ import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -62,12 +64,22 @@ public class ParkingServiceImpl implements ParkingService {
 
     @Override
     public ReturnMsg getStopViolation(IocDateParam iocDateParam) {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
+        List<cake> list = new ArrayList<>();
+        list.add(new cake("qitadanwei"));
+        list.add(new cake("beijingguihuayuan"));
+        list.add(new cake("zhongxunyuan"));
+        list.add(new cake("danwei1"));
+        return ReturnMsg.ok(list);
     }
 
     @Override
     public ReturnMsg getOccupationOfParkingSpace(IocDateParam iocDateParam) {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
+        List<cake> list = new ArrayList<>();
+        list.add(new cake("qitadanwei"));
+        list.add(new cake("beijingguihuayuan"));
+        list.add(new cake("zhongxunyuan"));
+        list.add(new cake("danwei1"));
+        return ReturnMsg.ok(list);
     }
 
 

src/main/java/com/sky/ioc/service/assets/impl/AssetServiceImpl.java

@@ -3,6 +3,7 @@ package com.sky.ioc.service.assets.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
+import com.sky.ioc.entity.cake;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.assets.AssetService;
 import com.sky.ioc.tool.FalseData;
@@ -10,6 +11,7 @@ import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -87,7 +89,11 @@ public class AssetServiceImpl implements AssetService {
 
     @Override
     public ReturnMsg getScrapAndMaintain(IocDateParam iocDateParam) {
-        return null;
+        List<cake> list = new ArrayList<>();
+        list.add(new cake("bumen1"));
+        list.add(new cake("bumen2"));
+        list.add(new cake("bumen3"));
+        return ReturnMsg.ok(list);
     }
 
     @Override

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

@@ -5,6 +5,7 @@ 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.cake;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.canteen.RestaurantService;
 import com.sky.ioc.tool.FalseData;
@@ -37,7 +38,12 @@ public class RestaurantServiceImpl implements RestaurantService {
      */
     @Override
     public ReturnMsg getPaymentAnalysis(IocDateParam iocDateParam) {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
+        List<cake> list = new ArrayList<>();
+        list.add(new cake("Offline"));
+        list.add(new cake("scanningCode"));
+        list.add(new cake("payCard"));
+        list.add(new cake("Face"));
+        return ReturnMsg.ok(list);
     }
 
 
@@ -99,7 +105,11 @@ public class RestaurantServiceImpl implements RestaurantService {
      */
     @Override
     public ReturnMsg getProfitAnalysis(IocDateParam iocDateParam) {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
+        List<cake> list = new ArrayList<>();
+        list.add(new cake("breakfast"));
+        list.add(new cake("lunch"));
+        list.add(new cake("dinner"));
+        return ReturnMsg.ok(list);
     }
 
     /**

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

@@ -70,17 +70,37 @@ public interface CarbonService {
 
     ReturnMsg getPhotovoltaicProfit();
 
-    ReturnMsg getEnergyTrendsAnalyseWater();
+    ReturnMsg getEnergyTrendsAnalyseWater(IocDateParam iocDateParam);
 
-    ReturnMsg getEnergyTrendsAnalysePower();
+    ReturnMsg getEnergyTrendsAnalysePower(IocDateParam iocDateParam);
 
-    ReturnMsg getEnergyTrendsAnalyseHot();
+    ReturnMsg getEnergyTrendsAnalyseHot(IocDateParam iocDateParam);
 
-    ReturnMsg getEnergyTrendsAnalyseCold();
+    ReturnMsg getEnergyTrendsAnalyseCold(IocDateParam iocDateParam);
 
-    ReturnMsg getEnergyTrendsAnalyseCpv();
+    ReturnMsg getEnergyTrendsAnalyseCpv(IocDateParam iocDateParam);
 
-    ReturnMsg getEnergyTrendsTotal();
+    ReturnMsg getEnergyTrendsTotal(IocDateParam iocDateParam);
 
-    ReturnMsg getEnergyTrendsAnalyseCpvInfo();
+    ReturnMsg getEnergyTrendsAnalyseCpvInfo(IocDateParam iocDateParam);
+
+    ReturnMsg getEnergyAnalysisWater(IocDateParam iocDateParam);
+
+    ReturnMsg getEnergyAnalysisTotal(IocDateParam iocDateParam);
+
+    ReturnMsg getEnergyAnalysisPower(IocDateParam iocDateParam);
+
+    ReturnMsg getEnergyAnalysisHot(IocDateParam iocDateParam);
+
+    ReturnMsg getEnergyAnalysisClod(IocDateParam iocDateParam);
+
+    ReturnMsg getEnergyAnalysisCpv(IocDateParam iocDateParam);
+
+    ReturnMsg getEnergyAnalysisTotalInfo(IocDateParam iocDateParam);
+
+    ReturnMsg getEnergyAnalysisWaterInfo(IocDateParam iocDateParam);
+
+    ReturnMsg getEnergyAnalysisPowerInfo(IocDateParam iocDateParam);
+
+    ReturnMsg getEnergyAnalysisHotInfo(IocDateParam iocDateParam);
 }

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

@@ -1,21 +1,17 @@
 package com.sky.ioc.service.carbon.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
+import com.sky.ioc.entity.cake;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.carbon.CarbonService;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
-import java.security.PublicKey;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * TODO  双碳
@@ -163,7 +159,13 @@ public class CarbonServiceImpl implements CarbonService {
 
     @Override
     public ReturnMsg getCarbonProportion(IocDateParam iocDateParam) {
-        return null;
+        List<cake> list = new ArrayList<>();
+        list.add(new cake("dieselOil"));
+        list.add(new cake("gasoline"));
+        list.add(new cake("naturalGas"));
+        list.add(new cake("power"));
+        list.add(new cake("qita"));
+        return ReturnMsg.ok(list);
     }
 
     @Override
@@ -405,15 +407,14 @@ public class CarbonServiceImpl implements CarbonService {
 
     @Override
     public ReturnMsg getPhotovoltaicProfit() {
-        ThreadLocalRandom current = ThreadLocalRandom.current();
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("amountSubsidy",current.nextInt(50,150));
-        jsonObject.put("saving",current.nextInt(50,150));
-        return ReturnMsg.ok(jsonObject);
+        List<cake> list = new ArrayList<>();
+        list.add(new cake("amountSubsidy"));
+        list.add(new cake("saving"));
+        return ReturnMsg.ok(list);
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsAnalyseWater() {
+    public ReturnMsg getEnergyTrendsAnalyseWater(IocDateParam iocDateParam) {
         String[] param = {"tapWater","recycledWater"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -421,7 +422,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsAnalysePower() {
+    public ReturnMsg getEnergyTrendsAnalysePower(IocDateParam iocDateParam) {
         String[] param = {"tip","seal","flat","valley"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -429,7 +430,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsAnalyseHot() {
+    public ReturnMsg getEnergyTrendsAnalyseHot(IocDateParam iocDateParam) {
         String[] param = {"heatConsumption"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -437,7 +438,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsAnalyseCold() {
+    public ReturnMsg getEnergyTrendsAnalyseCold(IocDateParam iocDateParam) {
         String[] param = {"refrigerationCapacity","energyConsumption"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -445,7 +446,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsAnalyseCpv() {
+    public ReturnMsg getEnergyTrendsAnalyseCpv(IocDateParam iocDateParam) {
         String[] param = {"powerGeneration","outputPower"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -453,7 +454,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsTotal() {
+    public ReturnMsg getEnergyTrendsTotal(IocDateParam iocDateParam) {
         String[] param = {"water","cpv","cold","hot","power"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -461,11 +462,117 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsAnalyseCpvInfo() {
+    public ReturnMsg getEnergyTrendsAnalyseCpvInfo(IocDateParam iocDateParam) {
         String[] param = {"governmentSubsidies","save"};
         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
+    public ReturnMsg getEnergyAnalysisWater(IocDateParam iocDateParam) {
+        List<cake> list = new ArrayList<>();
+        list.add(new cake("office"));
+        list.add(new cake("computerRoom"));
+        list.add(new cake("restaurant"));
+        list.add(new cake("parkingLot"));
+        list.add(new cake("qita"));
+        return ReturnMsg.ok(list);
+    }
+
+    @Override
+    public ReturnMsg getEnergyAnalysisTotal(IocDateParam iocDateParam) {
+        List<cake> list = new ArrayList<>();
+        list.add(new cake("power"));
+        list.add(new cake("hot"));
+        list.add(new cake("clod"));
+        list.add(new cake("cpv"));
+        list.add(new cake("water"));
+        return ReturnMsg.ok(list);
+    }
+
+    @Override
+    public ReturnMsg getEnergyAnalysisPower(IocDateParam iocDateParam) {
+        List<cake> list = new ArrayList<>();
+        list.add(new cake("computerRoom"));
+        list.add(new cake("socket"));
+        list.add(new cake("lighting"));
+        list.add(new cake("airConditioner"));
+        list.add(new cake("qita"));
+        return ReturnMsg.ok(list);
+    }
+
+    @Override
+    public ReturnMsg getEnergyAnalysisHot(IocDateParam iocDateParam) {
+        List<cake> list = new ArrayList<>();
+        System.out.println(list);
+        list.add(new cake("computerRoom"));
+        list.add(new cake("parking"));
+        list.add(new cake("restaurant"));
+        list.add(new cake("office"));
+        list.add(new cake("qita"));
+        return ReturnMsg.ok(list);
+    }
+
+    @Override
+    public ReturnMsg getEnergyAnalysisClod(IocDateParam iocDateParam) {
+        List<cake> list = new ArrayList<>();
+        System.out.println(list);
+        list.add(new cake("function"));
+        list.add(new cake("whole"));
+        list.add(new cake("clodTotal"));
+        list.add(new cake("perCapitaCost"));
+        list.add(new cake("inletWaterTemperature"));
+        list.add(new cake("outletWaterTemperature"));
+        return ReturnMsg.ok(list);
+    }
+
+    @Override
+    public ReturnMsg getEnergyAnalysisCpv(IocDateParam iocDateParam) {
+        List<cake> list = new ArrayList<>();
+        System.out.println(list);
+        list.add(new cake("function"));
+        list.add(new cake("whole"));
+        list.add(new cake("electricTotal"));
+        list.add(new cake("electricDate"));
+        list.add(new cake("profitTotal"));
+        return ReturnMsg.ok(list);
+    }
+
+    @Override
+    public ReturnMsg getEnergyAnalysisTotalInfo(IocDateParam iocDateParam) {
+        List<cake> list = new ArrayList<>();
+        System.out.println(list);
+        list.add(new cake("monthlyEnergySaving"));
+        list.add(new cake("annualEnergySaving"));
+        return ReturnMsg.ok(list);
+    }
+
+    @Override
+    public ReturnMsg getEnergyAnalysisWaterInfo(IocDateParam iocDateParam) {
+        List<cake> list = new ArrayList<>();
+        System.out.println(list);
+        list.add(new cake("waterConsumptionTotal"));
+        list.add(new cake("perCapitaCost"));
+        return ReturnMsg.ok(list);
+    }
+
+    @Override
+    public ReturnMsg getEnergyAnalysisPowerInfo(IocDateParam iocDateParam) {
+        List<cake> list = new ArrayList<>();
+        System.out.println(list);
+        list.add(new cake("powerConsumptionTotal"));
+        list.add(new cake("energyConservation"));
+        return ReturnMsg.ok(list);
+    }
+
+    @Override
+    public ReturnMsg getEnergyAnalysisHotInfo(IocDateParam iocDateParam) {
+        List<cake> list = new ArrayList<>();
+        System.out.println(list);
+        list.add(new cake("heatConsumptionTotal"));
+        list.add(new cake("perCapitaCost"));
+        return ReturnMsg.ok(list);
+    }
+
 }

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

@@ -3,12 +3,14 @@ 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.entity.cake;
 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;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -49,7 +51,13 @@ public class EnergyServiceImpl implements EnergyService {
 
     @Override
     public ReturnMsg getElectricityCircleInfoList() {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
+        List<cake> list = new ArrayList<>();
+        list.add(new cake("qita"));
+        list.add(new cake("gonggong"));
+        list.add(new cake("xinxi"));
+        list.add(new cake("zhaoming"));
+        list.add(new cake("dongli"));
+        return ReturnMsg.ok(list);
     }
 
     @Override
@@ -81,7 +89,10 @@ public class EnergyServiceImpl implements EnergyService {
 
     @Override
     public ReturnMsg getWaterCircleInfoList() {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
+        List<cake> list = new ArrayList<>();
+        list.add(new cake("tapWater"));
+        list.add(new cake("recycledWater"));
+        return ReturnMsg.ok(list);
     }
 
     @Override

src/main/java/com/sky/ioc/service/personnel/impl/PersonnelServiceImpl.java

@@ -4,7 +4,6 @@ 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.entity.result.dashboard.Personnel;
 import com.sky.ioc.service.personnel.PersonnelService;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;

src/main/java/com/sky/ioc/service/security/SecurityService.java

@@ -18,4 +18,6 @@ public interface SecurityService {
     ReturnMsg getAlarmClassification(IocDateParam iocDateParam);
 
     ReturnMsg getEquipmentOnline(IocDateParam iocDateParam);
+
+    ReturnMsg getFloorAlarmDistribution(IocDateParam iocDateParam);
 }

src/main/java/com/sky/ioc/service/security/impl/SecurityServiceImpl.java

@@ -3,12 +3,14 @@ package com.sky.ioc.service.security.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
+import com.sky.ioc.entity.cake;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.security.SecurityService;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -65,4 +67,14 @@ public class SecurityServiceImpl implements SecurityService {
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);
     }
+
+    @Override
+    public ReturnMsg getFloorAlarmDistribution(IocDateParam iocDateParam) {
+        List<cake> list = new ArrayList<>();
+        System.out.println(list);
+        list.add(new cake("B2"));
+        list.add(new cake("B1"));
+        list.add(new cake("firstFloor"));
+        return ReturnMsg.ok(list);
+    }
 }