修改全局参数

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.carbon;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.carbon.CarbonService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -22,15 +22,15 @@ public class CarbonController {
 
     @ApiOperation("核心指标")
     @PostMapping("/getCarbonCoreIndicators")
-    public ReturnMsg getFloorCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getFloorCoreIndicators(iocDateParam);
+    public ReturnMsg getFloorCoreIndicators(@RequestBody IocParam iocParam){
+        return carbonService.getFloorCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("碳排放分析")
     @PostMapping("/getCarbonInfo")
-    public ReturnMsg getCarbonInfo(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getCarbonInfo(iocDateParam);
+    public ReturnMsg getCarbonInfo(@RequestBody IocParam iocParam){
+        return carbonService.getCarbonInfo(iocParam);
     }
 
 
@@ -38,22 +38,22 @@ public class CarbonController {
 
     @ApiOperation("碳配额构成")
     @PostMapping("/getCarbonQuotaComposition")
-    public ReturnMsg getCarbonQuotaComposition(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getCarbonQuotaComposition(iocDateParam);
+    public ReturnMsg getCarbonQuotaComposition(@RequestBody IocParam iocParam){
+        return carbonService.getCarbonQuotaComposition(iocParam);
     }
 
 
 
     @ApiOperation("双碳新闻")
     @PostMapping("/getCarbonNews")
-    public ReturnMsg getCarbonNews(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getCarbonNews(iocDateParam);
+    public ReturnMsg getCarbonNews(@RequestBody IocParam iocParam){
+        return carbonService.getCarbonNews(iocParam);
     }
 
     @ApiOperation("碳排放占比")
     @PostMapping("/getCarbonProportion")
-    public ReturnMsg getCarbonProportion(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getCarbonProportion(iocDateParam);
+    public ReturnMsg getCarbonProportion(@RequestBody IocParam iocParam){
+        return carbonService.getCarbonProportion(iocParam);
     }
 
 

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.carbon;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.carbon.CarbonService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -33,15 +33,15 @@ public class PhotovoltaicController {
 
     @ApiOperation("核心指标")
     @PostMapping("/getPhotovoltaicCoreIndicators")
-    public ReturnMsg getPhotovoltaicCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getPhotovoltaicCoreIndicators(iocDateParam);
+    public ReturnMsg getPhotovoltaicCoreIndicators(@RequestBody IocParam iocParam){
+        return carbonService.getPhotovoltaicCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("光伏减排分析")
     @PostMapping("/getPhotovoltaicInfo")
-    public ReturnMsg getPhotovoltaicInfo(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getPhotovoltaicInfo(iocDateParam);
+    public ReturnMsg getPhotovoltaicInfo(@RequestBody IocParam iocParam){
+        return carbonService.getPhotovoltaicInfo(iocParam);
     }
 
 
@@ -49,8 +49,8 @@ public class PhotovoltaicController {
 
     @ApiOperation("光伏排放排名")
     @PostMapping("/getPhotovoltaicInfoOrder")
-    public ReturnMsg getPhotovoltaicInfoOrder(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getPhotovoltaicInfoOrder(iocDateParam);
+    public ReturnMsg getPhotovoltaicInfoOrder(@RequestBody IocParam iocParam){
+        return carbonService.getPhotovoltaicInfoOrder(iocParam);
     }
 
 }

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.carbon;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.carbon.CarbonService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -35,15 +35,15 @@ public class PrintController {
 
     @ApiOperation("核心指标")
     @PostMapping("/getPrintCoreIndicators")
-    public ReturnMsg getPrintCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getPrintCoreIndicators(iocDateParam);
+    public ReturnMsg getPrintCoreIndicators(@RequestBody IocParam iocParam){
+        return carbonService.getPrintCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("文印排放分析")
     @PostMapping("/getPrintInfo")
-    public ReturnMsg getPrintInfo(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getPrintInfo(iocDateParam);
+    public ReturnMsg getPrintInfo(@RequestBody IocParam iocParam){
+        return carbonService.getPrintInfo(iocParam);
     }
 
 
@@ -51,8 +51,8 @@ public class PrintController {
 
     @ApiOperation("文印排放排名")
     @PostMapping("/getPrintInfoOrder")
-    public ReturnMsg getPrintInfoOrder(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getPrintInfoOrder(iocDateParam);
+    public ReturnMsg getPrintInfoOrder(@RequestBody IocParam iocParam){
+        return carbonService.getPrintInfoOrder(iocParam);
     }
 
 }

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.carbon;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.carbon.CarbonService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -37,15 +37,15 @@ public class VehicleController {
 
     @ApiOperation("核心指标")
     @PostMapping("/getVehicleCoreIndicators")
-    public ReturnMsg getVehicleCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getVehicleCoreIndicators(iocDateParam);
+    public ReturnMsg getVehicleCoreIndicators(@RequestBody IocParam iocParam){
+        return carbonService.getVehicleCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("车辆排放情况")
     @PostMapping("/getVehicleInfo")
-    public ReturnMsg getVehicleInfo(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getVehicleInfo(iocDateParam);
+    public ReturnMsg getVehicleInfo(@RequestBody IocParam iocParam){
+        return carbonService.getVehicleInfo(iocParam);
     }
 
 
@@ -53,8 +53,8 @@ public class VehicleController {
 
     @ApiOperation("车辆排放排名")
     @PostMapping("/getVehicleInfoOrder")
-    public ReturnMsg getVehicleInfoOrder(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getVehicleInfoOrder(iocDateParam);
+    public ReturnMsg getVehicleInfoOrder(@RequestBody IocParam iocParam){
+        return carbonService.getVehicleInfoOrder(iocParam);
     }
 
 

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.life;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.fitness.HealthService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -27,27 +27,27 @@ public class HealthHomeController {
 
     @ApiOperation("查询智慧生活中健康小屋的核心指标")
     @PostMapping("getCoreIndicators")
-    public ReturnMsg getCoreIndicators(@RequestBody IocDateParam iocDateParam){
+    public ReturnMsg getCoreIndicators(@RequestBody IocParam iocParam){
 //        dateType   1.周，2.月，3.年
-        return healthService.getCoreIndicators(iocDateParam);
+        return healthService.getCoreIndicators(iocParam);
     }
 
 
 
     @ApiOperation("查询智慧生活中健康小屋的小屋分析")
     @PostMapping("getHutAnalysis")
-    public ReturnMsg  getHutAnalysis(@RequestBody IocDateParam iocDateParam){
+    public ReturnMsg  getHutAnalysis(@RequestBody IocParam iocParam){
 //        dateType   1.周，2.月，3.年
-        return healthService.getHutAnalysis(iocDateParam);
+        return healthService.getHutAnalysis(iocParam);
     }
 
 
 
     @ApiOperation("查询智慧生活中健康小屋的环境监测")
     @PostMapping("getEnvironmentalDetection")
-    public ReturnMsg  getEnvironmentalDetection(@RequestBody IocDateParam iocDateParam){
+    public ReturnMsg  getEnvironmentalDetection(@RequestBody IocParam iocParam){
 //        dateType   1.周，2.月，3.年
-        return healthService.getEnvironmentalDetection(iocDateParam);
+        return healthService.getEnvironmentalDetection(iocParam);
     }
 
 

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.life;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.Parking.ParkingService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -35,51 +35,51 @@ public class ParkingController {
 
     @ApiOperation("查询智慧生活中智慧停车的核心指标")
     @PostMapping("getCoreIndicators")
-    public ReturnMsg getCoreIndicators(@RequestBody IocDateParam iocDateParam){
+    public ReturnMsg getCoreIndicators(@RequestBody IocParam iocParam){
 //        dateType   1.周，2.月，3.年
-        return parkingService.getCoreIndicators(iocDateParam);
+        return parkingService.getCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("查询智慧生活中智慧停车的车流态势")
     @PostMapping("getTrafficflowSituation")
-    public ReturnMsg  getTrafficflowSituation(@RequestBody IocDateParam iocDateParam){
+    public ReturnMsg  getTrafficflowSituation(@RequestBody IocParam iocParam){
 //        dateType   1.周，2.月，3.年
-        return parkingService.getTrafficflowSituation(iocDateParam);
+        return parkingService.getTrafficflowSituation(iocParam);
     }
 
 
     @ApiOperation("查询智慧生活中智慧停车的空置车位")
     @PostMapping("getVacantParkingSpace")
-    public ReturnMsg  getVacantParkingSpace(@RequestBody IocDateParam iocDateParam){
+    public ReturnMsg  getVacantParkingSpace(@RequestBody IocParam iocParam){
 //        dateType   1.周，2.月，3.年
-        return parkingService.getVacantParkingSpace(iocDateParam);
+        return parkingService.getVacantParkingSpace(iocParam);
     }
 
 
 
     @ApiOperation("查询智慧生活中智慧停车的车位详情")
     @PostMapping("getParkingSpaceDetails")
-    public ReturnMsg  getParkingSpaceDetails(@RequestBody IocDateParam iocDateParam){
+    public ReturnMsg  getParkingSpaceDetails(@RequestBody IocParam iocParam){
 //        dateType   1.周，2.月，3.年
-        return parkingService.getParkingSpaceDetails(iocDateParam);
+        return parkingService.getParkingSpaceDetails(iocParam);
     }
 
 
     @ApiOperation("查询智慧生活中智慧停车的违停情况")
     @PostMapping("getStopViolation")
-    public ReturnMsg  getStopViolation(@RequestBody IocDateParam iocDateParam){
+    public ReturnMsg  getStopViolation(@RequestBody IocParam iocParam){
 //        dateType   1.周，2.月，3.年
-        return parkingService.getStopViolation(iocDateParam);
+        return parkingService.getStopViolation(iocParam);
     }
 
 
 
     @ApiOperation("查询智慧生活中智慧停车的占用车位数量")
     @PostMapping("getOccupationOfParkingSpace")
-    public ReturnMsg  getOccupationOfParkingSpace(@RequestBody IocDateParam iocDateParam){
+    public ReturnMsg  getOccupationOfParkingSpace(@RequestBody IocParam iocParam){
 //        dateType   1.周，2.月，3.年
-        return parkingService.getOccupationOfParkingSpace(iocDateParam);
+        return parkingService.getOccupationOfParkingSpace(iocParam);
     }
 
 

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.life;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.canteen.RestaurantService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -31,35 +31,34 @@ public class RestaurantController {
 
     @ApiOperation("查询智慧生活中智慧餐厅的核心指标")
     @PostMapping("getCoreIndicators")
-    public ReturnMsg  getCoreIndicators(@RequestBody IocDateParam iocDateParam){
-//        iocDateParam   1.周，2.月，3.年
-        return restaurantService.getCoreIndicators(iocDateParam);
+    public ReturnMsg  getCoreIndicators(@RequestBody IocParam iocParam){
+        return restaurantService.getCoreIndicators(iocParam);
     }
 
     @ApiOperation("查询智慧生活中智慧餐厅的用餐分析")
     @PostMapping("getMealAnalysis")
-    public ReturnMsg  getMealAnalysis(@RequestBody IocDateParam iocDateParam){
-        return restaurantService.getMealAnalysis(iocDateParam);
+    public ReturnMsg  getMealAnalysis(@RequestBody IocParam iocParam){
+        return restaurantService.getMealAnalysis(iocParam);
     }
 
 
     @ApiOperation("查询智慧生活中智慧餐厅的欢迎菜品")
     @PostMapping("getWelcomeDishes")
-    public ReturnMsg getWelcomeDishes(@RequestBody IocDateParam iocDateParam){
-        return restaurantService.getWelcomeDishes(iocDateParam);
+    public ReturnMsg getWelcomeDishes(@RequestBody IocParam iocParam){
+        return restaurantService.getWelcomeDishes(iocParam);
     }
 
 
     @ApiOperation("查询智慧生活中智慧餐厅的消费分析")
     @PostMapping("getConsumptionAnalysis")
-    public ReturnMsg  getConsumptionAnalysis(@RequestBody IocDateParam iocDateParam){
-        return restaurantService.getConsumptionAnalysis(iocDateParam);
+    public ReturnMsg  getConsumptionAnalysis(@RequestBody IocParam iocParam){
+        return restaurantService.getConsumptionAnalysis(iocParam);
     }
 
     @ApiOperation("查询智慧生活中智慧餐厅的盈利分析")
     @PostMapping("getProfitAnalysis")
-    public ReturnMsg  getProfitAnalysis(@RequestBody IocDateParam iocDateParam){
-        return restaurantService.getProfitAnalysis(iocDateParam);
+    public ReturnMsg  getProfitAnalysis(@RequestBody IocParam iocParam){
+        return restaurantService.getProfitAnalysis(iocParam);
     }
 
 
@@ -73,8 +72,8 @@ public class RestaurantController {
      */
     @ApiOperation("查询智慧生活中智慧餐厅的支付分析")
     @PostMapping("getPaymentAnalysis")
-    public ReturnMsg  getPaymentAnalysis(@RequestBody IocDateParam iocDateParam){
-        return restaurantService.getPaymentAnalysis(iocDateParam);
+    public ReturnMsg  getPaymentAnalysis(@RequestBody IocParam iocParam){
+        return restaurantService.getPaymentAnalysis(iocParam);
     }
 
 

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.life;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.supermarket.SupermarketService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -31,26 +31,26 @@ public class SupermarketController {
 
     @ApiOperation("查询智慧生活中无人超市的核心指标")
     @PostMapping("getCoreIndicators")
-    public ReturnMsg getCoreIndicators(@RequestBody  IocDateParam iocDateParam){
+    public ReturnMsg getCoreIndicators(@RequestBody IocParam iocParam){
 //        iocDateParam   1.周，2.月，3.年
-        return supermarketService.getCoreIndicators(iocDateParam);
+        return supermarketService.getCoreIndicators(iocParam);
     }
 
 
 
     @ApiOperation("查询智慧生活中无人超市的商超分析")
     @PostMapping("getQuotientAnalysiss")
-    public ReturnMsg  getQuotientAnalysiss(@RequestBody IocDateParam iocDateParam){
+    public ReturnMsg  getQuotientAnalysiss(@RequestBody IocParam iocParam){
 //        iocDateParam   1.周，2.月，3.年
-        return supermarketService.getQuotientAnalysiss(iocDateParam);
+        return supermarketService.getQuotientAnalysiss(iocParam);
     }
 
 
     @ApiOperation("查询智慧生活中无人超市的商品排行")
     @PostMapping("getProductRanking")
-    public ReturnMsg  getProductRanking(@RequestBody IocDateParam iocDateParam){
+    public ReturnMsg  getProductRanking(@RequestBody IocParam iocParam){
 //        iocDateParam   1.周，2.月，3.年
-        return supermarketService.getProductRanking(iocDateParam);
+        return supermarketService.getProductRanking(iocParam);
     }
 
 

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.operation;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.carbon.CarbonService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -30,8 +30,8 @@ public class AnalyseController {
 
     @ApiOperation("核心指标")
     @PostMapping("/getAnalyseCoreIndicators")
-    public ReturnMsg getAnalyseCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getAnalyseCoreIndicators(iocDateParam);
+    public ReturnMsg getAnalyseCoreIndicators(@RequestBody IocParam iocParam){
+        return carbonService.getAnalyseCoreIndicators(iocParam);
     }
 
 
@@ -39,136 +39,136 @@ public class AnalyseController {
 
     @ApiOperation("用水核心指标")
     @PostMapping("/getAnalyseWaterCoreIndicators")
-    public ReturnMsg getAnalyseWaterCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getAnalyseWaterCoreIndicators(iocDateParam);
+    public ReturnMsg getAnalyseWaterCoreIndicators(@RequestBody IocParam iocParam){
+        return carbonService.getAnalyseWaterCoreIndicators(iocParam);
     }
 
 
 
     @ApiOperation("用电核心指标")
     @PostMapping("/getAnalysePowerCoreIndicators")
-    public ReturnMsg getAnalysePowerCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getAnalysePowerCoreIndicators(iocDateParam);
+    public ReturnMsg getAnalysePowerCoreIndicators(@RequestBody IocParam iocParam){
+        return carbonService.getAnalysePowerCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("用热核心指标")
     @PostMapping("/getAnalyseHotCoreIndicators")
-    public ReturnMsg getAnalyseHotCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getAnalyseHotCoreIndicators(iocDateParam);
+    public ReturnMsg getAnalyseHotCoreIndicators(@RequestBody IocParam iocParam){
+        return carbonService.getAnalyseHotCoreIndicators(iocParam);
     }
 
     @ApiOperation("用冷核心指标")
     @PostMapping("/getAnalyseColdCoreIndicators")
-    public ReturnMsg getAnalyseColdCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getAnalyseColdCoreIndicators(iocDateParam);
+    public ReturnMsg getAnalyseColdCoreIndicators(@RequestBody IocParam iocParam){
+        return carbonService.getAnalyseColdCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("光伏核心指标")
     @PostMapping("/getAnalyseCpvCoreIndicators")
-    public ReturnMsg getAnalyseCpvCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getAnalyseCpvCoreIndicators(iocDateParam);
+    public ReturnMsg getAnalyseCpvCoreIndicators(@RequestBody IocParam iocParam){
+        return carbonService.getAnalyseCpvCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("总能源趋势")
     @PostMapping("/getEnergyTrendsTotal")
-    public ReturnMsg getEnergyTrendsTotal(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyTrendsTotal(iocDateParam);
+    public ReturnMsg getEnergyTrendsTotal(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyTrendsTotal(iocParam);
     }
 
 
     @ApiOperation("光伏能源趋势")
     @PostMapping("/getEnergyTrendsAnalyseCpv")
-    public ReturnMsg getEnergyTrendsAnalyseCpv(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyTrendsAnalyseCpv(iocDateParam);
+    public ReturnMsg getEnergyTrendsAnalyseCpv(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyTrendsAnalyseCpv(iocParam);
     }
     @ApiOperation("光伏能源分布中的图表")
     @PostMapping("/getEnergyTrendsAnalyseCpvInfo")
-    public ReturnMsg getEnergyTrendsAnalyseCpvInfo(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyTrendsAnalyseCpvInfo(iocDateParam);
+    public ReturnMsg getEnergyTrendsAnalyseCpvInfo(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyTrendsAnalyseCpvInfo(iocParam);
     }
 
     @ApiOperation("用冷能源趋势")
     @PostMapping("/getEnergyTrendsAnalyseCold")
-    public ReturnMsg getEnergyTrendsAnalyseCold(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyTrendsAnalyseCold(iocDateParam);
+    public ReturnMsg getEnergyTrendsAnalyseCold(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyTrendsAnalyseCold(iocParam);
     }
 
     @ApiOperation("用热能源趋势")
     @PostMapping("/getEnergyTrendsAnalyseHot")
-    public ReturnMsg getEnergyTrendsAnalyseHot(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyTrendsAnalyseHot(iocDateParam);
+    public ReturnMsg getEnergyTrendsAnalyseHot(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyTrendsAnalyseHot(iocParam);
     }
 
 
     @ApiOperation("用电能源趋势")
     @PostMapping("/getEnergyTrendsAnalysePower")
-    public ReturnMsg getEnergyTrendsAnalysePower(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyTrendsAnalysePower(iocDateParam);
+    public ReturnMsg getEnergyTrendsAnalysePower(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyTrendsAnalysePower(iocParam);
     }
 
     @ApiOperation("用热能源趋势")
     @PostMapping("/getEnergyTrendsAnalyseWater")
-    public ReturnMsg getEnergyTrendsAnalyseWater(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyTrendsAnalyseWater(iocDateParam);
+    public ReturnMsg getEnergyTrendsAnalyseWater(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyTrendsAnalyseWater(iocParam);
     }
 
 
     @ApiOperation("总能源分析(饼状图)")
     @PostMapping("/getEnergyAnalysisTotal")
-    public ReturnMsg getEnergyAnalysisTotal(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyAnalysisTotal(iocDateParam);
+    public ReturnMsg getEnergyAnalysisTotal(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyAnalysisTotal(iocParam);
     }
     @ApiOperation("水能源分析(饼状图)")
     @PostMapping("/getEnergyAnalysisWater")
-    public ReturnMsg getEnergyAnalysisWater(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyAnalysisWater(iocDateParam);
+    public ReturnMsg getEnergyAnalysisWater(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyAnalysisWater(iocParam);
     }
 
     @ApiOperation("用电能源分析(饼状图)")
     @PostMapping("/getEnergyAnalysisPower")
-    public ReturnMsg getEnergyAnalysisPower(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyAnalysisPower(iocDateParam);
+    public ReturnMsg getEnergyAnalysisPower(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyAnalysisPower(iocParam);
     }
     @ApiOperation("热能源分析(饼状图)")
     @PostMapping("/getEnergyAnalysisHot")
-    public ReturnMsg getEnergyAnalysisHot(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyAnalysisHot(iocDateParam);
+    public ReturnMsg getEnergyAnalysisHot(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyAnalysisHot(iocParam);
     }
 
     @ApiOperation("总能源分析统计")
     @PostMapping("/getEnergyAnalysisTotalInfo")
-    public ReturnMsg getEnergyAnalysisTotalInfo(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyAnalysisTotalInfo(iocDateParam);
+    public ReturnMsg getEnergyAnalysisTotalInfo(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyAnalysisTotalInfo(iocParam);
     }
     @ApiOperation("水能源分析统计")
     @PostMapping("/getEnergyAnalysisWaterInfo")
-    public ReturnMsg getEnergyAnalysisWaterInfo(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyAnalysisWaterInfo(iocDateParam);
+    public ReturnMsg getEnergyAnalysisWaterInfo(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyAnalysisWaterInfo(iocParam);
     }
 
     @ApiOperation("用电能源分析统计")
     @PostMapping("/getEnergyAnalysisPowerInfo")
-    public ReturnMsg getEnergyAnalysisPowerInfo(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyAnalysisPowerInfo(iocDateParam);
+    public ReturnMsg getEnergyAnalysisPowerInfo(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyAnalysisPowerInfo(iocParam);
     }
     @ApiOperation("热能源分析统计")
     @PostMapping("/getEnergyAnalysisHotInfo")
-    public ReturnMsg getEnergyAnalysisHotInfo(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyAnalysisHotInfo(iocDateParam);
+    public ReturnMsg getEnergyAnalysisHotInfo(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyAnalysisHotInfo(iocParam);
     }
 
     @ApiOperation("冷能源分析")
     @PostMapping("/getEnergyAnalysisClod")
-    public ReturnMsg getEnergyAnalysisClod(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyAnalysisClod(iocDateParam);
+    public ReturnMsg getEnergyAnalysisClod(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyAnalysisClod(iocParam);
     }
     @ApiOperation("光伏能源分析")
     @PostMapping("/getEnergyAnalysisCpv")
-    public ReturnMsg getEnergyAnalysisCpv(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getEnergyAnalysisCpv(iocDateParam);
+    public ReturnMsg getEnergyAnalysisCpv(@RequestBody IocParam iocParam){
+        return carbonService.getEnergyAnalysisCpv(iocParam);
     }
 
 

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

@@ -8,13 +8,12 @@ package com.sky.ioc.controller.operation;
  * @Date 2023/3/1 16:19
  **/
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,21 +34,21 @@ public class AssetController {
 
     @ApiOperation("核心指标")
     @PostMapping("/getOperAssetCoreIndicators")
-    public ReturnMsg getOperAssetCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return assetService.getOperAssetCoreIndicators(iocDateParam);
+    public ReturnMsg getOperAssetCoreIndicators(@RequestBody IocParam iocParam){
+        return assetService.getOperAssetCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("投资分析")
     @PostMapping("/getAssetAnalysis")
-    public ReturnMsg getAssetAnalysis(@RequestBody IocDateParam iocDateParam){
-        return assetService.getAssetAnalysis(iocDateParam);
+    public ReturnMsg getAssetAnalysis(@RequestBody IocParam iocParam){
+        return assetService.getAssetAnalysis(iocParam);
     }
 
     @ApiOperation("资产年限")
     @PostMapping("/getAssetAge")
-    public ReturnMsg getAssetAge(@RequestBody IocDateParam iocDateParam){
-        return assetService.getAssetAge(iocDateParam);
+    public ReturnMsg getAssetAge(@RequestBody IocParam iocParam){
+        return assetService.getAssetAge(iocParam);
     }
 
 
@@ -57,15 +56,15 @@ public class AssetController {
 
     @ApiOperation("资产占比排名")
     @PostMapping("/getAssetShareRanking")
-    public ReturnMsg getAssetShareRanking(@RequestBody IocDateParam iocDateParam){
-        return assetService.getAssetShareRanking(iocDateParam);
+    public ReturnMsg getAssetShareRanking(@RequestBody IocParam iocParam){
+        return assetService.getAssetShareRanking(iocParam);
     }
 
 
     @ApiOperation("报废与维修")
     @PostMapping("/getScrapAndMaintain")
-    public ReturnMsg getScrapAndMaintain(@RequestBody IocDateParam iocDateParam){
-        return assetService.getScrapAndMaintain(iocDateParam);
+    public ReturnMsg getScrapAndMaintain(@RequestBody IocParam iocParam){
+        return assetService.getScrapAndMaintain(iocParam);
     }
 
 

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.operation;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.space.SpaceService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -34,8 +34,8 @@ public class SpaceController {
 
     @ApiOperation("核心指标")
     @PostMapping("/getSpaceCoreIndicators")
-    public ReturnMsg getSpaceCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return spaceService.getSpaceCoreIndicators(iocDateParam);
+    public ReturnMsg getSpaceCoreIndicators(@RequestBody IocParam iocParam){
+        return spaceService.getSpaceCoreIndicators(iocParam);
     }
 
 
@@ -43,8 +43,8 @@ public class SpaceController {
 
     @ApiOperation("空间成本")
     @PostMapping("/getSpaceInfo")
-    public ReturnMsg getSpaceInfo(@RequestBody IocDateParam iocDateParam){
-        return spaceService.getSpaceInfo(iocDateParam);
+    public ReturnMsg getSpaceInfo(@RequestBody IocParam iocParam){
+        return spaceService.getSpaceInfo(iocParam);
     }
 
 

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.security;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.security.SecurityService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -32,37 +32,37 @@ public class LinkageController {
 
     @ApiOperation("告警管理--核心指标")
     @PostMapping("/getLinkageCoreIndicators")
-    public ReturnMsg getLinkageCoreIndicators(@RequestBody  IocDateParam iocDateParam){
-        return securityService.getLinkageCoreIndicators(iocDateParam);
+    public ReturnMsg getLinkageCoreIndicators(@RequestBody IocParam iocParam){
+        return securityService.getLinkageCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("告警管理--告警趋势")
     @PostMapping("/getAlarmTrend")
-    public ReturnMsg getAlarmTrend(@RequestBody  IocDateParam iocDateParam){
-        return securityService.getAlarmTrend(iocDateParam);
+    public ReturnMsg getAlarmTrend(@RequestBody IocParam iocParam){
+        return securityService.getAlarmTrend(iocParam);
     }
 
 
     @ApiOperation("告警管理--告警分类")
     @PostMapping("/getAlarmClassification")
-    public ReturnMsg getAlarmClassification(@RequestBody  IocDateParam iocDateParam){
-        return securityService.getAlarmClassification(iocDateParam);
+    public ReturnMsg getAlarmClassification(@RequestBody IocParam iocParam){
+        return securityService.getAlarmClassification(iocParam);
     }
 
 
     @ApiOperation("告警管理--设备在线趋势")
     @PostMapping("/getEquipmentOnline")
-    public ReturnMsg getEquipmentOnline(@RequestBody IocDateParam iocDateParam){
-        return securityService.getEquipmentOnline(iocDateParam);
+    public ReturnMsg getEquipmentOnline(@RequestBody IocParam iocParam){
+        return securityService.getEquipmentOnline(iocParam);
     }
 
 
 
     @ApiOperation("告警管理--楼层告警分布")
     @PostMapping("/getFloorAlarmDistribution")
-    public ReturnMsg getFloorAlarmDistribution(@RequestBody IocDateParam iocDateParam){
-        return securityService.getFloorAlarmDistribution(iocDateParam);
+    public ReturnMsg getFloorAlarmDistribution(@RequestBody IocParam iocParam){
+        return securityService.getFloorAlarmDistribution(iocParam);
     }
 
 
@@ -70,8 +70,8 @@ public class LinkageController {
 
     @ApiOperation("告警库--告警列表信息")
     @PostMapping("/getGiveAlarmList")
-    public ReturnMsg getGiveAlarmList(@RequestBody IocDateParam iocDateParam){
-        return securityService.getGiveAlarmList(iocDateParam);
+    public ReturnMsg getGiveAlarmList(@RequestBody IocParam iocParam){
+        return securityService.getGiveAlarmList(iocParam);
     }
 
 }

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

@@ -1,7 +1,6 @@
 package com.sky.ioc.controller.security;
 
-import com.sky.ioc.entity.params.IocDateParam;
-import com.sky.ioc.service.carbon.CarbonService;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.personnel.PersonnelService;
 import com.sky.ioc.service.security.SecurityService;
 import com.sky.ioc.tool.ReturnMsg;
@@ -39,22 +38,22 @@ public class PersonController {
 
     @ApiOperation("核心指标")
     @PostMapping("/getSecurityCoreIndicators")
-    public ReturnMsg getSecurityCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return personnelService.getSecurityCoreIndicators(iocDateParam);
+    public ReturnMsg getSecurityCoreIndicators(@RequestBody IocParam iocParam){
+        return personnelService.getSecurityCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("保有量")
     @PostMapping("/getPopulationPerson")
-    public ReturnMsg getPopulationPerson(@RequestBody IocDateParam iocDateParam){
-        return personnelService.getPopulationPerson(iocDateParam);
+    public ReturnMsg getPopulationPerson(@RequestBody IocParam iocParam){
+        return personnelService.getPopulationPerson(iocParam);
     }
 
 
     @ApiOperation("大楼客流量")
     @PostMapping("/getPassengerFlow")
-    public ReturnMsg getPassengerFlow(@RequestBody IocDateParam iocDateParam){
-        return personnelService.getPassengerFlow(iocDateParam);
+    public ReturnMsg getPassengerFlow(@RequestBody IocParam iocParam){
+        return personnelService.getPassengerFlow(iocParam);
     }
 
 }

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.work;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.carbon.CarbonService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -12,9 +12,6 @@ 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;
-import java.lang.annotation.Retention;
-
 /**
  * TODO
  * @Description
@@ -38,15 +35,15 @@ public class BusController {
 
     @ApiOperation("核心指标")
     @PostMapping("/getBusCoreIndicators")
-    public ReturnMsg getBusCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getBusCoreIndicators(iocDateParam);
+    public ReturnMsg getBusCoreIndicators(@RequestBody IocParam iocParam){
+        return carbonService.getBusCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("公车情况")
     @PostMapping("/getBusInfo")
-    public ReturnMsg getBusInfo(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getBusInfo(iocDateParam);
+    public ReturnMsg getBusInfo(@RequestBody IocParam iocParam){
+        return carbonService.getBusInfo(iocParam);
     }
 
 
@@ -54,8 +51,8 @@ public class BusController {
 
     @ApiOperation("成本趋势")
     @PostMapping("/getBusCostTrend")
-    public ReturnMsg getBusCostTrend(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getBusCostTrend(iocDateParam);
+    public ReturnMsg getBusCostTrend(@RequestBody IocParam iocParam){
+        return carbonService.getBusCostTrend(iocParam);
     }
 
 

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.work;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.space.SpaceService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -12,8 +12,6 @@ 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;
-
 /**
  * TODO
  * @Description  智慧办公 ---- 楼层概括
@@ -34,15 +32,15 @@ public class FloorController {
 
     @ApiOperation("核心指标")
     @PostMapping("/getFloorCoreIndicators")
-    public ReturnMsg getFloorCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return spaceService.getFloorCoreIndicators(iocDateParam);
+    public ReturnMsg getFloorCoreIndicators(@RequestBody IocParam iocParam){
+        return spaceService.getFloorCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("当日门禁进入人员")
     @PostMapping("/getAccessPersonnel")
-    public ReturnMsg getAccessPersonnel(@RequestBody IocDateParam iocDateParam){
-        return spaceService.getAccessPersonnel(iocDateParam);
+    public ReturnMsg getAccessPersonnel(@RequestBody IocParam iocParam){
+        return spaceService.getAccessPersonnel(iocParam);
     }
 
 
@@ -50,8 +48,8 @@ public class FloorController {
 
     @ApiOperation("楼层概览")
     @PostMapping("/getFloorList")
-    public ReturnMsg getFloorList(@RequestBody IocDateParam iocDateParam){
-        return spaceService.getFloorList(iocDateParam);
+    public ReturnMsg getFloorList(@RequestBody IocParam iocParam){
+        return spaceService.getFloorList(iocParam);
     }
 
 

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.work;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.space.SpaceService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
@@ -12,8 +12,6 @@ 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;
-
 /**
  * TODO
  *
@@ -35,15 +33,15 @@ public class MeetingController {
 
     @ApiOperation("核心指标")
     @PostMapping("/getMeetingCoreIndicators")
-    public ReturnMsg getMeetingCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return spaceService.getMeetingCoreIndicators(iocDateParam);
+    public ReturnMsg getMeetingCoreIndicators(@RequestBody IocParam iocParam){
+        return spaceService.getMeetingCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("成本趋势")
     @PostMapping("/getMeetingCostTrend")
-    public ReturnMsg getMeetingCostTrend(@RequestBody IocDateParam iocDateParam){
-        return spaceService.getMeetingCostTrend(iocDateParam);
+    public ReturnMsg getMeetingCostTrend(@RequestBody IocParam iocParam){
+        return spaceService.getMeetingCostTrend(iocParam);
     }
 
 
@@ -51,8 +49,8 @@ public class MeetingController {
 
     @ApiOperation("会议室情况")
     @PostMapping("/getConferenceRoomInfo")
-    public ReturnMsg getConferenceRoomInfo(@RequestBody IocDateParam iocDateParam){
-        return spaceService.getConferenceRoomInfo(iocDateParam);
+    public ReturnMsg getConferenceRoomInfo(@RequestBody IocParam iocParam){
+        return spaceService.getConferenceRoomInfo(iocParam);
     }
 
 

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

@@ -1,8 +1,7 @@
 package com.sky.ioc.controller.work;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.carbon.CarbonService;
-import com.sky.ioc.service.space.SpaceService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,8 +12,6 @@ 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;
-
 /**
  * TODO
  *
@@ -38,15 +35,15 @@ public class PrintingController {
 
     @ApiOperation("核心指标")
     @PostMapping("/getPrintingCoreIndicators")
-    public ReturnMsg getPrintingCoreIndicators(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getPrintingCoreIndicators(iocDateParam);
+    public ReturnMsg getPrintingCoreIndicators(@RequestBody IocParam iocParam){
+        return carbonService.getPrintingCoreIndicators(iocParam);
     }
 
 
     @ApiOperation("成本趋势")
     @PostMapping("/getPrintingCostTrend")
-    public ReturnMsg getPrintingCostTrend(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getPrintingCostTrend(iocDateParam);
+    public ReturnMsg getPrintingCostTrend(@RequestBody IocParam iocParam){
+        return carbonService.getPrintingCostTrend(iocParam);
     }
 
 
@@ -54,8 +51,8 @@ public class PrintingController {
 
     @ApiOperation("文印情况")
     @PostMapping("/getConferenceRoomInfo")
-    public ReturnMsg getConferenceRoomInfo(@RequestBody IocDateParam iocDateParam){
-        return carbonService.getConferenceRoomInfo(iocDateParam);
+    public ReturnMsg getConferenceRoomInfo(@RequestBody IocParam iocParam){
+        return carbonService.getConferenceRoomInfo(iocParam);
     }
 
 

src/main/java/com/sky/ioc/entity/params/IocDateParam.java

@@ -1,15 +0,0 @@
-package com.sky.ioc.entity.params;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/** 时间范围参数 */
-@Data
-public class IocDateParam extends IocParam {
-    /** 开始时间 */
-    private String startDate;
-
-    /** 结束时间 */
-    private String endDate;
-}

src/main/java/com/sky/ioc/entity/params/IocParam.java

@@ -2,11 +2,28 @@ package com.sky.ioc.entity.params;
 
 import lombok.Data;
 
-/** IOC 全局参数 */
+/** 全局参数 */
 @Data
 public class IocParam {
+
     /**
-     * 楼层ID
+     * 楼宇ID
      */
     private Integer buildingId;
+    /**
+     * 单位ID
+     */
+    private Integer companyId;
+    /**
+     * 部门ID
+     */
+    private Integer deptId;
+    /**
+     * 楼层ID
+     */
+    private Integer floorId;
+    /**
+     * 日期范围
+     */
+    private IocTimeRange timeRange;
 }

src/main/java/com/sky/ioc/entity/params/IocTimeRange.java

@@ -0,0 +1,26 @@
+package com.sky.ioc.entity.params;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+
+@Data
+public class IocTimeRange {
+    /** 开始时间 */
+    private String startDate;
+
+    /** 结束时间 */
+    private String endDate;
+
+    private Integer range;
+
+    public Integer getRange() {
+        DateTimeFormatter pattern = DateTimeFormatter.ofPattern("yyyy/MM/dd");
+        LocalDate sDate = LocalDate.parse(this.startDate, pattern);
+        LocalDate eDate = LocalDate.parse(this.endDate, pattern);
+        this.range = Math.toIntExact(ChronoUnit.DAYS.between(sDate, eDate));
+        return this.range;
+    }
+}

src/main/java/com/sky/ioc/entity/params/life/LifeRestaurantParam.java

@@ -1,17 +0,0 @@
-package com.sky.ioc.entity.params.life;
-
-import com.sky.ioc.entity.params.IocDateParam;
-import lombok.Data;
-
-/**
- * 智慧生活-餐厅查询参数
- * @author LunCe
- */
-@Data
-public class LifeRestaurantParam extends IocDateParam {
-
-    private Integer companyId;
-
-    private Integer deptId;
-
-}

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

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

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

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.Cake;
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.Parking.ParkingService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.GeneralMethod;
@@ -24,7 +24,7 @@ public class ParkingServiceImpl implements ParkingService {
 
 
     @Override
-    public ReturnMsg getCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         objects.get(0).put("value",2000);
@@ -44,7 +44,7 @@ public class ParkingServiceImpl implements ParkingService {
     }
 
     @Override
-    public ReturnMsg getTrafficflowSituation(IocDateParam iocDateParam) {
+    public ReturnMsg getTrafficflowSituation(IocParam iocParam) {
         String[] param = {"getInto","leave"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -52,17 +52,17 @@ public class ParkingServiceImpl implements ParkingService {
     }
 
     @Override
-    public ReturnMsg getVacantParkingSpace(IocDateParam iocDateParam) {
+    public ReturnMsg getVacantParkingSpace(IocParam iocParam) {
         return ReturnMsg.ok(FalseData.PARKINGLIST);
     }
     @Override
-    public ReturnMsg getParkingSpaceDetails(IocDateParam iocDateParam) {
+    public ReturnMsg getParkingSpaceDetails(IocParam iocParam) {
         return ReturnMsg.ok(FalseData.PARKINGLIST);
     }
 
 
     @Override
-    public ReturnMsg getStopViolation(IocDateParam iocDateParam) {
+    public ReturnMsg getStopViolation(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         list.add(new Cake("qitadanwei"));
         list.add(new Cake("beijingguihuayuan"));
@@ -72,7 +72,7 @@ public class ParkingServiceImpl implements ParkingService {
     }
 
     @Override
-    public ReturnMsg getOccupationOfParkingSpace(IocDateParam iocDateParam) {
+    public ReturnMsg getOccupationOfParkingSpace(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         list.add(new Cake("qitadanwei"));
         list.add(new Cake("beijingguihuayuan"));

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

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

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

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.Cake;
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.assets.AssetService;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
@@ -56,7 +56,7 @@ public class AssetServiceImpl implements AssetService {
     }
 
     @Override
-    public ReturnMsg getOperAssetCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getOperAssetCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -84,7 +84,7 @@ public class AssetServiceImpl implements AssetService {
     }
 
     @Override
-    public ReturnMsg getAssetAnalysis(IocDateParam iocDateParam) {
+    public ReturnMsg getAssetAnalysis(IocParam iocParam) {
         String[] param = {"investment1","investment2","investment3","investment4","rateReturn"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -92,7 +92,7 @@ public class AssetServiceImpl implements AssetService {
     }
 
     @Override
-    public ReturnMsg getAssetShareRanking(IocDateParam iocDateParam) {
+    public ReturnMsg getAssetShareRanking(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         list.add(new Cake("资产1"));
         list.add(new Cake("资产2"));
@@ -104,7 +104,7 @@ public class AssetServiceImpl implements AssetService {
     }
 
     @Override
-    public ReturnMsg getScrapAndMaintain(IocDateParam iocDateParam) {
+    public ReturnMsg getScrapAndMaintain(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         list.add(new Cake("bumen1"));
         list.add(new Cake("bumen2"));
@@ -141,7 +141,7 @@ public class AssetServiceImpl implements AssetService {
     }
 
     @Override
-    public ReturnMsg getAssetAge(IocDateParam iocDateParam) {
+    public ReturnMsg getAssetAge(IocParam iocParam) {
         String[] param = {"assetsName","rateReturn"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);

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

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

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

@@ -4,14 +4,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.Cake;
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.canteen.RestaurantService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
@@ -34,7 +33,7 @@ public class RestaurantServiceImpl implements RestaurantService {
      * @date 2023/2/10 11:25
      */
     @Override
-    public ReturnMsg getPaymentAnalysis(IocDateParam iocDateParam) {
+    public ReturnMsg getPaymentAnalysis(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         list.add(new Cake("Offline"));
         list.add(new Cake("scanningCode"));
@@ -48,7 +47,7 @@ public class RestaurantServiceImpl implements RestaurantService {
      * 查询智慧生活中智慧餐厅的核心指标
      */
     @Override
-    public ReturnMsg getCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
        /* ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -94,7 +93,7 @@ public class RestaurantServiceImpl implements RestaurantService {
      * 查询智慧生活中智慧餐厅的欢迎菜品
      */
     @Override
-    public ReturnMsg getWelcomeDishes(IocDateParam iocDateParam) {
+    public ReturnMsg getWelcomeDishes(IocParam iocParam) {
         return ReturnMsg.ok(FalseData.CUISINELIST);
     }
 
@@ -104,7 +103,7 @@ public class RestaurantServiceImpl implements RestaurantService {
      * 查询智慧生活中智慧餐厅的消费分析
      */
     @Override
-    public ReturnMsg getConsumptionAnalysis(IocDateParam iocDateParam) {
+    public ReturnMsg getConsumptionAnalysis(IocParam iocParam) {
         String[] param = {"breakfast","lunch","dinner","breakfastPrice","lunchPrice","dinnerPrice"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -124,7 +123,7 @@ public class RestaurantServiceImpl implements RestaurantService {
      * 查询智慧生活中智慧餐厅的盈利分析
      */
     @Override
-    public ReturnMsg getProfitAnalysis(IocDateParam iocDateParam) {
+    public ReturnMsg getProfitAnalysis(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         list.add(new Cake("breakfast"));
         list.add(new Cake("lunch"));
@@ -136,7 +135,7 @@ public class RestaurantServiceImpl implements RestaurantService {
      * 查询智慧生活中智慧餐厅的用餐分析
      */
     @Override
-    public ReturnMsg getMealAnalysis(IocDateParam iocDateParam) {
+    public ReturnMsg getMealAnalysis(IocParam iocParam) {
         String[] param = {"passengerFlow","eat","proportion"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.service.carbon;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
@@ -14,93 +14,93 @@ public interface CarbonService {
 
     ReturnMsg getCarbonQuota();
 
-    ReturnMsg  getPrintingCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg  getPrintingCoreIndicators(IocParam iocParam);
 
-    ReturnMsg  getPrintingCostTrend(IocDateParam iocDateParam);
+    ReturnMsg  getPrintingCostTrend(IocParam iocParam);
 
-    ReturnMsg  getConferenceRoomInfo(IocDateParam iocDateParam);
+    ReturnMsg  getConferenceRoomInfo(IocParam iocParam);
 
-    ReturnMsg  getBusCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg  getBusCoreIndicators(IocParam iocParam);
 
-    ReturnMsg  getBusInfo(IocDateParam iocDateParam);
+    ReturnMsg  getBusInfo(IocParam iocParam);
 
-    ReturnMsg  getBusCostTrend(IocDateParam iocDateParam);
+    ReturnMsg  getBusCostTrend(IocParam iocParam);
 
-    ReturnMsg getFloorCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg getFloorCoreIndicators(IocParam iocParam);
 
-    ReturnMsg  getCarbonInfo(IocDateParam iocDateParam);
+    ReturnMsg  getCarbonInfo(IocParam iocParam);
 
-    ReturnMsg  getCarbonQuotaComposition(IocDateParam iocDateParam);
+    ReturnMsg  getCarbonQuotaComposition(IocParam iocParam);
 
-    ReturnMsg  getCarbonNews(IocDateParam iocDateParam);
+    ReturnMsg  getCarbonNews(IocParam iocParam);
 
-    ReturnMsg  getCarbonProportion(IocDateParam iocDateParam);
+    ReturnMsg  getCarbonProportion(IocParam iocParam);
 
-    ReturnMsg  getVehicleCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg  getVehicleCoreIndicators(IocParam iocParam);
 
-    ReturnMsg  getVehicleInfo(IocDateParam iocDateParam);
+    ReturnMsg  getVehicleInfo(IocParam iocParam);
 
-    ReturnMsg  getVehicleInfoOrder(IocDateParam iocDateParam);
+    ReturnMsg  getVehicleInfoOrder(IocParam iocParam);
 
-    ReturnMsg  getPrintCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg  getPrintCoreIndicators(IocParam iocParam);
 
-    ReturnMsg  getPrintInfoOrder(IocDateParam iocDateParam);
+    ReturnMsg  getPrintInfoOrder(IocParam iocParam);
 
-    ReturnMsg  getPrintInfo(IocDateParam iocDateParam);
+    ReturnMsg  getPrintInfo(IocParam iocParam);
 
-    ReturnMsg  getPhotovoltaicInfoOrder(IocDateParam iocDateParam);
+    ReturnMsg  getPhotovoltaicInfoOrder(IocParam iocParam);
 
-    ReturnMsg  getPhotovoltaicInfo(IocDateParam iocDateParam);
+    ReturnMsg  getPhotovoltaicInfo(IocParam iocParam);
 
-    ReturnMsg  getPhotovoltaicCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg  getPhotovoltaicCoreIndicators(IocParam iocParam);
 
     ReturnMsg getPhotovoltaicPower();
 
-    ReturnMsg getAnalyseCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg getAnalyseCoreIndicators(IocParam iocParam);
 
-    ReturnMsg getAnalyseWaterCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg getAnalyseWaterCoreIndicators(IocParam iocParam);
 
-    ReturnMsg getAnalysePowerCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg getAnalysePowerCoreIndicators(IocParam iocParam);
 
-    ReturnMsg getAnalyseHotCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg getAnalyseHotCoreIndicators(IocParam iocParam);
 
-    ReturnMsg getAnalyseColdCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg getAnalyseColdCoreIndicators(IocParam iocParam);
 
-    ReturnMsg getAnalyseCpvCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg getAnalyseCpvCoreIndicators(IocParam iocParam);
 
     ReturnMsg getPhotovoltaicProfit();
 
-    ReturnMsg getEnergyTrendsAnalyseWater(IocDateParam iocDateParam);
+    ReturnMsg getEnergyTrendsAnalyseWater(IocParam iocParam);
 
-    ReturnMsg getEnergyTrendsAnalysePower(IocDateParam iocDateParam);
+    ReturnMsg getEnergyTrendsAnalysePower(IocParam iocParam);
 
-    ReturnMsg getEnergyTrendsAnalyseHot(IocDateParam iocDateParam);
+    ReturnMsg getEnergyTrendsAnalyseHot(IocParam iocParam);
 
-    ReturnMsg getEnergyTrendsAnalyseCold(IocDateParam iocDateParam);
+    ReturnMsg getEnergyTrendsAnalyseCold(IocParam iocParam);
 
-    ReturnMsg getEnergyTrendsAnalyseCpv(IocDateParam iocDateParam);
+    ReturnMsg getEnergyTrendsAnalyseCpv(IocParam iocParam);
 
-    ReturnMsg getEnergyTrendsTotal(IocDateParam iocDateParam);
+    ReturnMsg getEnergyTrendsTotal(IocParam iocParam);
 
-    ReturnMsg getEnergyTrendsAnalyseCpvInfo(IocDateParam iocDateParam);
+    ReturnMsg getEnergyTrendsAnalyseCpvInfo(IocParam iocParam);
 
-    ReturnMsg getEnergyAnalysisWater(IocDateParam iocDateParam);
+    ReturnMsg getEnergyAnalysisWater(IocParam iocParam);
 
-    ReturnMsg getEnergyAnalysisTotal(IocDateParam iocDateParam);
+    ReturnMsg getEnergyAnalysisTotal(IocParam iocParam);
 
-    ReturnMsg getEnergyAnalysisPower(IocDateParam iocDateParam);
+    ReturnMsg getEnergyAnalysisPower(IocParam iocParam);
 
-    ReturnMsg getEnergyAnalysisHot(IocDateParam iocDateParam);
+    ReturnMsg getEnergyAnalysisHot(IocParam iocParam);
 
-    ReturnMsg getEnergyAnalysisClod(IocDateParam iocDateParam);
+    ReturnMsg getEnergyAnalysisClod(IocParam iocParam);
 
-    ReturnMsg getEnergyAnalysisCpv(IocDateParam iocDateParam);
+    ReturnMsg getEnergyAnalysisCpv(IocParam iocParam);
 
-    ReturnMsg getEnergyAnalysisTotalInfo(IocDateParam iocDateParam);
+    ReturnMsg getEnergyAnalysisTotalInfo(IocParam iocParam);
 
-    ReturnMsg getEnergyAnalysisWaterInfo(IocDateParam iocDateParam);
+    ReturnMsg getEnergyAnalysisWaterInfo(IocParam iocParam);
 
-    ReturnMsg getEnergyAnalysisPowerInfo(IocDateParam iocDateParam);
+    ReturnMsg getEnergyAnalysisPowerInfo(IocParam iocParam);
 
-    ReturnMsg getEnergyAnalysisHotInfo(IocDateParam iocDateParam);
+    ReturnMsg getEnergyAnalysisHotInfo(IocParam iocParam);
 }

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

@@ -5,7 +5,7 @@ import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.Cake;
 import com.sky.ioc.entity.News;
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.carbon.CarbonService;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
@@ -45,7 +45,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getPrintingCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getPrintingCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         /*ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -84,7 +84,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getPrintingCostTrend(IocDateParam iocDateParam) {
+    public ReturnMsg getPrintingCostTrend(IocParam iocParam) {
         String[] param = {"cost"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -92,7 +92,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getConferenceRoomInfo(IocDateParam iocDateParam) {
+    public ReturnMsg getConferenceRoomInfo(IocParam iocParam) {
         String[] param = {"print","inkCartridge"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -100,7 +100,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getBusCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getBusCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
        /* ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -139,7 +139,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getBusInfo(IocDateParam iocDateParam) {
+    public ReturnMsg getBusInfo(IocParam iocParam) {
         String[] param = {"averageDuration","numberTrips"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -147,7 +147,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getBusCostTrend(IocDateParam iocDateParam) {
+    public ReturnMsg getBusCostTrend(IocParam iocParam) {
         String[] param = {"cost"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -155,7 +155,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getFloorCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getFloorCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -194,7 +194,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getCarbonInfo(IocDateParam iocDateParam) {
+    public ReturnMsg getCarbonInfo(IocParam iocParam) {
         String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -202,7 +202,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getCarbonQuotaComposition(IocDateParam iocDateParam) {
+    public ReturnMsg getCarbonQuotaComposition(IocParam iocParam) {
         String[] param = {"stock","consume"};
         String[] labKey = {"中旬","规划院","成分","上分","广分","郑分"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -210,7 +210,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getCarbonNews(IocDateParam iocDateParam) {
+    public ReturnMsg getCarbonNews(IocParam iocParam) {
         List<News> newsList = new ArrayList<>();
         newsList.add(new News());
         newsList.add(new News());
@@ -219,7 +219,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getCarbonProportion(IocDateParam iocDateParam) {
+    public ReturnMsg getCarbonProportion(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         list.add(new Cake("dieselOil"));
         list.add(new Cake("gasoline"));
@@ -230,7 +230,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getVehicleCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getVehicleCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -262,7 +262,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getVehicleInfo(IocDateParam iocDateParam) {
+    public ReturnMsg getVehicleInfo(IocParam iocParam) {
         String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -270,7 +270,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getVehicleInfoOrder(IocDateParam iocDateParam) {
+    public ReturnMsg getVehicleInfoOrder(IocParam iocParam) {
         String[] param = {"Vehicle"};
         String[] labKey = {"中旬","规划院","成分","上分","广分","郑分"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -278,7 +278,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getPrintCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getPrintCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -312,7 +312,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getPrintInfoOrder(IocDateParam iocDateParam) {
+    public ReturnMsg getPrintInfoOrder(IocParam iocParam) {
         String[] param = {"Print"};
         String[] labKey = {"中旬","规划院","成分","上分","广分","郑分"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -320,7 +320,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getPrintInfo(IocDateParam iocDateParam) {
+    public ReturnMsg getPrintInfo(IocParam iocParam) {
         String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -328,7 +328,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getPhotovoltaicInfoOrder(IocDateParam iocDateParam) {
+    public ReturnMsg getPhotovoltaicInfoOrder(IocParam iocParam) {
         String[] param = {"Photovoltaic"};
         String[] labKey = {"中旬","规划院","成分","上分","广分","郑分"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -336,7 +336,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getPhotovoltaicInfo(IocDateParam iocDateParam) {
+    public ReturnMsg getPhotovoltaicInfo(IocParam iocParam) {
         String[] param = {"zhongxun","guihuayuanBJ","zhengfen","guangfen","shangfen","chengfen"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -344,7 +344,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getPhotovoltaicCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getPhotovoltaicCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -382,7 +382,7 @@ public class CarbonServiceImpl implements CarbonService {
 
 
     @Override
-    public ReturnMsg getAnalyseCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getAnalyseCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -413,7 +413,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getAnalyseWaterCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getAnalyseWaterCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         objects.get(0).put("value",98);
@@ -433,7 +433,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getAnalysePowerCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getAnalysePowerCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         objects.get(0).put("value",98);
@@ -453,7 +453,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getAnalyseHotCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getAnalyseHotCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         objects.get(0).put("value",98);
@@ -473,7 +473,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getAnalyseColdCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getAnalyseColdCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         objects.get(0).put("value",98);
@@ -493,7 +493,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getAnalyseCpvCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getAnalyseCpvCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         objects.get(0).put("value",98);
@@ -521,7 +521,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsAnalyseWater(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyTrendsAnalyseWater(IocParam iocParam) {
         String[] param = {"tapWater","recycledWater"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -529,7 +529,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsAnalysePower(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyTrendsAnalysePower(IocParam iocParam) {
         String[] param = {"tip","seal","flat","valley"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -537,7 +537,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsAnalyseHot(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyTrendsAnalyseHot(IocParam iocParam) {
         String[] param = {"heatConsumption"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -545,7 +545,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsAnalyseCold(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyTrendsAnalyseCold(IocParam iocParam) {
         String[] param = {"refrigerationCapacity","energyConsumption"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -553,7 +553,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsAnalyseCpv(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyTrendsAnalyseCpv(IocParam iocParam) {
         String[] param = {"powerGeneration","outputPower"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -561,7 +561,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsTotal(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyTrendsTotal(IocParam iocParam) {
         String[] param = {"water","cpv","cold","hot","power"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -569,7 +569,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyTrendsAnalyseCpvInfo(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyTrendsAnalyseCpvInfo(IocParam iocParam) {
         String[] param = {"governmentSubsidies","save"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -577,7 +577,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyAnalysisWater(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyAnalysisWater(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         list.add(new Cake("office"));
         list.add(new Cake("computerRoom"));
@@ -588,7 +588,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyAnalysisTotal(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyAnalysisTotal(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         list.add(new Cake("power"));
         list.add(new Cake("hot"));
@@ -599,7 +599,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyAnalysisPower(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyAnalysisPower(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         list.add(new Cake("computerRoom"));
         list.add(new Cake("socket"));
@@ -610,7 +610,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyAnalysisHot(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyAnalysisHot(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         System.out.println(list);
         list.add(new Cake("computerRoom"));
@@ -622,7 +622,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyAnalysisClod(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyAnalysisClod(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         System.out.println(list);
         list.add(new Cake("function"));
@@ -635,7 +635,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyAnalysisCpv(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyAnalysisCpv(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         System.out.println(list);
         list.add(new Cake("function"));
@@ -647,7 +647,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyAnalysisTotalInfo(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyAnalysisTotalInfo(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         System.out.println(list);
         list.add(new Cake("monthlyEnergySaving"));
@@ -656,7 +656,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyAnalysisWaterInfo(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyAnalysisWaterInfo(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         System.out.println(list);
         list.add(new Cake("waterConsumptionTotal"));
@@ -665,7 +665,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyAnalysisPowerInfo(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyAnalysisPowerInfo(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         System.out.println(list);
         list.add(new Cake("powerConsumptionTotal"));
@@ -674,7 +674,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
 
     @Override
-    public ReturnMsg getEnergyAnalysisHotInfo(IocDateParam iocDateParam) {
+    public ReturnMsg getEnergyAnalysisHotInfo(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         System.out.println(list);
         list.add(new Cake("heatConsumptionTotal"));

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

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

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

@@ -4,17 +4,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Environment;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.fitness.HealthService;
 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.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * TODO 健康小屋
@@ -26,7 +24,7 @@ import java.util.concurrent.ThreadLocalRandom;
 @Service
 public class HealthServiceImpl implements HealthService {
     @Override
-    public ReturnMsg getCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
        /* ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -63,7 +61,7 @@ public class HealthServiceImpl implements HealthService {
     }
 
     @Override
-    public ReturnMsg getHutAnalysis(IocDateParam iocDateParam) {
+    public ReturnMsg getHutAnalysis(IocParam iocParam) {
         String[] param = {"warehousing","physicalExamination"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -71,7 +69,7 @@ public class HealthServiceImpl implements HealthService {
     }
 
     @Override
-    public ReturnMsg getEnvironmentalDetection(IocDateParam iocDateParam) {
+    public ReturnMsg getEnvironmentalDetection(IocParam iocParam) {
         List<Environment> arrayList = new ArrayList<>();
         arrayList.add(new Environment("pm","pm2.5","1"));
         arrayList.add(new Environment("pm","pm2.5","2"));

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.service.personnel;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
@@ -14,9 +14,9 @@ public interface PersonnelService {
 
     ReturnMsg getPersonnelInfoList();
 
-    ReturnMsg getSecurityCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg getSecurityCoreIndicators(IocParam iocParam);
 
-    ReturnMsg getPopulationPerson(IocDateParam iocDateParam);
+    ReturnMsg getPopulationPerson(IocParam iocParam);
 
-    ReturnMsg getPassengerFlow(IocDateParam iocDateParam);
+    ReturnMsg getPassengerFlow(IocParam iocParam);
 }

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

@@ -3,14 +3,13 @@ package com.sky.ioc.service.personnel.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.personnel.PersonnelService;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
 import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -71,7 +70,7 @@ public class PersonnelServiceImpl implements PersonnelService {
     }
 
     @Override
-    public ReturnMsg getSecurityCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getSecurityCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -106,7 +105,7 @@ public class PersonnelServiceImpl implements PersonnelService {
     }
 
     @Override
-    public ReturnMsg getPopulationPerson(IocDateParam iocDateParam) {
+    public ReturnMsg getPopulationPerson(IocParam iocParam) {
         String[] param = {"numberPeople"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -114,7 +113,7 @@ public class PersonnelServiceImpl implements PersonnelService {
     }
 
     @Override
-    public ReturnMsg getPassengerFlow(IocDateParam iocDateParam) {
+    public ReturnMsg getPassengerFlow(IocParam iocParam) {
         String[] param = {"Freelance","other"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.service.security;
 
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
@@ -11,15 +11,15 @@ import com.sky.ioc.tool.ReturnMsg;
  * @Date 2023/3/7 10:02
  **/
 public interface SecurityService {
-    ReturnMsg getLinkageCoreIndicators(IocDateParam iocDateParam);
+    ReturnMsg getLinkageCoreIndicators(IocParam iocParam);
 
-    ReturnMsg getAlarmTrend(IocDateParam iocDateParam);
+    ReturnMsg getAlarmTrend(IocParam iocParam);
 
-    ReturnMsg getAlarmClassification(IocDateParam iocDateParam);
+    ReturnMsg getAlarmClassification(IocParam iocParam);
 
-    ReturnMsg getEquipmentOnline(IocDateParam iocDateParam);
+    ReturnMsg getEquipmentOnline(IocParam iocParam);
 
-    ReturnMsg getFloorAlarmDistribution(IocDateParam iocDateParam);
+    ReturnMsg getFloorAlarmDistribution(IocParam iocParam);
 
-    ReturnMsg getGiveAlarmList(IocDateParam iocDateParam);
+    ReturnMsg getGiveAlarmList(IocParam iocParam);
 }

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

@@ -5,7 +5,7 @@ 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.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.security.SecurityService;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
@@ -28,7 +28,7 @@ import java.util.concurrent.ThreadLocalRandom;
 @Service
 public class SecurityServiceImpl implements SecurityService {
     @Override
-    public ReturnMsg getLinkageCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getLinkageCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -61,7 +61,7 @@ public class SecurityServiceImpl implements SecurityService {
     }
 
     @Override
-    public ReturnMsg getAlarmTrend(IocDateParam iocDateParam) {
+    public ReturnMsg getAlarmTrend(IocParam iocParam) {
         String[] param = {"commonly","important","urgent"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -69,7 +69,7 @@ public class SecurityServiceImpl implements SecurityService {
     }
 
     @Override
-    public ReturnMsg getAlarmClassification(IocDateParam iocDateParam) {
+    public ReturnMsg getAlarmClassification(IocParam iocParam) {
         String[] param = {"alarmNumber"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -77,7 +77,7 @@ public class SecurityServiceImpl implements SecurityService {
     }
 
     @Override
-    public ReturnMsg getEquipmentOnline(IocDateParam iocDateParam) {
+    public ReturnMsg getEquipmentOnline(IocParam iocParam) {
         String[] param = {"camera","waterImmersion"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -85,7 +85,7 @@ public class SecurityServiceImpl implements SecurityService {
     }
 
     @Override
-    public ReturnMsg getFloorAlarmDistribution(IocDateParam iocDateParam) {
+    public ReturnMsg getFloorAlarmDistribution(IocParam iocParam) {
         List<Cake> list = new ArrayList<>();
         list.add(new Cake("B2"));
         list.add(new Cake("B1"));
@@ -94,7 +94,7 @@ public class SecurityServiceImpl implements SecurityService {
     }
 
     @Override
-    public ReturnMsg getGiveAlarmList(IocDateParam iocDateParam) {
+    public ReturnMsg getGiveAlarmList(IocParam iocParam) {
         List<GiveAlarm> list = new ArrayList<>();
         list.add(new GiveAlarm());
         list.add(new GiveAlarm());

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

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

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

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.space.SpaceService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.GeneralMethod;
@@ -42,7 +42,7 @@ public class SpaceServiceImpl implements SpaceService {
     }
 
     @Override
-    public ReturnMsg getFloorCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getFloorCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
        /* ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -85,17 +85,17 @@ public class SpaceServiceImpl implements SpaceService {
     }
 
     @Override
-    public ReturnMsg getAccessPersonnel(IocDateParam iocDateParam) {
+    public ReturnMsg getAccessPersonnel(IocParam iocParam) {
         return ReturnMsg.ok(FalseData.ACCESSLIST);
     }
 
     @Override
-    public ReturnMsg getFloorList(IocDateParam iocDateParam) {
+    public ReturnMsg getFloorList(IocParam iocParam) {
         return null;
     }
 
     @Override
-    public ReturnMsg getMeetingCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getMeetingCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         /*ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -135,12 +135,12 @@ public class SpaceServiceImpl implements SpaceService {
 
 
     @Override
-    public ReturnMsg getConferenceRoomInfo(IocDateParam iocDateParam) {
+    public ReturnMsg getConferenceRoomInfo(IocParam iocParam) {
         return null;
     }
 
     @Override
-    public ReturnMsg getMeetingCostTrend(IocDateParam iocDateParam) {
+    public ReturnMsg getMeetingCostTrend(IocParam iocParam) {
         String[] param = {"shichang","bangong","chanpin","zhihui","yewu","qita"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -148,7 +148,7 @@ public class SpaceServiceImpl implements SpaceService {
     }
 
     @Override
-    public ReturnMsg getSpaceInfo(IocDateParam iocDateParam) {
+    public ReturnMsg getSpaceInfo(IocParam iocParam) {
         String[] param = {"administrativeArea","leisureArea"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -156,7 +156,7 @@ public class SpaceServiceImpl implements SpaceService {
     }
 
     @Override
-    public ReturnMsg getSpaceCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getSpaceCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         ThreadLocalRandom random = ThreadLocalRandom.current();

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

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

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

@@ -3,15 +3,13 @@ package com.sky.ioc.service.supermarket.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
-import com.sky.ioc.entity.params.IocDateParam;
+import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.supermarket.SupermarketService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
@@ -26,7 +24,7 @@ import java.util.concurrent.ThreadLocalRandom;
 @Service
 public class SupermarketServiceImpl implements SupermarketService {
     @Override
-    public ReturnMsg getCoreIndicators(IocDateParam iocDateParam) {
+    public ReturnMsg getCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
         /*ThreadLocalRandom random = ThreadLocalRandom.current();
@@ -72,7 +70,7 @@ public class SupermarketServiceImpl implements SupermarketService {
     }
 
     @Override
-    public ReturnMsg getQuotientAnalysiss(IocDateParam iocDateParam) {
+    public ReturnMsg getQuotientAnalysiss(IocParam iocParam) {
         String[] param = {"morningTotal","afternoonTotal","morningOrder","afternoonOrder","averageOrder"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
@@ -80,7 +78,7 @@ public class SupermarketServiceImpl implements SupermarketService {
     }
 
     @Override
-    public ReturnMsg getProductRanking(IocDateParam iocDateParam) {
+    public ReturnMsg getProductRanking(IocParam iocParam) {
         return ReturnMsg.ok(FalseData.SUPERMARKETLIST);
     }