Преглед изворни кода

添加所有表格实体类,创建数据

liuhaotian пре 2 година
родитељ
комит
1bb87d19f8
20 измењених фајлова са 482 додато и 127 уклоњено
  1. 2 2
      src/main/java/com/sky/ioc/controller/operation/AnalyseController.java
  2. 9 0
      src/main/java/com/sky/ioc/controller/security/LinkageController.java
  3. 3 3
      src/main/java/com/sky/ioc/entity/Cake.java
  4. 43 0
      src/main/java/com/sky/ioc/entity/GiveAlarm.java
  5. 34 0
      src/main/java/com/sky/ioc/entity/News.java
  6. 56 0
      src/main/java/com/sky/ioc/entity/life/Cuisine.java
  7. 48 0
      src/main/java/com/sky/ioc/entity/life/Parking.java
  8. 31 0
      src/main/java/com/sky/ioc/entity/life/Supermarket.java
  9. 1 0
      src/main/java/com/sky/ioc/entity/params/life/LifeRestaurantParam.java
  10. 31 0
      src/main/java/com/sky/ioc/entity/work/Access.java
  11. 17 15
      src/main/java/com/sky/ioc/service/Parking/impl/ParkingServiceImpl.java
  12. 13 7
      src/main/java/com/sky/ioc/service/assets/impl/AssetServiceImpl.java
  13. 12 17
      src/main/java/com/sky/ioc/service/canteen/impl/RestaurantServiceImpl.java
  14. 65 60
      src/main/java/com/sky/ioc/service/carbon/impl/CarbonServiceImpl.java
  15. 10 12
      src/main/java/com/sky/ioc/service/energy/impl/EnergyServiceImpl.java
  16. 2 0
      src/main/java/com/sky/ioc/service/security/SecurityService.java
  17. 18 6
      src/main/java/com/sky/ioc/service/security/impl/SecurityServiceImpl.java
  18. 1 1
      src/main/java/com/sky/ioc/service/supermarket/impl/SupermarketServiceImpl.java
  19. 85 4
      src/main/java/com/sky/ioc/tool/FalseData.java
  20. 1 0
      src/main/java/com/sky/ioc/tool/GeneralMethod.java

+ 2 - 2
src/main/java/com/sky/ioc/controller/operation/AnalyseController.java

@@ -160,12 +160,12 @@ public class AnalyseController {
         return carbonService.getEnergyAnalysisHotInfo(iocDateParam);
     }
 
-    @ApiOperation("冷能源分析(饼状图)")
+    @ApiOperation("冷能源分析")
     @PostMapping("/getEnergyAnalysisClod")
     public ReturnMsg getEnergyAnalysisClod(@RequestBody IocDateParam iocDateParam){
         return carbonService.getEnergyAnalysisClod(iocDateParam);
     }
-    @ApiOperation("光伏能源分析(饼状图)")
+    @ApiOperation("光伏能源分析")
     @PostMapping("/getEnergyAnalysisCpv")
     public ReturnMsg getEnergyAnalysisCpv(@RequestBody IocDateParam iocDateParam){
         return carbonService.getEnergyAnalysisCpv(iocDateParam);

+ 9 - 0
src/main/java/com/sky/ioc/controller/security/LinkageController.java

@@ -65,4 +65,13 @@ public class LinkageController {
         return securityService.getFloorAlarmDistribution(iocDateParam);
     }
 
+
+
+
+    @ApiOperation("告警库--告警列表信息")
+    @PostMapping("/getGiveAlarmList")
+    public ReturnMsg getGiveAlarmList(@RequestBody IocDateParam iocDateParam){
+        return securityService.getGiveAlarmList(iocDateParam);
+    }
+
 }

+ 3 - 3
src/main/java/com/sky/ioc/entity/cake.java → src/main/java/com/sky/ioc/entity/Cake.java

@@ -11,16 +11,16 @@ import java.util.concurrent.ThreadLocalRandom;
  * @Date 2023/3/10 14:01
  **/
 @Data
-public class cake {
+public class Cake {
 
     private String name;
     private int value;
 
 
-    public cake(){}
+    public Cake(){}
 
 
-    public cake(String name1){
+    public Cake(String name1){
         ThreadLocalRandom current = ThreadLocalRandom.current();
         name = name1 ;
         value = current.nextInt(50,150);

+ 43 - 0
src/main/java/com/sky/ioc/entity/GiveAlarm.java

@@ -0,0 +1,43 @@
+package com.sky.ioc.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/3/14 15:01
+ **/
+
+@Data
+public class GiveAlarm {
+
+
+    private String date;
+    /**区域*/
+    private String region;
+    /**级别*/
+    private Integer level;
+    /**来源*/
+    private String source;
+    /**类型*/
+    private Integer type;
+
+
+
+    public GiveAlarm(){
+        ThreadLocalRandom current = ThreadLocalRandom.current();
+        date = new Date(System.currentTimeMillis())+"";
+        region = "一楼大厅";
+        source = "一楼大厅"+current.nextInt(0,10)+"号机器";
+        level = current.nextInt(0,4);
+        type = current.nextInt(0,4);
+    }
+
+
+
+}

+ 34 - 0
src/main/java/com/sky/ioc/entity/News.java

@@ -0,0 +1,34 @@
+package com.sky.ioc.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * TODO
+ * @Description  新闻
+ * @Author LunCe
+ * @Date 2023/3/14 14:35
+ **/
+
+@Data
+public class News {
+
+
+    /**标题*/
+    private String tital;
+    /**撰稿人*/
+    private String writer;
+    /**撰稿时间*/
+    private String date;
+
+
+    /**内容*/
+    private String content;
+    public News(){
+        tital = "xxxxxxxxxx";
+        writer = "章峰";
+        date = new Date(System.currentTimeMillis())+"";
+        content = "中华人民共和国第十四届全国人民代表大会第一次会议,在圆满完成各项议程,产生新一届国家机构组成人员后,13日上午在北京人民大会堂闭幕。中共中央总书记、国家主席、中央军委主席习近平在会上发表重要讲话。";
+    }
+}

+ 56 - 0
src/main/java/com/sky/ioc/entity/life/Cuisine.java

@@ -0,0 +1,56 @@
+package com.sky.ioc.entity.life;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * TODO
+ * @Description  菜品实体类
+ * @Author LunCe
+ * @Date 2023/3/14 9:46
+ **/
+
+@Data
+public class Cuisine {
+
+    private String cuisineName;
+    private String cuisineImg;
+    /*
+     *  菜品类型  早餐,中餐,晚餐
+      */
+    private Integer cuisineType;
+    /*
+     *  菜品类型  热菜,凉菜,主食,汤
+     */
+    private Integer cuisineTypeTwo;
+    /*
+     *  价格
+     */
+    private JSONObject Price;
+    /*
+     *  销量
+     */
+    private Integer salesVolume;
+
+
+
+    public Cuisine(String name){
+        ThreadLocalRandom current = ThreadLocalRandom.current();
+        cuisineImg = "https://img.zcool.cn/community/018aeb5dc37c46a801209e1fb5e4d6.jpg@1280w_1l_2o_100sh.jpg";
+        cuisineType = current.nextInt(0,3);
+        cuisineTypeTwo = current.nextInt(0,4);
+        salesVolume = current.nextInt(100,2000);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("大",16);
+        jsonObject.put("小",8);
+        Price = jsonObject;
+        cuisineName = name;
+    }
+
+
+
+}

+ 48 - 0
src/main/java/com/sky/ioc/entity/life/Parking.java

@@ -0,0 +1,48 @@
+package com.sky.ioc.entity.life;
+
+import lombok.Data;
+import lombok.NonNull;
+
+import java.sql.ParameterMetaData;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/3/14 11:08
+ **/
+
+@Data
+public class Parking {
+
+
+    /**车位*/
+    private String position;
+    /**拥有者*/
+    private String people;
+    /**单位*/
+    private String company;
+    /**停车时间*/
+    private String prkingDuration;
+
+
+    /**最长停车时间*/
+    private String prkingDurationLong;
+    /**最段停车时间*/
+    private String prkingDurationBreak;
+
+
+
+
+    public Parking(String param1 , @NonNull String param2 , String param3,String param4 , String param5){
+        ThreadLocalRandom current = ThreadLocalRandom.current();
+        position = param1;
+        people = param2;
+        company = param3;
+        prkingDuration = ""+current.nextDouble(0.1,10.5);
+        prkingDurationLong  = param4;
+        prkingDurationBreak = param5;
+    }
+}

+ 31 - 0
src/main/java/com/sky/ioc/entity/life/Supermarket.java

@@ -0,0 +1,31 @@
+package com.sky.ioc.entity.life;
+
+import lombok.Data;
+
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/3/14 14:15
+ **/
+
+@Data
+public class Supermarket {
+
+    private String img;
+    private String name;
+    private String salesVolume;
+    private String price;
+
+
+    public Supermarket(String param1){
+        ThreadLocalRandom current = ThreadLocalRandom.current();
+        img = "https://p0.itc.cn/q_70/images03/20220604/eb9166efe6fe47bcb80dcb81cb2bebce.jpeg";
+        name = param1 ;
+        salesVolume = current.nextInt(1,1000)+"";
+        price = current.nextInt(1,30)+"";
+    }
+}

+ 1 - 0
src/main/java/com/sky/ioc/entity/params/life/LifeRestaurantParam.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 /**
  * 智慧生活-餐厅查询参数
+ * @author LunCe
  */
 @Data
 public class LifeRestaurantParam extends IocDateParam {

+ 31 - 0
src/main/java/com/sky/ioc/entity/work/Access.java

@@ -0,0 +1,31 @@
+package com.sky.ioc.entity.work;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/3/14 14:29
+ **/
+
+@Data
+public class Access {
+
+
+
+    private String name;
+    private String company;
+    private String endDate;
+
+
+
+    public Access(){
+        name = "章峰";
+        company = "创新产品研发中心";
+        endDate = ""+new Date(System.currentTimeMillis());
+    }
+}

+ 17 - 15
src/main/java/com/sky/ioc/service/Parking/impl/ParkingServiceImpl.java

@@ -3,7 +3,8 @@ 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.Cake;
+import com.sky.ioc.entity.life.Parking;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.Parking.ParkingService;
 import com.sky.ioc.tool.FalseData;
@@ -11,8 +12,9 @@ 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;
+import java.util.*;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 /**
  * TODO 智慧停车
@@ -54,31 +56,31 @@ public class ParkingServiceImpl implements ParkingService {
 
     @Override
     public ReturnMsg getVacantParkingSpace(IocDateParam iocDateParam) {
-        return ReturnMsg.ok(ReturnMsg.fail());
+        return ReturnMsg.ok(FalseData.PARKINGLIST);
     }
     @Override
     public ReturnMsg getParkingSpaceDetails(IocDateParam iocDateParam) {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST5);
+        return ReturnMsg.ok(FalseData.PARKINGLIST);
     }
 
 
     @Override
     public ReturnMsg getStopViolation(IocDateParam iocDateParam) {
-        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"));
+        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) {
-        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"));
+        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);
     }
 

+ 13 - 7
src/main/java/com/sky/ioc/service/assets/impl/AssetServiceImpl.java

@@ -3,10 +3,9 @@ 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.Cake;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.assets.AssetService;
-import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
@@ -84,15 +83,22 @@ public class AssetServiceImpl implements AssetService {
 
     @Override
     public ReturnMsg getAssetShareRanking(IocDateParam iocDateParam) {
-        return null;
+        List<Cake> list = new ArrayList<>();
+        list.add(new Cake("资产1"));
+        list.add(new Cake("资产2"));
+        list.add(new Cake("资产3"));
+        list.add(new Cake("资产4"));
+        list.add(new Cake("资产5"));
+        list.add(new Cake("资产6"));
+        return ReturnMsg.ok(list);
     }
 
     @Override
     public ReturnMsg getScrapAndMaintain(IocDateParam iocDateParam) {
-        List<cake> list = new ArrayList<>();
-        list.add(new cake("bumen1"));
-        list.add(new cake("bumen2"));
-        list.add(new cake("bumen3"));
+        List<Cake> list = new ArrayList<>();
+        list.add(new Cake("bumen1"));
+        list.add(new Cake("bumen2"));
+        list.add(new Cake("bumen3"));
         return ReturnMsg.ok(list);
     }
 

+ 12 - 17
src/main/java/com/sky/ioc/service/canteen/impl/RestaurantServiceImpl.java

@@ -1,11 +1,9 @@
 package com.sky.ioc.service.canteen.impl;
 
-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.cake;
+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;
@@ -14,10 +12,7 @@ import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentLinkedDeque;
 
 
 /**
@@ -38,11 +33,11 @@ public class RestaurantServiceImpl implements RestaurantService {
      */
     @Override
     public ReturnMsg getPaymentAnalysis(IocDateParam iocDateParam) {
-        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"));
+        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);
     }
 
@@ -75,7 +70,7 @@ public class RestaurantServiceImpl implements RestaurantService {
      */
     @Override
     public ReturnMsg getWelcomeDishes(IocDateParam iocDateParam) {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST3);
+        return ReturnMsg.ok(FalseData.CUISINELIST);
     }
 
 
@@ -97,7 +92,7 @@ public class RestaurantServiceImpl implements RestaurantService {
      */
     @Override
     public ReturnMsg getTodayMenu() {
-        return ReturnMsg.ok(FalseData.REPORTFORMSMAP);
+        return ReturnMsg.ok(FalseData.CUISINELIST);
     }
 
     /**
@@ -105,10 +100,10 @@ public class RestaurantServiceImpl implements RestaurantService {
      */
     @Override
     public ReturnMsg getProfitAnalysis(IocDateParam iocDateParam) {
-        List<cake> list = new ArrayList<>();
-        list.add(new cake("breakfast"));
-        list.add(new cake("lunch"));
-        list.add(new cake("dinner"));
+        List<Cake> list = new ArrayList<>();
+        list.add(new Cake("breakfast"));
+        list.add(new Cake("lunch"));
+        list.add(new Cake("dinner"));
         return ReturnMsg.ok(list);
     }
 

+ 65 - 60
src/main/java/com/sky/ioc/service/carbon/impl/CarbonServiceImpl.java

@@ -3,7 +3,8 @@ package com.sky.ioc.service.carbon.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.Cake;
+import com.sky.ioc.entity.News;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.carbon.CarbonService;
 import com.sky.ioc.tool.GeneralMethod;
@@ -154,17 +155,21 @@ public class CarbonServiceImpl implements CarbonService {
 
     @Override
     public ReturnMsg getCarbonNews(IocDateParam iocDateParam) {
-        return null;
+        List<News> newsList = new ArrayList<>();
+        newsList.add(new News());
+        newsList.add(new News());
+        newsList.add(new News());
+        return ReturnMsg.ok();
     }
 
     @Override
     public ReturnMsg getCarbonProportion(IocDateParam iocDateParam) {
-        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"));
+        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);
     }
 
@@ -407,9 +412,9 @@ public class CarbonServiceImpl implements CarbonService {
 
     @Override
     public ReturnMsg getPhotovoltaicProfit() {
-        List<cake> list = new ArrayList<>();
-        list.add(new cake("amountSubsidy"));
-        list.add(new cake("saving"));
+        List<Cake> list = new ArrayList<>();
+        list.add(new Cake("amountSubsidy"));
+        list.add(new Cake("saving"));
         return ReturnMsg.ok(list);
     }
 
@@ -471,107 +476,107 @@ public class CarbonServiceImpl implements CarbonService {
 
     @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"));
+        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"));
+        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"));
+        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<>();
+        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"));
+        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<>();
+        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"));
+        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<>();
+        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"));
+        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<>();
+        List<Cake> list = new ArrayList<>();
         System.out.println(list);
-        list.add(new cake("monthlyEnergySaving"));
-        list.add(new cake("annualEnergySaving"));
+        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<>();
+        List<Cake> list = new ArrayList<>();
         System.out.println(list);
-        list.add(new cake("waterConsumptionTotal"));
-        list.add(new cake("perCapitaCost"));
+        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<>();
+        List<Cake> list = new ArrayList<>();
         System.out.println(list);
-        list.add(new cake("powerConsumptionTotal"));
-        list.add(new cake("energyConservation"));
+        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<>();
+        List<Cake> list = new ArrayList<>();
         System.out.println(list);
-        list.add(new cake("heatConsumptionTotal"));
-        list.add(new cake("perCapitaCost"));
+        list.add(new Cake("heatConsumptionTotal"));
+        list.add(new Cake("perCapitaCost"));
         return ReturnMsg.ok(list);
     }
 

+ 10 - 12
src/main/java/com/sky/ioc/service/energy/impl/EnergyServiceImpl.java

@@ -3,15 +3,13 @@ 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.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;
 
 /**
@@ -51,12 +49,12 @@ public class EnergyServiceImpl implements EnergyService {
 
     @Override
     public ReturnMsg getElectricityCircleInfoList() {
-        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"));
+        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);
     }
 
@@ -89,9 +87,9 @@ public class EnergyServiceImpl implements EnergyService {
 
     @Override
     public ReturnMsg getWaterCircleInfoList() {
-        List<cake> list = new ArrayList<>();
-        list.add(new cake("tapWater"));
-        list.add(new cake("recycledWater"));
+        List<Cake> list = new ArrayList<>();
+        list.add(new Cake("tapWater"));
+        list.add(new Cake("recycledWater"));
         return ReturnMsg.ok(list);
     }
 

+ 2 - 0
src/main/java/com/sky/ioc/service/security/SecurityService.java

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

+ 18 - 6
src/main/java/com/sky/ioc/service/security/impl/SecurityServiceImpl.java

@@ -1,9 +1,10 @@
 package com.sky.ioc.service.security.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.sky.ioc.entity.GiveAlarm;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
-import com.sky.ioc.entity.cake;
+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;
@@ -70,11 +71,22 @@ public class SecurityServiceImpl implements SecurityService {
 
     @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"));
+        List<Cake> list = new ArrayList<>();
+        list.add(new Cake("B2"));
+        list.add(new Cake("B1"));
+        list.add(new Cake("firstFloor"));
+        return ReturnMsg.ok(list);
+    }
+
+    @Override
+    public ReturnMsg getGiveAlarmList(IocDateParam iocDateParam) {
+        List<GiveAlarm> list = new ArrayList<>();
+        list.add(new GiveAlarm());
+        list.add(new GiveAlarm());
+        list.add(new GiveAlarm());
+        list.add(new GiveAlarm());
+        list.add(new GiveAlarm());
+        list.add(new GiveAlarm());
         return ReturnMsg.ok(list);
     }
 }

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

@@ -51,7 +51,7 @@ public class SupermarketServiceImpl implements SupermarketService {
 
     @Override
     public ReturnMsg getProductRanking(IocDateParam iocDateParam) {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST5);
+        return ReturnMsg.ok(FalseData.SUPERMARKETLIST);
     }
 
     @Override

+ 85 - 4
src/main/java/com/sky/ioc/tool/FalseData.java

@@ -1,12 +1,13 @@
 package com.sky.ioc.tool;
 
+import com.sky.ioc.entity.life.Cuisine;
+import com.sky.ioc.entity.life.Parking;
+import com.sky.ioc.entity.life.Supermarket;
+import com.sky.ioc.entity.work.Access;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author LunCe
@@ -43,6 +44,86 @@ public class FalseData {
     public static List<Map<String,Object>> REPORTFORMSLIST5 = new ArrayList<>();
 
 
+    /**餐厅*/
+    public static List<Cuisine> CUISINELIST = new ArrayList<>();
+    /**停车*/
+    public static List<Parking> PARKINGLIST = new ArrayList<>();
+    /**商品*/
+    public static List<Supermarket> SUPERMARKETLIST = new ArrayList<>();
+
+    /**门禁*/
+    public static List<Access> ACCESSLIST = new ArrayList<>();
+    @PostConstruct
+    public void initializeInfo3(){
+        CUISINELIST.add(new Cuisine("铁锅炖"));
+        CUISINELIST.add(new Cuisine("酸辣臊子蹄筋"));
+        CUISINELIST.add(new Cuisine("叉烧鱼"));
+        CUISINELIST.add(new Cuisine("复元汤"));
+        CUISINELIST.add(new Cuisine("鸡包鱼翅"));
+        CUISINELIST.add(new Cuisine("酸辣臊子蹄筋"));
+        CUISINELIST.add(new Cuisine("小鸡炖蘑菇"));
+        CUISINELIST.add(new Cuisine("锅贴鸡片"));
+        CUISINELIST.add(new Cuisine("小鸡炖蘑菇"));
+        CUISINELIST.add(new Cuisine("山鸡丁儿"));
+        CUISINELIST.add(new Cuisine("麻酱凤尾"));
+        CUISINELIST.add(new Cuisine("麻酱凤尾"));
+        CUISINELIST.add(new Cuisine("麻酱凤尾"));
+        CUISINELIST.add(new Cuisine("麻酱凤尾"));
+        Collections.sort(CUISINELIST, (o1, o2) -> o2.getSalesVolume() - o1.getSalesVolume());
+
+
+        PARKINGLIST.add(new Parking("B201","张三","北京电信规划设计院","8","0"));
+        PARKINGLIST.add(new Parking("B202","李四","单位1","8","0"));
+        PARKINGLIST.add(new Parking("B203","王五","单位2","8","0"));
+        PARKINGLIST.add(new Parking("B204","马六","单位3","8","0"));
+        PARKINGLIST.add(new Parking("B205","侯七","单位4","8","0"));
+        PARKINGLIST.add(new Parking("B206","章峰1","单位5","8","0"));
+        PARKINGLIST.add(new Parking("B207","章峰2","单位7","8","0"));
+        PARKINGLIST.add(new Parking("B208","章峰3","单位8","8","0"));
+        PARKINGLIST.add(new Parking("B101","章峰4","单位9","8","0"));
+        PARKINGLIST.add(new Parking("B102","章峰5","单位10","8","0"));
+        PARKINGLIST.add(new Parking("B103","章峰6","单位111","8","0"));
+        PARKINGLIST.add(new Parking("B104","章峰7","单位12","8","0"));
+        PARKINGLIST.add(new Parking("B105","章峰8","单位13","8","0"));
+        PARKINGLIST.add(new Parking("B106","章峰9","单位10","8","0"));
+        PARKINGLIST.add(new Parking("B107","章峰1","单位10","8","0"));
+        PARKINGLIST.add(new Parking("B108","章峰12","单位10","8","0"));
+        PARKINGLIST.add(new Parking("B109","章峰5","单位15","8","0"));
+
+
+
+        SUPERMARKETLIST.add(new Supermarket("钟薛高"));
+        SUPERMARKETLIST.add(new Supermarket("雪糕"));
+        SUPERMARKETLIST.add(new Supermarket("雪糕"));
+        SUPERMARKETLIST.add(new Supermarket("雪糕"));
+        SUPERMARKETLIST.add(new Supermarket("牛肉饼"));
+        SUPERMARKETLIST.add(new Supermarket("鸭脖"));
+        SUPERMARKETLIST.add(new Supermarket("牛肉饼"));
+        SUPERMARKETLIST.add(new Supermarket("薯片"));
+        SUPERMARKETLIST.add(new Supermarket("薯条"));
+        SUPERMARKETLIST.add(new Supermarket("可乐"));
+        SUPERMARKETLIST.add(new Supermarket("雪碧"));
+        SUPERMARKETLIST.add(new Supermarket("牛板筋"));
+        SUPERMARKETLIST.add(new Supermarket("牛肉干"));
+        Collections.sort(SUPERMARKETLIST, (o1, o2) -> Integer.valueOf(o2.getSalesVolume())-Integer.valueOf(o1.getSalesVolume()));
+
+
+
+
+        ACCESSLIST.add(new Access());
+        ACCESSLIST.add(new Access());
+        ACCESSLIST.add(new Access());
+        ACCESSLIST.add(new Access());
+        ACCESSLIST.add(new Access());
+        ACCESSLIST.add(new Access());
+        ACCESSLIST.add(new Access());
+        ACCESSLIST.add(new Access());
+        ACCESSLIST.add(new Access());
+        ACCESSLIST.add(new Access());
+        ACCESSLIST.add(new Access());
+        ACCESSLIST.add(new Access());
+    }
+
 
 
 

+ 1 - 0
src/main/java/com/sky/ioc/tool/GeneralMethod.java

@@ -2,6 +2,7 @@ package com.sky.ioc.tool;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Label;
+import org.apache.poi.ss.formula.functions.T;
 
 import java.util.ArrayList;
 import java.util.List;