修改整体架构

src/main/java/com/sky/ioc/api/ApiController.java

@@ -1,28 +0,0 @@
-package com.sky.ioc.api;
-
-
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * @author LunCe
- */
-@RestController
-@RequestMapping("web")
-public class ApiController {
-
-
-
-    @PostMapping("test")
-    public String test(@RequestBody Map<String ,Object> map){
-        Integer  aa = null;
-        System.out.println(aa+23);
-        return null;
-    }
-
-
-}

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

@@ -1,6 +1,7 @@
 package com.sky.ioc.controller.dashboard;
 
-import com.sky.ioc.service.dashboard.SmartSignageService;
+import com.sky.ioc.service.carbon.CarbonService;
+import com.sky.ioc.service.space.SpaceService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -15,8 +16,13 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/dashboard")
 public class DashboardController {
 
+
+    @Autowired
+    private SpaceService spaceService;
+
+
     @Autowired
-    private SmartSignageService smartSignageService;
+    private CarbonService carbonService;
 
 
     /**
@@ -27,7 +33,7 @@ public class DashboardController {
     @ApiOperation("智能看板-楼宇态势")
     @GetMapping("getBuildingSituation")
     public ReturnMsg getBuildingSituation(){
-        return smartSignageService.getBuildingSituation();
+        return spaceService.getBuildingSituation();
     }
 
 
@@ -39,6 +45,6 @@ public class DashboardController {
     @ApiOperation("智能看板-碳配额")
     @GetMapping("getCarbonQuota")
     public ReturnMsg getCarbonQuota(){
-        return smartSignageService.getCarbonQuota();
+        return carbonService.getCarbonQuota();
     }
 }

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.dashboard;
 
-import com.sky.ioc.service.dashboard.PersonnelService;
+import com.sky.ioc.service.personnel.PersonnelService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.life;
 
-import com.sky.ioc.service.life.HealthService;
+import com.sky.ioc.service.fitness.HealthService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -11,6 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 
+/**
+ * @author LunCe
+ */
 @Api("健康小屋")
 @Slf4j
 @RestController

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.life;
 
-import com.sky.ioc.service.life.ParkingService;
+import com.sky.ioc.service.Parking.ParkingService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.life;
 
-import com.sky.ioc.service.life.RestaurantService;
+import com.sky.ioc.service.canteen.RestaurantService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,6 +1,6 @@
 package com.sky.ioc.controller.life;
 
-import com.sky.ioc.service.life.SupermarketService;
+import com.sky.ioc.service.supermarket.SupermarketService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,10 +1,9 @@
-package com.sky.ioc.service.life;
+package com.sky.ioc.service.Parking;
 
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
- * TODO
- *
+ * TODO  智慧停车
  * @Description
  * @Author LunCe
  * @Date 2023/2/10 13:44

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

@@ -1,13 +1,12 @@
-package com.sky.ioc.service.life.impl;
+package com.sky.ioc.service.Parking.impl;
 
-import com.sky.ioc.service.life.ParkingService;
+import com.sky.ioc.service.Parking.ParkingService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
 /**
- * TODO
- *
+ * TODO 智慧停车
  * @Description
  * @Author LunCe
  * @Date 2023/2/10 13:45

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

@@ -1,9 +1,12 @@
-package com.sky.ioc.service.life;
+package com.sky.ioc.service.canteen;
 
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
- * @author LunCe
+ * TODO 餐厅
+ * @Description
+ * @Author LunCe
+ * @date 2023/2/22 11:29
  */
 public interface RestaurantService {
     ReturnMsg getPaymentAnalysis(Integer dateType);

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

@@ -1,6 +1,6 @@
-package com.sky.ioc.service.life.impl;
+package com.sky.ioc.service.canteen.impl;
 
-import com.sky.ioc.service.life.RestaurantService;
+import com.sky.ioc.service.canteen.RestaurantService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;

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

@@ -0,0 +1,16 @@
+package com.sky.ioc.service.carbon;
+
+import com.sky.ioc.tool.ReturnMsg;
+
+/**
+ * TODO 双碳
+ * @Description
+ * @Author LunCe
+ * @Date 2023/2/22 11:40
+ **/
+public interface CarbonService {
+
+
+    ReturnMsg getCarbonQuota();
+
+}

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

@@ -0,0 +1,56 @@
+package com.sky.ioc.service.carbon.impl;
+
+import com.sky.ioc.service.carbon.CarbonService;
+import com.sky.ioc.tool.ReturnMsg;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TODO  双碳
+ * @Description
+ * @Author LunCe
+ * @Date 2023/2/22 11:40
+ **/
+
+@Service
+public class CarbonServiceImpl implements CarbonService {
+
+
+
+
+    /**
+     * TODO  智能看板 --碳配额
+     * @Description
+     * @Return com.sky.ioc.tool.ReturnMsg
+     * @Author LunCe
+     * @date 2023/2/22 11:41
+     */
+    @Override
+    public ReturnMsg getCarbonQuota() {
+        List<Map<String,Object>> listMap = new ArrayList<>();
+        listMap.get(0).put("info","上分");
+        listMap.get(0).put("consumed",500);
+        listMap.get(0).put("carbonQuota",100);
+
+        listMap.get(1).put("info","广分");
+        listMap.get(1).put("consumed",500);
+        listMap.get(1).put("carbonQuota",200);
+
+
+        listMap.get(2).put("info","郑分");
+        listMap.get(2).put("consumed",500);
+        listMap.get(2).put("carbonQuota",402);
+
+        listMap.get(3).put("info","规划院");
+        listMap.get(3).put("consumed",500);
+        listMap.get(3).put("carbonQuota",520);
+
+        listMap.get(4).put("info","总部");
+        listMap.get(4).put("consumed",500);
+        listMap.get(4).put("carbonQuota",520);
+        return ReturnMsg.ok(listMap);
+    }
+}

src/main/java/com/sky/ioc/service/dashboard/SmartSignageService.java

@@ -1,12 +0,0 @@
-package com.sky.ioc.service.dashboard;
-
-import com.sky.ioc.tool.ReturnMsg;
-
-/**
- * @author LunCe
- */
-public interface SmartSignageService {
-    ReturnMsg getBuildingSituation();
-
-    ReturnMsg getCarbonQuota();
-}

src/main/java/com/sky/ioc/service/dashboard/impl/SmartSignageServiceImpl.java

@@ -1,73 +0,0 @@
-package com.sky.ioc.service.dashboard.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.sky.ioc.service.dashboard.SmartSignageService;
-import com.sky.ioc.tool.ReturnMsg;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author LunCe
- * 智能看板
- */
-
-@Service
-public class SmartSignageServiceImpl implements SmartSignageService {
-    @Override
-    public ReturnMsg getBuildingSituation() {
-        JSONArray jsonArray = new JSONArray();
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("total",2000);
-        jsonObject.put("occupancy",1800);
-        jsonObject.put("percentage","95%");
-
-        JSONObject jsonObject2 = new JSONObject();
-        jsonObject2.put("total",2000);
-        jsonObject2.put("occupancy",1800);
-        jsonObject2.put("percentage","97%");
-
-        JSONObject jsonObject3 = new JSONObject();
-        jsonObject3.put("total",2000);
-        jsonObject3.put("occupancy",1800);
-        jsonObject3.put("percentage","98%");
-        jsonArray.add(jsonObject);
-        jsonArray.add(jsonObject2);
-        jsonArray.add(jsonObject3);
-
-
-        JSONObject jsonObject1 = new JSONObject();
-        jsonObject1.put("data",jsonArray);
-        jsonObject1.put("totalArea","15000㎡");
-        return ReturnMsg.ok(jsonObject1);
-    }
-
-    @Override
-    public ReturnMsg getCarbonQuota() {
-        List<Map<String,Object>> listMap = new ArrayList<>();
-        listMap.get(0).put("info","上分");
-        listMap.get(0).put("consumed",500);
-        listMap.get(0).put("carbonQuota",100);
-
-        listMap.get(1).put("info","广分");
-        listMap.get(1).put("consumed",500);
-        listMap.get(1).put("carbonQuota",200);
-
-
-        listMap.get(2).put("info","郑分");
-        listMap.get(2).put("consumed",500);
-        listMap.get(2).put("carbonQuota",402);
-
-        listMap.get(3).put("info","规划院");
-        listMap.get(3).put("consumed",500);
-        listMap.get(3).put("carbonQuota",520);
-
-        listMap.get(4).put("info","总部");
-        listMap.get(4).put("consumed",500);
-        listMap.get(4).put("carbonQuota",520);
-        return ReturnMsg.ok(listMap);
-    }
-}

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

@@ -1,10 +1,9 @@
-package com.sky.ioc.service.life;
+package com.sky.ioc.service.fitness;
 
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
- * TODO
- *
+ * TODO 健康小屋
  * @Description
  * @Author LunCe
  * @Date 2023/2/10 17:35

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

@@ -1,13 +1,12 @@
-package com.sky.ioc.service.life.impl;
+package com.sky.ioc.service.fitness.impl;
 
-import com.sky.ioc.service.life.HealthService;
+import com.sky.ioc.service.fitness.HealthService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
 /**
- * TODO
- *
+ * TODO 健康小屋
  * @Description
  * @Author LunCe
  * @Date 2023/2/10 17:35

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

@@ -1,4 +1,4 @@
-package com.sky.ioc.service.dashboard;
+package com.sky.ioc.service.personnel;
 
 import com.sky.ioc.tool.ReturnMsg;
 

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

@@ -1,7 +1,7 @@
-package com.sky.ioc.service.dashboard.impl;
+package com.sky.ioc.service.personnel.impl;
 
 import com.sky.ioc.entity.result.dashboard.Personnel;
-import com.sky.ioc.service.dashboard.PersonnelService;
+import com.sky.ioc.service.personnel.PersonnelService;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 

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

@@ -0,0 +1,14 @@
+package com.sky.ioc.service.space;
+
+import com.sky.ioc.tool.ReturnMsg;
+
+/**
+ * TODO 空间
+ * @Description
+ * @Author LunCe
+ * @Date 2023/2/22 11:43
+ **/
+public interface SpaceService {
+
+    ReturnMsg getBuildingSituation();
+}

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

@@ -0,0 +1,52 @@
+package com.sky.ioc.service.space.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.sky.ioc.service.space.SpaceService;
+import com.sky.ioc.tool.ReturnMsg;
+import org.springframework.stereotype.Service;
+
+/**
+ * TODO  空间
+ * @Description
+ * @Author LunCe
+ * @Date 2023/2/22 11:44
+ **/
+@Service
+public class SpaceServiceImpl implements SpaceService {
+
+    /**
+     * TODO  智能看板 -- 楼宇态势
+     * @Description
+     * @Return com.sky.ioc.tool.ReturnMsg
+     * @Author LunCe
+     * @date 2023/2/22 11:45
+     */
+    @Override
+    public ReturnMsg getBuildingSituation() {
+        JSONArray jsonArray = new JSONArray();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("total",2000);
+        jsonObject.put("occupancy",1800);
+        jsonObject.put("percentage","95%");
+
+        JSONObject jsonObject2 = new JSONObject();
+        jsonObject2.put("total",2000);
+        jsonObject2.put("occupancy",1800);
+        jsonObject2.put("percentage","97%");
+
+        JSONObject jsonObject3 = new JSONObject();
+        jsonObject3.put("total",2000);
+        jsonObject3.put("occupancy",1800);
+        jsonObject3.put("percentage","98%");
+        jsonArray.add(jsonObject);
+        jsonArray.add(jsonObject2);
+        jsonArray.add(jsonObject3);
+
+
+        JSONObject jsonObject1 = new JSONObject();
+        jsonObject1.put("data",jsonArray);
+        jsonObject1.put("totalArea","15000㎡");
+        return ReturnMsg.ok(jsonObject1);
+    }
+}

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

@@ -1,10 +1,9 @@
-package com.sky.ioc.service.life;
+package com.sky.ioc.service.supermarket;
 
 import com.sky.ioc.tool.ReturnMsg;
 
 /**
- * TODO
- *
+ * TODO  无人超市
  * @Description
  * @Author LunCe
  * @Date 2023/2/10 14:19

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

@@ -1,6 +1,6 @@
-package com.sky.ioc.service.life.impl;
+package com.sky.ioc.service.supermarket.impl;
 
-import com.sky.ioc.service.life.SupermarketService;
+import com.sky.ioc.service.supermarket.SupermarketService;
 import com.sky.ioc.tool.FalseData;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;