添加所有的核心指标数据

src/main/java/com/sky/ioc/config/GlobalExceptionHandler.java

@@ -19,28 +19,28 @@ import java.io.PrintStream;
 @RestControllerAdvice
 public class GlobalExceptionHandler {
 
-    @ExceptionHandler(Exception.class)
-    public ReturnMsg exception(Exception e,HttpServletRequest request) {
-        String requestURI = request.getRequestURI();
-        StringBuffer requestURL = request.getRequestURL();
-        // 打印出错误日志
-        String exceptionAllinformation_01 = getExceptionAllinformation_01(e);
-        log.error("异常地址'{"+requestURL+"}'","发生异常为：'{"+exceptionAllinformation_01+"'}");
-        return ReturnMsg.fail();
-    }
+//    @ExceptionHandler(Exception.class)
+//    public ReturnMsg exception(Exception e,HttpServletRequest request) {
+//        String requestURI = request.getRequestURI();
+//        StringBuffer requestURL = request.getRequestURL();
+//        // 打印出错误日志
+//        String exceptionAllinformation_01 = getExceptionAllinformation_01(e);
+//        log.error("异常地址'{"+requestURL+"}'","发生异常为：'{"+exceptionAllinformation_01+"'}");
+//        return ReturnMsg.fail();
+//    }
 
-    public static String getExceptionAllinformation_01(Exception ex) {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        PrintStream pout = new PrintStream(out);
-        ex.printStackTrace(pout);
-        String ret = new String(out.toByteArray());
-        pout.close();
-        try {
-            out.close();
-        } catch (Exception e) {
-        }
-        return ret;
-    }
+//    public static String getExceptionAllinformation_01(Exception ex) {
+//        ByteArrayOutputStream out = new ByteArrayOutputStream();
+//        PrintStream pout = new PrintStream(out);
+//        ex.printStackTrace(pout);
+//        String ret = new String(out.toByteArray());
+//        pout.close();
+//        try {
+//            out.close();
+//        } catch (Exception e) {
+//        }
+//        return ret;
+//    }
 
 //    public String getExceptionMessage(Exception ex) {
 //        StringWriter stringWriter= new StringWriter();

src/main/java/com/sky/ioc/controller/carbon/CarbonController.java

@@ -1,17 +1,17 @@
 package com.sky.ioc.controller.carbon;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.carbon.CarbonService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /** 数智双碳----双碳概览
  * @author LunCe*/
-@Api("数智双碳----双碳概览")
+@Api(tags ="数智双碳----双碳概览")
 @Slf4j
 @RestController
 @RequestMapping("/carbon")
@@ -21,39 +21,39 @@ public class CarbonController {
     private CarbonService carbonService;
 
     @ApiOperation("核心指标")
-    @GetMapping("/getCarbonCoreIndicators")
-    public String getFloorCoreIndicators(){
-        return carbonService.getFloorCoreIndicators();
+    @PostMapping("/getCarbonCoreIndicators")
+    public ReturnMsg getFloorCoreIndicators(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getFloorCoreIndicators(iocDateParam);
     }
 
 
     @ApiOperation("碳排放分析")
-    @GetMapping("/getCarbonInfo")
-    public String getCarbonInfo(){
-        return carbonService.getCarbonInfo();
+    @PostMapping("/getCarbonInfo")
+    public ReturnMsg getCarbonInfo(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getCarbonInfo(iocDateParam);
     }
 
 
 
 
     @ApiOperation("碳配额构成")
-    @GetMapping("/getCarbonQuotaComposition")
-    public String getCarbonQuotaComposition(){
-        return carbonService.getCarbonQuotaComposition();
+    @PostMapping("/getCarbonQuotaComposition")
+    public ReturnMsg getCarbonQuotaComposition(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getCarbonQuotaComposition(iocDateParam);
     }
 
 
 
     @ApiOperation("双碳新闻")
-    @GetMapping("/getCarbonNews")
-    public String getCarbonNews(){
-        return carbonService.getCarbonNews();
+    @PostMapping("/getCarbonNews")
+    public ReturnMsg getCarbonNews(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getCarbonNews(iocDateParam);
     }
 
     @ApiOperation("碳排放占比")
-    @GetMapping("/getCarbonProportion")
-    public String getCarbonProportion(){
-        return carbonService.getCarbonProportion();
+    @PostMapping("/getCarbonProportion")
+    public ReturnMsg getCarbonProportion(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getCarbonProportion(iocDateParam);
     }
 
 

src/main/java/com/sky/ioc/controller/carbon/PhotovoltaicController.java

@@ -1,11 +1,14 @@
 package com.sky.ioc.controller.carbon;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.carbon.CarbonService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+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;
 
@@ -17,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Date 2023/3/1 13:25
  **/
 
-@Api("数智双碳----光伏发电")
+@Api(tags ="数智双碳----光伏发电")
 @Slf4j
 @RestController
 @RequestMapping("/photovoltaic")
@@ -29,25 +32,25 @@ public class PhotovoltaicController {
 
 
     @ApiOperation("核心指标")
-    @GetMapping("/getPhotovoltaicCoreIndicators")
-    public String getPhotovoltaicCoreIndicators(){
-        return carbonService.getPhotovoltaicCoreIndicators();
+    @PostMapping("/getPhotovoltaicCoreIndicators")
+    public ReturnMsg getPhotovoltaicCoreIndicators(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getPhotovoltaicCoreIndicators(iocDateParam);
     }
 
 
     @ApiOperation("光伏减排分析")
-    @GetMapping("/getPhotovoltaicInfo")
-    public String getPhotovoltaicInfo(){
-        return carbonService.getPhotovoltaicInfo();
+    @PostMapping("/getPhotovoltaicInfo")
+    public ReturnMsg getPhotovoltaicInfo(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getPhotovoltaicInfo(iocDateParam);
     }
 
 
 
 
     @ApiOperation("车辆排放排名")
-    @GetMapping("/getPhotovoltaicInfoOrder")
-    public String getPhotovoltaicInfoOrder(){
-        return carbonService.getPhotovoltaicInfoOrder();
+    @PostMapping("/getPhotovoltaicInfoOrder")
+    public ReturnMsg getPhotovoltaicInfoOrder(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getPhotovoltaicInfoOrder(iocDateParam);
     }
 
 }

src/main/java/com/sky/ioc/controller/carbon/PrintController.java

@@ -1,11 +1,14 @@
 package com.sky.ioc.controller.carbon;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.carbon.CarbonService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+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;
 
@@ -18,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
  **/
 
 
-@Api("数智双碳----文印排放")
+@Api(tags ="数智双碳----文印排放")
 @Slf4j
 @RestController
 @RequestMapping("/print")
@@ -31,25 +34,25 @@ public class PrintController {
 
 
     @ApiOperation("核心指标")
-    @GetMapping("/getPrintCoreIndicators")
-    public String getPrintCoreIndicators(){
-        return carbonService.getPrintCoreIndicators();
+    @PostMapping("/getPrintCoreIndicators")
+    public ReturnMsg getPrintCoreIndicators(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getPrintCoreIndicators(iocDateParam);
     }
 
 
     @ApiOperation("车辆排放情况")
-    @GetMapping("/getPrintInfo")
-    public String getPrintInfo(){
-        return carbonService.getPrintInfo();
+    @PostMapping("/getPrintInfo")
+    public ReturnMsg getPrintInfo(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getPrintInfo(iocDateParam);
     }
 
 
 
 
     @ApiOperation("车辆排放排名")
-    @GetMapping("/getPrintInfoOrder")
-    public String getPrintInfoOrder(){
-        return carbonService.getPrintInfoOrder();
+    @PostMapping("/getPrintInfoOrder")
+    public ReturnMsg getPrintInfoOrder(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getPrintInfoOrder(iocDateParam);
     }
 
 }

src/main/java/com/sky/ioc/controller/carbon/VehicleController.java

@@ -1,11 +1,14 @@
 package com.sky.ioc.controller.carbon;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.carbon.CarbonService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+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;
 
@@ -18,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
  **/
 
 
-@Api("数智双碳----车辆排放")
+@Api(tags ="数智双碳----车辆排放")
 @Slf4j
 @RestController
 @RequestMapping("/vehicle")
@@ -33,25 +36,25 @@ public class VehicleController {
 
 
     @ApiOperation("核心指标")
-    @GetMapping("/getVehicleCoreIndicators")
-    public String getVehicleCoreIndicators(){
-        return carbonService.getVehicleCoreIndicators();
+    @PostMapping("/getVehicleCoreIndicators")
+    public ReturnMsg getVehicleCoreIndicators(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getVehicleCoreIndicators(iocDateParam);
     }
 
 
     @ApiOperation("车辆排放情况")
-    @GetMapping("/getVehicleInfo")
-    public String getVehicleInfo(){
-        return carbonService.getVehicleInfo();
+    @PostMapping("/getVehicleInfo")
+    public ReturnMsg getVehicleInfo(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getVehicleInfo(iocDateParam);
     }
 
 
 
 
     @ApiOperation("车辆排放排名")
-    @GetMapping("/getVehicleInfoOrder")
-    public String getVehicleInfoOrder(){
-        return carbonService.getVehicleInfoOrder();
+    @PostMapping("/getVehicleInfoOrder")
+    public ReturnMsg getVehicleInfoOrder(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getVehicleInfoOrder(iocDateParam);
     }
 
 

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

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 智能看板  ---- 资产
  */
 
-@Api("智能看板----资产")
+@Api(tags ="智能看板----资产")
 @Slf4j
 @RestController
 @RequestMapping("asset")

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

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /** 智能看板
  * @author LunCe*/
-@Api("智能看板")
+@Api(tags ="智能看板")
 @Slf4j
 @RestController
 @RequestMapping("/dashboard")

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

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 智能看板  ---- 餐厅
  */
 
-@Api("智能看板----餐厅")
+@Api(tags ="智能看板----餐厅")
 @Slf4j
 @RestController
 @RequestMapping("dining_room")

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

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 
 
-@Api("智能看板----用电")
+@Api(tags = "智能看板----用电")
 @Slf4j
 @RestController
 @RequestMapping("electricity")

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

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 
 
-@Api("智能看板 ------人员")
+@Api(tags ="智能看板 ------人员")
 @Slf4j
 @RestController
 @RequestMapping("personnel")

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

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Date 2023/2/23 10:32
  **/
 
-@Api("智能看板----商超模块")
+@Api(tags ="智能看板----商超模块")
 @Slf4j
 @RestController("dashboard_supermarket")
 @RequestMapping("/dashboard_supermarket")

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

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 
 
-@Api("智能看板----用冷")
+@Api(tags ="智能看板----用冷")
 @Slf4j
 @RestController
 @RequestMapping("use_cold")

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

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 智能看板  ----  用热
  */
 
-@Api("智能看板----用热")
+@Api(tags ="智能看板----用热")
 @Slf4j
 @RestController
 @RequestMapping("use_heat")

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

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 智能看板  ----  用水
  */
 
-@Api("智能看板----用水")
+@Api(tags ="智能看板----用水")
 @Slf4j
 @RestController
 @RequestMapping("water")

src/main/java/com/sky/ioc/controller/life/HealthHomeController.java

@@ -1,12 +1,14 @@
 package com.sky.ioc.controller.life;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.fitness.HealthService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+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;
 
@@ -14,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * @author LunCe
  */
-@Api("智享生活----健康小屋")
+@Api(tags ="智享生活----健康小屋")
 @Slf4j
 @RestController
 @RequestMapping("healthhome")
@@ -24,28 +26,28 @@ public class HealthHomeController {
     private HealthService healthService;
 
     @ApiOperation("查询智慧生活中健康小屋的核心指标")
-    @GetMapping("getCoreIndicators")
-    public ReturnMsg getCoreIndicators(Integer dateType){
+    @PostMapping("getCoreIndicators")
+    public ReturnMsg getCoreIndicators(@RequestBody IocDateParam iocDateParam){
 //        dateType   1.周，2.月，3.年
-        return healthService.getCoreIndicators(dateType);
+        return healthService.getCoreIndicators(iocDateParam);
     }
 
 
 
     @ApiOperation("查询智慧生活中健康小屋的小屋分析")
-    @GetMapping("getHutAnalysis")
-    public ReturnMsg  getHutAnalysis(Integer dateType){
+    @PostMapping("getHutAnalysis")
+    public ReturnMsg  getHutAnalysis(@RequestBody IocDateParam iocDateParam){
 //        dateType   1.周，2.月，3.年
-        return healthService.getHutAnalysis(dateType);
+        return healthService.getHutAnalysis(iocDateParam);
     }
 
 
 
     @ApiOperation("查询智慧生活中健康小屋的环境监测")
-    @GetMapping("getEnvironmentalDetection")
-    public ReturnMsg  getEnvironmentalDetection(Integer dateType){
+    @PostMapping("getEnvironmentalDetection")
+    public ReturnMsg  getEnvironmentalDetection(@RequestBody IocDateParam iocDateParam){
 //        dateType   1.周，2.月，3.年
-        return healthService.getEnvironmentalDetection(dateType);
+        return healthService.getEnvironmentalDetection(iocDateParam);
     }
 
 

src/main/java/com/sky/ioc/controller/life/ParkingController.java

@@ -1,12 +1,14 @@
 package com.sky.ioc.controller.life;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.Parking.ParkingService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+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;
 
@@ -18,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  **/
 
 
-@Api("智享生活----智慧餐厅")
+@Api(tags ="智享生活----智慧餐厅")
 @Slf4j
 @RestController
 @RequestMapping("parking")
@@ -32,52 +34,52 @@ public class ParkingController {
 
 
     @ApiOperation("查询智慧生活中智慧停车的核心指标")
-    @GetMapping("getCoreIndicators")
-    public ReturnMsg getCoreIndicators(Integer dateType){
+    @PostMapping("getCoreIndicators")
+    public ReturnMsg getCoreIndicators(@RequestBody IocDateParam iocDateParam){
 //        dateType   1.周，2.月，3.年
-        return parkingService.getCoreIndicators(dateType);
+        return parkingService.getCoreIndicators(iocDateParam);
     }
 
 
     @ApiOperation("查询智慧生活中智慧停车的车流态势")
-    @GetMapping("getTrafficflowSituation")
-    public ReturnMsg  getTrafficflowSituation(Integer dateType){
+    @PostMapping("getTrafficflowSituation")
+    public ReturnMsg  getTrafficflowSituation(@RequestBody IocDateParam iocDateParam){
 //        dateType   1.周，2.月，3.年
-        return parkingService.getTrafficflowSituation(dateType);
+        return parkingService.getTrafficflowSituation(iocDateParam);
     }
 
 
     @ApiOperation("查询智慧生活中智慧停车的空置车位")
-   // @GetMapping("getTrafficflowSituation")
-    public ReturnMsg  getVacantParkingSpace(Integer dateType){
+    @PostMapping("getVacantParkingSpace")
+    public ReturnMsg  getVacantParkingSpace(@RequestBody IocDateParam iocDateParam){
 //        dateType   1.周，2.月，3.年
-        return parkingService.getVacantParkingSpace(dateType);
+        return parkingService.getVacantParkingSpace(iocDateParam);
     }
 
 
 
     @ApiOperation("查询智慧生活中智慧停车的车位详情")
-    @GetMapping("getParkingSpaceDetails")
-    public ReturnMsg  getParkingSpaceDetails(Integer dateType){
+    @PostMapping("getParkingSpaceDetails")
+    public ReturnMsg  getParkingSpaceDetails(@RequestBody IocDateParam iocDateParam){
 //        dateType   1.周，2.月，3.年
-        return parkingService.getParkingSpaceDetails(dateType);
+        return parkingService.getParkingSpaceDetails(iocDateParam);
     }
 
 
     @ApiOperation("查询智慧生活中智慧停车的违停情况")
-    @GetMapping("getStopViolation")
-    public ReturnMsg  getStopViolation(Integer dateType){
+    @PostMapping("getStopViolation")
+    public ReturnMsg  getStopViolation(@RequestBody IocDateParam iocDateParam){
 //        dateType   1.周，2.月，3.年
-        return parkingService.getStopViolation(dateType);
+        return parkingService.getStopViolation(iocDateParam);
     }
 
 
 
     @ApiOperation("查询智慧生活中智慧停车的占用车位数量")
-    @GetMapping("getOccupationOfParkingSpace")
-    public ReturnMsg  getOccupationOfParkingSpace(Integer dateType){
+    @PostMapping("getOccupationOfParkingSpace")
+    public ReturnMsg  getOccupationOfParkingSpace(@RequestBody IocDateParam iocDateParam){
 //        dateType   1.周，2.月，3.年
-        return parkingService.getOccupationOfParkingSpace(dateType);
+        return parkingService.getOccupationOfParkingSpace(iocDateParam);
     }
 
 

src/main/java/com/sky/ioc/controller/life/RestaurantController.java

@@ -1,12 +1,14 @@
 package com.sky.ioc.controller.life;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.canteen.RestaurantService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+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;
 
@@ -15,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 智慧餐厅
  */
 
-@Api("智享生活----智慧餐厅")
+@Api(tags ="智享生活----智慧餐厅")
 @Slf4j
 @RestController
 @RequestMapping("/restaurant")
@@ -28,56 +30,56 @@ public class RestaurantController {
 
 
     @ApiOperation("查询智慧生活中智慧餐厅的核心指标")
-    @GetMapping("getCoreIndicators")
-    public ReturnMsg  getCoreIndicators(Integer dateType){
-//        dateType   1.周，2.月，3.年
-        return restaurantService.getCoreIndicators(dateType);
+    @PostMapping("getCoreIndicators")
+    public ReturnMsg  getCoreIndicators(@RequestBody IocDateParam iocDateParam){
+//        iocDateParam   1.周，2.月，3.年
+        return restaurantService.getCoreIndicators(iocDateParam);
     }
 
     @ApiOperation("查询智慧生活中智慧餐厅的用餐分析")
-    @GetMapping("getMealAnalysis")
-    public ReturnMsg  getMealAnalysis(Integer dateType){
-        return restaurantService.getMealAnalysis(dateType);
+    @PostMapping("getMealAnalysis")
+    public ReturnMsg  getMealAnalysis(@RequestBody IocDateParam iocDateParam){
+        return restaurantService.getMealAnalysis(iocDateParam);
     }
 
 
     @ApiOperation("查询智慧生活中智慧餐厅的欢迎菜品")
-    @GetMapping("getWelcomeDishes")
-    public ReturnMsg getWelcomeDishes(Integer dateType){
-        return restaurantService.getWelcomeDishes(dateType);
+    @PostMapping("getWelcomeDishes")
+    public ReturnMsg getWelcomeDishes(@RequestBody IocDateParam iocDateParam){
+        return restaurantService.getWelcomeDishes(iocDateParam);
     }
 
 
     @ApiOperation("查询智慧生活中智慧餐厅的消费分析")
-    @GetMapping("getConsumptionAnalysis")
-    public ReturnMsg  getConsumptionAnalysis(Integer dateType){
-        return restaurantService.getConsumptionAnalysis(dateType);
+    @PostMapping("getConsumptionAnalysis")
+    public ReturnMsg  getConsumptionAnalysis(@RequestBody IocDateParam iocDateParam){
+        return restaurantService.getConsumptionAnalysis(iocDateParam);
     }
 
     @ApiOperation("查询智慧生活中智慧餐厅的盈利分析")
-    @GetMapping("getProfitAnalysis")
-    public ReturnMsg  getProfitAnalysis(Integer dateType){
-        return restaurantService.getProfitAnalysis(dateType);
+    @PostMapping("getProfitAnalysis")
+    public ReturnMsg  getProfitAnalysis(@RequestBody IocDateParam iocDateParam){
+        return restaurantService.getProfitAnalysis(iocDateParam);
     }
 
 
     /**
      * TODO  查询智慧生活中智慧餐厅的支付分析
      * @Description
-     * @Param dateType
+     * @Param iocDateParam
      * @Return java.lang.String
      * @Author LunCe
      * @date 2023/2/10 11:25
      */
     @ApiOperation("查询智慧生活中智慧餐厅的支付分析")
-    @GetMapping("getPaymentAnalysis")
-    public ReturnMsg  getPaymentAnalysis(Integer dateType){
-        return restaurantService.getPaymentAnalysis(dateType);
+    @PostMapping("getPaymentAnalysis")
+    public ReturnMsg  getPaymentAnalysis(@RequestBody IocDateParam iocDateParam){
+        return restaurantService.getPaymentAnalysis(iocDateParam);
     }
 
 
     @ApiOperation("查询智慧生活中智慧餐厅的今日菜谱")
-    @GetMapping("getTodayMenu")
+    @PostMapping("getTodayMenu")
     public ReturnMsg  getTodayMenu(){
         return restaurantService.getTodayMenu();
     }

src/main/java/com/sky/ioc/controller/life/SupermarketController.java

@@ -1,12 +1,14 @@
 package com.sky.ioc.controller.life;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.supermarket.SupermarketService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+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;
 
@@ -16,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Author LunCe
  * @Date 2023/2/10 14:17
  **/
-@Api("智享生活----无人超市")
+@Api(tags ="智享生活----无人超市")
 @Slf4j
 @RestController
 @RequestMapping("/life_supermarket")
@@ -28,27 +30,27 @@ public class SupermarketController {
 
 
     @ApiOperation("查询智慧生活中无人超市的核心指标")
-    @GetMapping("getCoreIndicators")
-    public ReturnMsg getCoreIndicators(Integer dateType){
-//        dateType   1.周，2.月，3.年
-        return supermarketService.getCoreIndicators(dateType);
+    @PostMapping("getCoreIndicators")
+    public ReturnMsg getCoreIndicators(@RequestBody  IocDateParam iocDateParam){
+//        iocDateParam   1.周，2.月，3.年
+        return supermarketService.getCoreIndicators(iocDateParam);
     }
 
 
 
     @ApiOperation("查询智慧生活中无人超市的商超分析")
-    @GetMapping("getQuotientAnalysiss")
-    public ReturnMsg  getQuotientAnalysiss(Integer dateType){
-//        dateType   1.周，2.月，3.年
-        return supermarketService.getQuotientAnalysiss(dateType);
+    @PostMapping("getQuotientAnalysiss")
+    public ReturnMsg  getQuotientAnalysiss(@RequestBody IocDateParam iocDateParam){
+//        iocDateParam   1.周，2.月，3.年
+        return supermarketService.getQuotientAnalysiss(iocDateParam);
     }
 
 
     @ApiOperation("查询智慧生活中无人超市的商品排行")
-    @GetMapping("getProductRanking")
-    public ReturnMsg  getProductRanking(Integer dateType){
-//        dateType   1.周，2.月，3.年
-        return supermarketService.getProductRanking(dateType);
+    @PostMapping("getProductRanking")
+    public ReturnMsg  getProductRanking(@RequestBody IocDateParam iocDateParam){
+//        iocDateParam   1.周，2.月，3.年
+        return supermarketService.getProductRanking(iocDateParam);
     }
 
 

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  **/
 
 
-@Api("智慧运营----运营分析")
+@Api(tags ="智慧运营----运营分析")
 @Slf4j
 @RestController
 @RequestMapping("/analyse")

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

@@ -8,19 +8,21 @@ package com.sky.ioc.controller.operation;
  * @Date 2023/3/1 16:19
  **/
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.assets.AssetService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+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;
 
 import javax.annotation.Resource;
 
-@Api("智慧运营----资产管理")
+@Api(tags ="智慧运营----资产管理")
 @Slf4j
 @RestController("operation_asset")
 @RequestMapping("/operation_asset")
@@ -32,32 +34,32 @@ public class AssetController {
 
 
     @ApiOperation("核心指标")
-    @GetMapping("/getOperAssetCoreIndicators")
-    public ReturnMsg getOperAssetCoreIndicators(){
-        return assetService.getOperAssetCoreIndicators();
+    @PostMapping("/getOperAssetCoreIndicators")
+    public ReturnMsg getOperAssetCoreIndicators(@RequestBody IocDateParam iocDateParam){
+        return assetService.getOperAssetCoreIndicators(iocDateParam);
     }
 
 
     @ApiOperation("资产分析")
-    @GetMapping("/getAssetAnalysis")
-    public ReturnMsg getAssetAnalysis(){
-        return assetService.getAssetAnalysis();
+    @PostMapping("/getAssetAnalysis")
+    public ReturnMsg getAssetAnalysis(@RequestBody IocDateParam iocDateParam){
+        return assetService.getAssetAnalysis(iocDateParam);
     }
 
 
 
 
     @ApiOperation("资产占比排名")
-    @GetMapping("/getAssetShareRanking")
-    public ReturnMsg getAssetShareRanking(){
-        return assetService.getAssetShareRanking();
+    @PostMapping("/getAssetShareRanking")
+    public ReturnMsg getAssetShareRanking(@RequestBody IocDateParam iocDateParam){
+        return assetService.getAssetShareRanking(iocDateParam);
     }
 
 
     @ApiOperation("报废与维修")
-    @GetMapping("/getScrapAndMaintain")
-    public ReturnMsg getScrapAndMaintain(){
-        return assetService.getScrapAndMaintain();
+    @PostMapping("/getScrapAndMaintain")
+    public ReturnMsg getScrapAndMaintain(@RequestBody IocDateParam iocDateParam){
+        return assetService.getScrapAndMaintain(iocDateParam);
     }
 
 

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

@@ -1,12 +1,14 @@
 package com.sky.ioc.controller.operation;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.space.SpaceService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+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;
 
@@ -18,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Date 2023/3/6 9:40
  **/
 
-@Api("智慧运营----空间管理")
+@Api(tags ="智慧运营----空间管理")
 @Slf4j
 @RestController("space")
 @RequestMapping("/space")
@@ -31,18 +33,18 @@ public class SpaceController {
 
 
     @ApiOperation("核心指标")
-    @GetMapping("/getSpaceCoreIndicators")
-    public ReturnMsg getSpaceCoreIndicators(){
-        return spaceService.getSpaceCoreIndicators();
+    @PostMapping("/getSpaceCoreIndicators")
+    public ReturnMsg getSpaceCoreIndicators(@RequestBody IocDateParam iocDateParam){
+        return spaceService.getSpaceCoreIndicators(iocDateParam);
     }
 
 
 
 
     @ApiOperation("空间成本")
-    @GetMapping("/getSpaceInfo")
-    public ReturnMsg getSpaceInfo(){
-        return spaceService.getSpaceInfo();
+    @PostMapping("/getSpaceInfo")
+    public ReturnMsg getSpaceInfo(@RequestBody IocDateParam iocDateParam){
+        return spaceService.getSpaceInfo(iocDateParam);
     }
 
 

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

@@ -0,0 +1,42 @@
+package com.sky.ioc.controller.security;
+
+import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.service.security.SecurityService;
+import com.sky.ioc.tool.ReturnMsg;
+import io.swagger.annotations.Api;
+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;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/3/7 15:30
+ **/
+@Api(tags = "智慧安防--安防联动")
+@Slf4j
+@RestController
+@RequestMapping("/security_linkage")
+public class LinkageController {
+
+    @Autowired
+    private SecurityService securityService;
+
+
+
+    @ApiOperation("告警管理--核心指标")
+    @PostMapping("/getLinkageCoreIndicators")
+    public ReturnMsg getLinkageCoreIndicators(@RequestBody  IocDateParam iocDateParam){
+        return securityService.getLinkageCoreIndicators(iocDateParam);
+    }
+
+
+
+
+}

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

@@ -0,0 +1,47 @@
+package com.sky.ioc.controller.security;
+
+import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.service.carbon.CarbonService;
+import com.sky.ioc.service.personnel.PersonnelService;
+import com.sky.ioc.service.security.SecurityService;
+import com.sky.ioc.tool.ReturnMsg;
+import io.swagger.annotations.Api;
+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;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/3/7 9:57
+ **/
+
+
+
+@Api(tags = "智慧安防----安防人员")
+@Slf4j
+@RestController
+@RequestMapping("/security_person")
+public class PersonController {
+
+
+    @Autowired
+    private SecurityService securityService;
+
+    @Autowired
+    private PersonnelService personnelService;
+
+    @ApiOperation("核心指标")
+    @PostMapping("/getSecurityCoreIndicators")
+    public ReturnMsg getSecurityCoreIndicators(@RequestBody IocDateParam iocDateParam){
+        return personnelService.getSecurityCoreIndicators(iocDateParam);
+    }
+
+
+}

src/main/java/com/sky/ioc/controller/work/BusController.java

@@ -1,11 +1,14 @@
 package com.sky.ioc.controller.work;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.carbon.CarbonService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+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;
 
@@ -20,7 +23,7 @@ import java.lang.annotation.Retention;
  **/
 
 
-@Api("智慧办公----公车管理")
+@Api(tags ="智慧办公----公车管理")
 @Slf4j
 @RestController
 @RequestMapping("/bus")
@@ -34,25 +37,25 @@ public class BusController {
 
 
     @ApiOperation("核心指标")
-    @GetMapping("/getBusCoreIndicators")
-    public String getBusCoreIndicators(){
-        return carbonService.getBusCoreIndicators();
+    @PostMapping("/getBusCoreIndicators")
+    public ReturnMsg getBusCoreIndicators(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getBusCoreIndicators(iocDateParam);
     }
 
 
     @ApiOperation("公车情况")
-    @GetMapping("/getBusInfo")
-    public String getBusInfo(){
-        return carbonService.getBusInfo();
+    @PostMapping("/getBusInfo")
+    public ReturnMsg getBusInfo(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getBusInfo(iocDateParam);
     }
 
 
 
 
     @ApiOperation("成本趋势")
-    @GetMapping("/getBusCostTrend")
-    public String getBusCostTrend(){
-        return carbonService.getBusCostTrend();
+    @PostMapping("/getBusCostTrend")
+    public ReturnMsg getBusCostTrend(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getBusCostTrend(iocDateParam);
     }
 
 

src/main/java/com/sky/ioc/controller/work/FloorController.java

@@ -1,11 +1,14 @@
 package com.sky.ioc.controller.work;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.space.SpaceService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+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;
 
@@ -18,7 +21,7 @@ import javax.annotation.Resource;
  * @Date 2023/2/28 15:39
  **/
 
-@Api("智慧办公----楼层概括")
+@Api(tags ="智慧办公----楼层概括")
 @Slf4j
 @RestController
 @RequestMapping("/floor")
@@ -30,25 +33,25 @@ public class FloorController {
 
 
     @ApiOperation("核心指标")
-    @GetMapping("/getFloorCoreIndicators")
-    public String getFloorCoreIndicators(){
-        return spaceService.getFloorCoreIndicators();
+    @PostMapping("/getFloorCoreIndicators")
+    public ReturnMsg getFloorCoreIndicators(@RequestBody IocDateParam iocDateParam){
+        return spaceService.getFloorCoreIndicators(iocDateParam);
     }
 
 
     @ApiOperation("当日门禁进入人员")
-    @GetMapping("/getAccessPersonnel")
-    public String getAccessPersonnel(){
-        return spaceService.getAccessPersonnel();
+    @PostMapping("/getAccessPersonnel")
+    public ReturnMsg getAccessPersonnel(@RequestBody IocDateParam iocDateParam){
+        return spaceService.getAccessPersonnel(iocDateParam);
     }
 
 
 
 
     @ApiOperation("楼层概览")
-    @GetMapping("/getFloorList")
-    public String getFloorList(){
-        return spaceService.getFloorList();
+    @PostMapping("/getFloorList")
+    public ReturnMsg getFloorList(@RequestBody IocDateParam iocDateParam){
+        return spaceService.getFloorList(iocDateParam);
     }
 
 

src/main/java/com/sky/ioc/controller/work/MeetingController.java

@@ -1,11 +1,14 @@
 package com.sky.ioc.controller.work;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.space.SpaceService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+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;
 
@@ -19,7 +22,7 @@ import javax.annotation.Resource;
  * @Date 2023/2/28 15:51
  **/
 
-@Api("智慧办公----会议管理")
+@Api(tags ="智慧办公----会议管理")
 @Slf4j
 @RestController
 @RequestMapping("/meeting")
@@ -31,25 +34,25 @@ public class MeetingController {
 
 
     @ApiOperation("核心指标")
-    @GetMapping("/getMeetingCoreIndicators")
-    public String getMeetingCoreIndicators(){
-        return spaceService.getMeetingCoreIndicators();
+    @PostMapping("/getMeetingCoreIndicators")
+    public ReturnMsg getMeetingCoreIndicators(@RequestBody IocDateParam iocDateParam){
+        return spaceService.getMeetingCoreIndicators(iocDateParam);
     }
 
 
     @ApiOperation("成本趋势")
-    @GetMapping("/getMeetingCostTrend")
-    public String getMeetingCostTrend(){
-        return spaceService.getMeetingCostTrend();
+    @PostMapping("/getMeetingCostTrend")
+    public ReturnMsg getMeetingCostTrend(@RequestBody IocDateParam iocDateParam){
+        return spaceService.getMeetingCostTrend(iocDateParam);
     }
 
 
 
 
     @ApiOperation("会议室情况")
-    @GetMapping("/getConferenceRoomInfo")
-    public String getConferenceRoomInfo(){
-        return spaceService.getConferenceRoomInfo();
+    @PostMapping("/getConferenceRoomInfo")
+    public ReturnMsg getConferenceRoomInfo(@RequestBody IocDateParam iocDateParam){
+        return spaceService.getConferenceRoomInfo(iocDateParam);
     }
 
 

src/main/java/com/sky/ioc/controller/work/PrintingController.java

@@ -1,12 +1,15 @@
 package com.sky.ioc.controller.work;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.carbon.CarbonService;
 import com.sky.ioc.service.space.SpaceService;
+import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+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;
 
@@ -21,7 +24,7 @@ import javax.annotation.Resource;
  **/
 
 
-@Api("智慧办公----文印管理")
+@Api(tags ="智慧办公----文印管理")
 @Slf4j
 @RestController
 @RequestMapping("/print")
@@ -34,25 +37,25 @@ public class PrintingController {
 
 
     @ApiOperation("核心指标")
-    @GetMapping("/getPrintingCoreIndicators")
-    public String getPrintingCoreIndicators(){
-        return carbonService.getPrintingCoreIndicators();
+    @PostMapping("/getPrintingCoreIndicators")
+    public ReturnMsg getPrintingCoreIndicators(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getPrintingCoreIndicators(iocDateParam);
     }
 
 
     @ApiOperation("成本趋势")
-    @GetMapping("/getPrintingCostTrend")
-    public String getPrintingCostTrend(){
-        return carbonService.getPrintingCostTrend();
+    @PostMapping("/getPrintingCostTrend")
+    public ReturnMsg getPrintingCostTrend(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getPrintingCostTrend(iocDateParam);
     }
 
 
 
 
     @ApiOperation("文印情况")
-    @GetMapping("/getConferenceRoomInfo")
-    public String getConferenceRoomInfo(){
-        return carbonService.getConferenceRoomInfo();
+    @PostMapping("/getConferenceRoomInfo")
+    public ReturnMsg getConferenceRoomInfo(@RequestBody IocDateParam iocDateParam){
+        return carbonService.getConferenceRoomInfo(iocDateParam);
     }
 
 

src/main/java/com/sky/ioc/controller/work/WorkController.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /** 智慧办公
  * @author LunCe*/
-@Api("智慧办公")
+@Api(tags ="智慧办公")
 @Slf4j
 @RestController
 @RequestMapping("/work")

src/main/java/com/sky/ioc/entity/Indeicator.java

@@ -0,0 +1,40 @@
+package com.sky.ioc.entity;
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @Description   核心指标
+ * @Author LunCe
+ * @Date 2023/3/7 11:18
+ **/
+@Data
+public class Indeicator {
+
+
+
+
+    private List<JSONObject> list;
+
+    /**值得关注
+     */
+    private String worthAttention;
+
+
+    public Indeicator(){
+        list = new ArrayList<>();
+        list.add(new JSONObject());
+        list.add(new JSONObject());
+        list.add(new JSONObject());
+        list.add(new JSONObject());
+    }
+
+
+
+}

src/main/java/com/sky/ioc/entity/Label.java

@@ -0,0 +1,27 @@
+package com.sky.ioc.entity;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/3/7 10:20
+ **/
+
+
+@Data
+public class Label {
+
+        private String labelname;
+        private List<JSONObject> list;
+        private String dateYear;
+        private String dateMonth;
+        private String dateDay;
+}

src/main/java/com/sky/ioc/service/Parking/ParkingService.java

@@ -1,5 +1,6 @@
 package com.sky.ioc.service.Parking;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
@@ -9,15 +10,15 @@ import com.sky.ioc.tool.ReturnMsg;
  * @Date 2023/2/10 13:44
  **/
 public interface ParkingService {
-    ReturnMsg getCoreIndicators(Integer dateType);
+    ReturnMsg getCoreIndicators(IocDateParam iocDateParam);
 
-    ReturnMsg getTrafficflowSituation(Integer dateType);
+    ReturnMsg getTrafficflowSituation(IocDateParam iocDateParam);
 
-    ReturnMsg getVacantParkingSpace(Integer dateType);
+    ReturnMsg getVacantParkingSpace(IocDateParam iocDateParam);
 
-    ReturnMsg getStopViolation(Integer dateType);
+    ReturnMsg getStopViolation(IocDateParam iocDateParam);
 
-    ReturnMsg getOccupationOfParkingSpace(Integer dateType);
+    ReturnMsg getOccupationOfParkingSpace(IocDateParam iocDateParam);
 
-    ReturnMsg getParkingSpaceDetails(Integer dateType);
+    ReturnMsg getParkingSpaceDetails(IocDateParam iocDateParam);
 }

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

@@ -1,5 +1,6 @@
 package com.sky.ioc.service.Parking.impl;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.Parking.ParkingService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.ReturnMsg;
@@ -16,32 +17,32 @@ public class ParkingServiceImpl implements ParkingService {
 
 
     @Override
-    public ReturnMsg getCoreIndicators(Integer dateType) {
+    public ReturnMsg getCoreIndicators(IocDateParam iocDateParam) {
         return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
     }
 
     @Override
-    public ReturnMsg getTrafficflowSituation(Integer dateType) {
+    public ReturnMsg getTrafficflowSituation(IocDateParam iocDateParam) {
         return ReturnMsg.ok(FalseData.REPORTFORMSMAP);
     }
 
     @Override
-    public ReturnMsg getVacantParkingSpace(Integer dateType) {
+    public ReturnMsg getVacantParkingSpace(IocDateParam iocDateParam) {
         return ReturnMsg.ok(ReturnMsg.fail());
     }
     @Override
-    public ReturnMsg getParkingSpaceDetails(Integer dateType) {
+    public ReturnMsg getParkingSpaceDetails(IocDateParam iocDateParam) {
         return ReturnMsg.ok(FalseData.REPORTFORMSLIST5);
     }
 
 
     @Override
-    public ReturnMsg getStopViolation(Integer dateType) {
+    public ReturnMsg getStopViolation(IocDateParam iocDateParam) {
         return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
     }
 
     @Override
-    public ReturnMsg getOccupationOfParkingSpace(Integer dateType) {
+    public ReturnMsg getOccupationOfParkingSpace(IocDateParam iocDateParam) {
         return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
     }
 

src/main/java/com/sky/ioc/service/assets/AssetService.java

@@ -1,6 +1,8 @@
 package com.sky.ioc.service.assets;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.tool.ReturnMsg;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * TODO
@@ -15,11 +17,11 @@ public interface AssetService {
 
     ReturnMsg getAssetCount();
 
-    ReturnMsg getOperAssetCoreIndicators();
+    ReturnMsg getOperAssetCoreIndicators(IocDateParam iocDateParam);
 
-    ReturnMsg getAssetAnalysis();
+    ReturnMsg getAssetAnalysis(IocDateParam iocDateParam);
 
-    ReturnMsg getAssetShareRanking();
+    ReturnMsg getAssetShareRanking(IocDateParam iocDateParam);
 
-    ReturnMsg getScrapAndMaintain();
+    ReturnMsg getScrapAndMaintain(IocDateParam iocDateParam);
 }

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

@@ -1,11 +1,15 @@
 package com.sky.ioc.service.assets.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.sky.ioc.entity.Indeicator;
+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.ReturnMsg;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -41,22 +45,37 @@ public class AssetServiceImpl implements AssetService {
     }
 
     @Override
-    public ReturnMsg getOperAssetCoreIndicators() {
-        return null;
+    public ReturnMsg getOperAssetCoreIndicators(IocDateParam iocDateParam) {
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",1.3);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",5000);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value","项目1");
+        objects.get(2).put("compare",60);
+
+        objects.get(3).put("value","工业互联网");
+        objects.get(3).put("compare",60);
+        indeicator.setWorthAttention("13笔记本即将到报废年限");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override
-    public ReturnMsg getAssetAnalysis() {
+    public ReturnMsg getAssetAnalysis(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public ReturnMsg getAssetShareRanking() {
+    public ReturnMsg getAssetShareRanking(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public ReturnMsg getScrapAndMaintain() {
+    public ReturnMsg getScrapAndMaintain(IocDateParam iocDateParam) {
         return null;
     }
 }

src/main/java/com/sky/ioc/service/canteen/RestaurantService.java

@@ -1,5 +1,6 @@
 package com.sky.ioc.service.canteen;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
@@ -9,19 +10,19 @@ import com.sky.ioc.tool.ReturnMsg;
  * @date 2023/2/22 11:29
  */
 public interface RestaurantService {
-    ReturnMsg getPaymentAnalysis(Integer dateType);
+    ReturnMsg getPaymentAnalysis(IocDateParam iocDateParam);
 
-    ReturnMsg getCoreIndicators(Integer dateType);
+    ReturnMsg getCoreIndicators(IocDateParam iocDateParam);
 
-    ReturnMsg getWelcomeDishes(Integer dateType);
+    ReturnMsg getWelcomeDishes(IocDateParam iocDateParam);
 
-    ReturnMsg getConsumptionAnalysis(Integer dateType);
+    ReturnMsg getConsumptionAnalysis(IocDateParam iocDateParam);
 
     ReturnMsg getTodayMenu();
 
-    ReturnMsg getProfitAnalysis(Integer dateType);
+    ReturnMsg getProfitAnalysis(IocDateParam iocDateParam);
 
-    ReturnMsg getMealAnalysis(Integer dateType);
+    ReturnMsg getMealAnalysis(IocDateParam iocDateParam);
 
     ReturnMsg getRestaurantConsumption();
 

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

@@ -1,13 +1,20 @@
 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.params.IocDateParam;
 import com.sky.ioc.service.canteen.RestaurantService;
 import com.sky.ioc.tool.FalseData;
 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;
 
 
 /**
@@ -27,7 +34,7 @@ public class RestaurantServiceImpl implements RestaurantService {
      * @date 2023/2/10 11:25
      */
     @Override
-    public ReturnMsg getPaymentAnalysis(Integer dateType) {
+    public ReturnMsg getPaymentAnalysis(IocDateParam iocDateParam) {
         return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
     }
 
@@ -36,7 +43,7 @@ public class RestaurantServiceImpl implements RestaurantService {
      * 查询智慧生活中智慧餐厅的核心指标
      */
     @Override
-    public ReturnMsg getCoreIndicators(Integer dateType) {
+    public ReturnMsg getCoreIndicators(IocDateParam iocDateParam) {
         return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
     }
 
@@ -44,7 +51,7 @@ public class RestaurantServiceImpl implements RestaurantService {
      * 查询智慧生活中智慧餐厅的欢迎菜品
      */
     @Override
-    public ReturnMsg getWelcomeDishes(Integer dateType) {
+    public ReturnMsg getWelcomeDishes(IocDateParam iocDateParam) {
         return ReturnMsg.ok(FalseData.REPORTFORMSLIST3);
     }
 
@@ -54,8 +61,8 @@ public class RestaurantServiceImpl implements RestaurantService {
      * 查询智慧生活中智慧餐厅的消费分析
      */
     @Override
-    public ReturnMsg getConsumptionAnalysis(Integer dateType) {
-        return ReturnMsg.ok(FalseData.REPORTFORMSMAP.get(dateType));
+    public ReturnMsg getConsumptionAnalysis(IocDateParam iocDateParam) {
+        return null;
     }
 
 
@@ -71,7 +78,7 @@ public class RestaurantServiceImpl implements RestaurantService {
      * 查询智慧生活中智慧餐厅的盈利分析
      */
     @Override
-    public ReturnMsg getProfitAnalysis(Integer dateType) {
+    public ReturnMsg getProfitAnalysis(IocDateParam iocDateParam) {
         return ReturnMsg.ok(FalseData.REPORTFORMSLIST2);
     }
 
@@ -79,8 +86,8 @@ public class RestaurantServiceImpl implements RestaurantService {
      * 查询智慧生活中智慧餐厅的用餐分析
      */
     @Override
-    public ReturnMsg getMealAnalysis(Integer dateType) {
-        return ReturnMsg.ok(FalseData.REPORTFORMSMAP.get(dateType));
+    public ReturnMsg getMealAnalysis(IocDateParam iocDateParam) {
+        return null;
     }
 
     /**
@@ -92,7 +99,21 @@ public class RestaurantServiceImpl implements RestaurantService {
      */
     @Override
     public ReturnMsg getRestaurantConsumption() {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",1800);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",1800);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",18);
+        objects.get(2).put("compare",0.4);
+
+        objects.get(3).put("value",200);
+        indeicator.setWorthAttention("提高合同额");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
 

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

@@ -1,5 +1,6 @@
 package com.sky.ioc.service.carbon;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
@@ -13,43 +14,43 @@ public interface CarbonService {
 
     ReturnMsg getCarbonQuota();
 
-    String getPrintingCoreIndicators();
+    ReturnMsg  getPrintingCoreIndicators(IocDateParam iocDateParam);
 
-    String getPrintingCostTrend();
+    ReturnMsg  getPrintingCostTrend(IocDateParam iocDateParam);
 
-    String getConferenceRoomInfo();
+    ReturnMsg  getConferenceRoomInfo(IocDateParam iocDateParam);
 
-    String getBusCoreIndicators();
+    ReturnMsg  getBusCoreIndicators(IocDateParam iocDateParam);
 
-    String getBusInfo();
+    ReturnMsg  getBusInfo(IocDateParam iocDateParam);
 
-    String getBusCostTrend();
+    ReturnMsg  getBusCostTrend(IocDateParam iocDateParam);
 
-    String getFloorCoreIndicators();
+    ReturnMsg getFloorCoreIndicators(IocDateParam iocDateParam);
 
-    String getCarbonInfo();
+    ReturnMsg  getCarbonInfo(IocDateParam iocDateParam);
 
-    String getCarbonQuotaComposition();
+    ReturnMsg  getCarbonQuotaComposition(IocDateParam iocDateParam);
 
-    String getCarbonNews();
+    ReturnMsg  getCarbonNews(IocDateParam iocDateParam);
 
-    String getCarbonProportion();
+    ReturnMsg  getCarbonProportion(IocDateParam iocDateParam);
 
-    String getVehicleCoreIndicators();
+    ReturnMsg  getVehicleCoreIndicators(IocDateParam iocDateParam);
 
-    String getVehicleInfo();
+    ReturnMsg  getVehicleInfo(IocDateParam iocDateParam);
 
-    String getVehicleInfoOrder();
+    ReturnMsg  getVehicleInfoOrder(IocDateParam iocDateParam);
 
-    String getPrintCoreIndicators();
+    ReturnMsg  getPrintCoreIndicators(IocDateParam iocDateParam);
 
-    String getPrintInfoOrder();
+    ReturnMsg  getPrintInfoOrder(IocDateParam iocDateParam);
 
-    String getPrintInfo();
+    ReturnMsg  getPrintInfo(IocDateParam iocDateParam);
 
-    String getPhotovoltaicInfoOrder();
+    ReturnMsg  getPhotovoltaicInfoOrder(IocDateParam iocDateParam);
 
-    String getPhotovoltaicInfo();
+    ReturnMsg  getPhotovoltaicInfo(IocDateParam iocDateParam);
 
-    String getPhotovoltaicCoreIndicators();
+    ReturnMsg  getPhotovoltaicCoreIndicators(IocDateParam iocDateParam);
 }

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

@@ -1,5 +1,8 @@
 package com.sky.ioc.service.carbon.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.sky.ioc.entity.Indeicator;
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.carbon.CarbonService;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
@@ -54,102 +57,195 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public String getPrintingCoreIndicators() {
-        return null;
+    public ReturnMsg getPrintingCoreIndicators(IocDateParam iocDateParam) {
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",10);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",80);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",80);
+        objects.get(2).put("compare",0.4);
+
+        objects.get(3).put("value",80);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("今日人流高峰在9:00/17:00，记得提前做好应对喔");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override
-    public String getPrintingCostTrend() {
+    public ReturnMsg getPrintingCostTrend(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getConferenceRoomInfo() {
+    public ReturnMsg getConferenceRoomInfo(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getBusCoreIndicators() {
-        return null;
+    public ReturnMsg getBusCoreIndicators(IocDateParam iocDateParam) {
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",100);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",80);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",80);
+        objects.get(2).put("compare",0.4);
+
+        objects.get(3).put("value",80);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("增加20个公车数量");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override
-    public String getBusInfo() {
+    public ReturnMsg getBusInfo(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getBusCostTrend() {
+    public ReturnMsg getBusCostTrend(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getFloorCoreIndicators() {
-        return null;
+    public ReturnMsg getFloorCoreIndicators(IocDateParam iocDateParam) {
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",60);
+
+        objects.get(1).put("value",500);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",380);
+        objects.get(2).put("compare",0.4);
+
+        objects.get(3).put("value",80);
+        objects.get(3).put("compare",0.4);
+        objects.add(new JSONObject());
+        objects.get(4).put("value",40);
+        objects.get(4).put("compare",0.4);
+
+        indeicator.setWorthAttention("减少2辆车出行一周");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override
-    public String getCarbonInfo() {
+    public ReturnMsg getCarbonInfo(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getCarbonQuotaComposition() {
+    public ReturnMsg getCarbonQuotaComposition(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getCarbonNews() {
+    public ReturnMsg getCarbonNews(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getCarbonProportion() {
+    public ReturnMsg getCarbonProportion(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getVehicleCoreIndicators() {
-        return null;
+    public ReturnMsg getVehicleCoreIndicators(IocDateParam iocDateParam) {
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",60);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",50);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",5);
+        objects.get(2).put("compare",0.4);
+
+        objects.get(3).put("value",80);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("减少2辆车出行一周");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override
-    public String getVehicleInfo() {
+    public ReturnMsg getVehicleInfo(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getVehicleInfoOrder() {
+    public ReturnMsg getVehicleInfoOrder(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getPrintCoreIndicators() {
-        return null;
+    public ReturnMsg getPrintCoreIndicators(IocDateParam iocDateParam) {
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",60);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",50);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",500);
+        objects.get(2).put("compare",0.4);
+
+        objects.get(3).put("value",80);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("限制人均每天打印100张以内");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override
-    public String getPrintInfoOrder() {
+    public ReturnMsg getPrintInfoOrder(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getPrintInfo() {
+    public ReturnMsg getPrintInfo(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getPhotovoltaicInfoOrder() {
+    public ReturnMsg getPhotovoltaicInfoOrder(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getPhotovoltaicInfo() {
+    public ReturnMsg getPhotovoltaicInfo(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getPhotovoltaicCoreIndicators() {
-        return null;
+    public ReturnMsg getPhotovoltaicCoreIndicators(IocDateParam iocDateParam) {
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",60);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",50);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",500);
+        objects.get(2).put("compare",0.4);
+
+        objects.get(3).put("value",80);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("建议扩大光伏发电面积");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 }

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

@@ -1,10 +1,15 @@
 package com.sky.ioc.service.energy.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.service.energy.EnergyService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * TODO
  * @Description  能源实现类
@@ -15,7 +20,21 @@ import org.springframework.stereotype.Service;
 public class EnergyServiceImpl implements EnergyService {
     @Override
     public ReturnMsg getElectricityCoreIndicators() {
-        return ReturnMsg.ok( FalseData.REPORTFORMSLIST4);
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",2000);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",200);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",30);
+
+        objects.get(3).put("value",80);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("用电成本月增速5%，主为动力用电");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override
@@ -30,7 +49,21 @@ public class EnergyServiceImpl implements EnergyService {
 
     @Override
     public ReturnMsg getWaterCoreIndicators() {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",2000);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",200);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",30);
+
+        objects.get(3).put("value",20);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("用水量低于行业标准20%");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override
@@ -45,7 +78,20 @@ public class EnergyServiceImpl implements EnergyService {
 
     @Override
     public ReturnMsg getUseColdCoreIndicators() {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",2000);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",30);
+
+        objects.get(2).put("value",80);
+
+        objects.get(3).put("value",10);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("本月用冷超过行业标准20%");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override
@@ -55,7 +101,20 @@ public class EnergyServiceImpl implements EnergyService {
 
     @Override
     public ReturnMsg getUseHeatCoreIndicators() {
-        return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",2000);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",30);
+
+        objects.get(2).put("value",10);
+
+        objects.get(3).put("value",10);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("本月用热将超过行业标准20%");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override

src/main/java/com/sky/ioc/service/fitness/HealthService.java

@@ -1,5 +1,6 @@
 package com.sky.ioc.service.fitness;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
@@ -9,9 +10,9 @@ import com.sky.ioc.tool.ReturnMsg;
  * @Date 2023/2/10 17:35
  **/
 public interface HealthService {
-    ReturnMsg getCoreIndicators(Integer dateType);
+    ReturnMsg getCoreIndicators(IocDateParam iocDateParam);
 
-    ReturnMsg getHutAnalysis(Integer dateType);
+    ReturnMsg getHutAnalysis(IocDateParam iocDateParam);
 
-    ReturnMsg getEnvironmentalDetection(Integer dateType);
+    ReturnMsg getEnvironmentalDetection(IocDateParam iocDateParam);
 }

src/main/java/com/sky/ioc/service/fitness/impl/HealthServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sky.ioc.service.fitness.impl;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.fitness.HealthService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.ReturnMsg;
@@ -15,17 +16,17 @@ import org.springframework.stereotype.Service;
 @Service
 public class HealthServiceImpl implements HealthService {
     @Override
-    public ReturnMsg getCoreIndicators(Integer dateType) {
+    public ReturnMsg getCoreIndicators(IocDateParam iocDateParam) {
         return ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
     }
 
     @Override
-    public ReturnMsg getHutAnalysis(Integer dateType) {
+    public ReturnMsg getHutAnalysis(IocDateParam iocDateParam) {
         return ReturnMsg.ok(FalseData.REPORTFORMSMAP);
     }
 
     @Override
-    public ReturnMsg getEnvironmentalDetection(Integer dateType) {
+    public ReturnMsg getEnvironmentalDetection(IocDateParam iocDateParam) {
         return ReturnMsg.ok(FalseData.REPORTFORMSLIST3);
     }
 }

src/main/java/com/sky/ioc/service/personnel/PersonnelService.java

@@ -1,5 +1,6 @@
 package com.sky.ioc.service.personnel;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
@@ -12,4 +13,6 @@ public interface PersonnelService {
     ReturnMsg personnelInfoCount();
 
     ReturnMsg getPersonnelInfoList();
+
+    ReturnMsg getSecurityCoreIndicators(IocDateParam iocDateParam);
 }

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

@@ -1,5 +1,8 @@
 package com.sky.ioc.service.personnel.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.sky.ioc.entity.Indeicator;
+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.ReturnMsg;
@@ -21,27 +24,22 @@ public class PersonnelServiceImpl implements PersonnelService {
 
     @Override
     public ReturnMsg personnelInfoCount() {
-        List<Map<String,Object>> listMap = new ArrayList<>();
-        listMap.get(0).put("info","进入大厦");
-        listMap.get(0).put("personnel",1800);
-        listMap.get(0).put("rise","0.14%");
-        listMap.get(0).put("decline","0.14%");
-
-        listMap.get(1).put("info","离开大厦");
-        listMap.get(1).put("personnel",500);
-        listMap.get(1).put("rise","0.14%");
-        listMap.get(1).put("decline","0.14%");
-
-        listMap.get(2).put("info","九点前进入大厦");
-        listMap.get(2).put("personnel",1800);
-        listMap.get(2).put("rise","0.14%");
-        listMap.get(2).put("decline","0.14%");
-
-        listMap.get(3).put("info","楼内人员数量");
-        listMap.get(3).put("personnel",1800);
-        listMap.get(3).put("rise","0.14%");
-        listMap.get(3).put("decline","0.14%");
-        return ReturnMsg.ok(listMap);
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",2000);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",20);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",1800);
+        objects.get(2).put("compare",0.4);
+
+        objects.get(3).put("value",100);
+        objects.get(3).put("compare",-0.4);
+        indeicator.setWorthAttention("本周上班时间持续延后");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     //查询智能看板统计画像的统计人员信息报表
@@ -57,4 +55,24 @@ public class PersonnelServiceImpl implements PersonnelService {
         return ReturnMsg.ok(list);
     }
 
+    @Override
+    public ReturnMsg getSecurityCoreIndicators(IocDateParam iocDateParam) {
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",2000);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",5000);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",200);
+        objects.get(2).put("compare",60);
+
+        objects.get(3).put("value",20);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("防控疫情，缩减访客预约");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
+    }
+
 }

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

@@ -0,0 +1,15 @@
+package com.sky.ioc.service.security;
+
+import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.tool.ReturnMsg;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/3/7 10:02
+ **/
+public interface SecurityService {
+    ReturnMsg getLinkageCoreIndicators(IocDateParam iocDateParam);
+}

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

@@ -0,0 +1,42 @@
+package com.sky.ioc.service.security.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sky.ioc.entity.Indeicator;
+import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.service.security.SecurityService;
+import com.sky.ioc.tool.ReturnMsg;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @Description
+ * @Author LunCe
+ * @Date 2023/3/7 10:03
+ **/
+
+
+@Service
+public class SecurityServiceImpl implements SecurityService {
+    @Override
+    public ReturnMsg getLinkageCoreIndicators(IocDateParam iocDateParam) {
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",1000);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",500);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",200);
+        objects.get(2).put("compare",0.4);
+
+        objects.get(3).put("value","设备离线");
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("防控疫情，缩减访客预约");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.sky.ioc.service.space;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
@@ -12,19 +13,19 @@ public interface SpaceService {
 
     ReturnMsg getBuildingSituation();
 
-    String getFloorCoreIndicators();
+    ReturnMsg getFloorCoreIndicators(IocDateParam iocDateParam);
 
-    String getAccessPersonnel();
+    ReturnMsg getAccessPersonnel(IocDateParam iocDateParam);
 
-    String getFloorList();
+    ReturnMsg getFloorList(IocDateParam iocDateParam);
 
-    String getMeetingCoreIndicators();
+    ReturnMsg getMeetingCoreIndicators(IocDateParam iocDateParam);
 
-    String getConferenceRoomInfo();
+    ReturnMsg getConferenceRoomInfo(IocDateParam iocDateParam);
 
-    String getMeetingCostTrend();
+    ReturnMsg getMeetingCostTrend(IocDateParam iocDateParam);
 
-    ReturnMsg getSpaceInfo();
+    ReturnMsg getSpaceInfo(IocDateParam iocDateParam);
 
-    ReturnMsg getSpaceCoreIndicators();
+    ReturnMsg getSpaceCoreIndicators(IocDateParam iocDateParam);
 }

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

@@ -2,10 +2,14 @@ package com.sky.ioc.service.space.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.sky.ioc.entity.Indeicator;
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.space.SpaceService;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * TODO  空间
  * @Description
@@ -28,17 +32,17 @@ public class SpaceServiceImpl implements SpaceService {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("total",2000);
         jsonObject.put("occupancy",1800);
-        jsonObject.put("percentage","95%");
+        jsonObject.put("percentage",0.75);
 
         JSONObject jsonObject2 = new JSONObject();
         jsonObject2.put("total",2000);
         jsonObject2.put("occupancy",1800);
-        jsonObject2.put("percentage","97%");
+        jsonObject2.put("percentage",0.97);
 
         JSONObject jsonObject3 = new JSONObject();
         jsonObject3.put("total",2000);
         jsonObject3.put("occupancy",1800);
-        jsonObject3.put("percentage","98%");
+        jsonObject3.put("percentage",0.93);
         jsonArray.add(jsonObject);
         jsonArray.add(jsonObject2);
         jsonArray.add(jsonObject3);
@@ -51,43 +55,92 @@ public class SpaceServiceImpl implements SpaceService {
     }
 
     @Override
-    public String getFloorCoreIndicators() {
-        return null;
+    public ReturnMsg getFloorCoreIndicators(IocDateParam iocDateParam) {
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",1.3);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",5000);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value","项目1");
+        objects.get(2).put("compare",60);
+
+        objects.get(3).put("value","工业互联网");
+        objects.get(3).put("compare",60);
+        indeicator.setWorthAttention("13笔记本即将到报废年限");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
     @Override
-    public String getAccessPersonnel() {
+    public ReturnMsg getAccessPersonnel(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getFloorList() {
+    public ReturnMsg getFloorList(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getMeetingCoreIndicators() {
-        return null;
+    public ReturnMsg getMeetingCoreIndicators(IocDateParam iocDateParam) {
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",95);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",80);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",80);
+        objects.get(2).put("compare",0.4);
+
+        objects.get(3).put("value",8);
+        objects.get(3).put("compare",0.4);
+        indeicator.setWorthAttention("增加会议室");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 
 
     @Override
-    public String getConferenceRoomInfo() {
+    public ReturnMsg getConferenceRoomInfo(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public String getMeetingCostTrend() {
+    public ReturnMsg getMeetingCostTrend(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public ReturnMsg getSpaceInfo() {
+    public ReturnMsg getSpaceInfo(IocDateParam iocDateParam) {
         return null;
     }
 
     @Override
-    public ReturnMsg getSpaceCoreIndicators() {
-        return null;
+    public ReturnMsg getSpaceCoreIndicators(IocDateParam iocDateParam) {
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",98);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",50);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",100);
+        objects.get(2).put("compare",0.4);
+
+        objects.get(3).put("value",1000);
+        objects.get(3).put("compare",0.4);
+        objects.add(new JSONObject());
+        objects.get(4).put("value","40/100");
+        objects.get(5).put("compare",0.4);
+
+        indeicator.setWorthAttention("会议室使用率过低，建议出租");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 }

src/main/java/com/sky/ioc/service/supermarket/SupermarketService.java

@@ -1,5 +1,6 @@
 package com.sky.ioc.service.supermarket;
 
+import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
@@ -11,11 +12,11 @@ import com.sky.ioc.tool.ReturnMsg;
 public interface SupermarketService {
 
 
-    ReturnMsg getCoreIndicators(Integer dateType);
+    ReturnMsg getCoreIndicators(IocDateParam iocDateParam);
 
-    ReturnMsg getQuotientAnalysiss(Integer dateType);
+    ReturnMsg getQuotientAnalysiss(IocDateParam iocDateParam);
 
-    ReturnMsg getProductRanking(Integer dateType);
+    ReturnMsg getProductRanking(IocDateParam iocDateParam);
 
     ReturnMsg getSupermarketInfoList();
 

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

@@ -1,10 +1,15 @@
 package com.sky.ioc.service.supermarket.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.sky.ioc.entity.Indeicator;
+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.ReturnMsg;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * TODO
  *
@@ -15,17 +20,17 @@ import org.springframework.stereotype.Service;
 @Service
 public class SupermarketServiceImpl implements SupermarketService {
     @Override
-    public ReturnMsg getCoreIndicators(Integer dateType) {
+    public ReturnMsg getCoreIndicators(IocDateParam iocDateParam) {
         return  ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
     }
 
     @Override
-    public ReturnMsg getQuotientAnalysiss(Integer dateType) {
+    public ReturnMsg getQuotientAnalysiss(IocDateParam iocDateParam) {
         return  ReturnMsg.ok( FalseData.REPORTFORMSMAP);
     }
 
     @Override
-    public ReturnMsg getProductRanking(Integer dateType) {
+    public ReturnMsg getProductRanking(IocDateParam iocDateParam) {
         return ReturnMsg.ok(FalseData.REPORTFORMSLIST5);
     }
 
@@ -36,6 +41,21 @@ public class SupermarketServiceImpl implements SupermarketService {
 
     @Override
     public ReturnMsg getSupermarketCoreIndicators() {
-        return  ReturnMsg.ok(FalseData.REPORTFORMSLIST4);
+        Indeicator indeicator = new Indeicator();
+        List<JSONObject> objects = indeicator.getList();
+        objects.get(0).put("value",2000);
+        objects.get(0).put("compare",0.4);
+
+        objects.get(1).put("value",1800);
+        objects.get(1).put("compare",0.4);
+
+        objects.get(2).put("value",18);
+        objects.get(2).put("compare",0.4);
+
+        objects.get(3).put("value",200);
+
+        indeicator.setWorthAttention("提高合同额");
+        indeicator.setList(objects);
+        return ReturnMsg.ok(indeicator);
     }
 }