智慧办公--楼层概览数据接口

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

@@ -29,8 +29,8 @@ public class FloorController {
 
     @ApiOperation("核心指标")
     @PostMapping("/getFloorCoreIndicators")
-    public ReturnMsg getFloorCoreIndicators(@RequestParam(value = "tier", required=false,defaultValue = "")  String tier){
-        return spaceService.getFloorCoreIndicators(tier);
+    public ReturnMsg getFloorCoreIndicators(@RequestBody IocParam iocParam){
+        return spaceService.getFloorCoreIndicators(iocParam);
     }
 
 

src/main/java/com/sky/ioc/entity/domain/space/AccessSpace.java

@@ -22,7 +22,7 @@ public class AccessSpace {
     /**单位名称*/
     private String company;
     /**楼层*/
-    private String tier;
+    private Integer tier;
     /**部门Id*/
     private String departmentId;
     /**部门名称*/

src/main/java/com/sky/ioc/entity/domain/space/BuildingSpace.java

@@ -29,7 +29,7 @@ public class BuildingSpace {
     private Integer usedStation;
 
     /**楼层*/
-    private String  tier;
+    private Integer  tier;
 
     /**工位总数*/
     private Integer stationCount;

src/main/java/com/sky/ioc/mapper/AccessSpaceMapper.java

@@ -1,7 +1,24 @@
 package com.sky.ioc.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sky.ioc.entity.domain.space.AccessSpace;
+import com.sky.ioc.entity.domain.space.BuildingSpace;
+import com.sky.ioc.entity.params.IocParam;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
-public interface AccessSpaceMapper {
+public interface AccessSpaceMapper extends BaseMapper<AccessSpace> {
+    @Select("<script>" +
+            "SELECT name,company, end_date as endDate" +
+            " FROM access_space where 1=1 " +
+            "<if test='iocParam!=null  and iocParam.floorId != null  '>" +
+            " and tier=#{iocParam.floorId} " +
+            "</if>"+
+            "</script>")
+    List<AccessSpace> getByTier(@Param("iocParam") IocParam iocParam);
+
 }

src/main/java/com/sky/ioc/mapper/BuildingSpaceMapper.java

@@ -13,9 +13,9 @@ public interface BuildingSpaceMapper extends BaseMapper<BuildingSpace> {
     @Select("<script>" +
             "SELECT used_station as usedStation,lead_area as leadArea,meeting_area as meetingArea," +
             "work_area as workArea,print_area as printArea,other_area as otherArea,station_count as stationCount FROM building_space where 1=1 " +
-            "<if test='tier!=null  '>" +
-            " and tier=#{tier} " +
+            "<if test='iocParam!=null and iocParam.floorId != null  '>" +
+            " and tier=#{iocParam.floorId} " +
             "</if>"+
             "</script>")
-    BuildingSpace getByTier(@Param("tier")String tier);
+    BuildingSpace getByTier(@Param("iocParam")IocParam iocParam);
 }

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

@@ -2,6 +2,7 @@ package com.sky.ioc.service.space;
 
 import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.tool.ReturnMsg;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * TODO 空间
@@ -13,7 +14,7 @@ public interface SpaceService {
 
     ReturnMsg getBuildingSituation();
 
-    ReturnMsg getFloorCoreIndicators(String tier);
+    ReturnMsg getFloorCoreIndicators(IocParam iocParam);
 
     ReturnMsg getAccessPersonnel(IocParam iocParam);
 

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

@@ -2,10 +2,14 @@ package com.sky.ioc.service.space.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.sky.ioc.entity.Indeicator;
 import com.sky.ioc.entity.Label;
+import com.sky.ioc.entity.domain.space.AccessSpace;
 import com.sky.ioc.entity.domain.space.BuildingSpace;
+import com.sky.ioc.entity.domain.system.Users;
 import com.sky.ioc.entity.params.IocParam;
+import com.sky.ioc.mapper.AccessSpaceMapper;
 import com.sky.ioc.mapper.BuildingSpaceMapper;
 import com.sky.ioc.service.space.SpaceService;
 import com.sky.ioc.tool.FalseData;
@@ -30,6 +34,9 @@ public class SpaceServiceImpl implements SpaceService {
     @Autowired
     BuildingSpaceMapper buildingSpaceMapper;
 
+    @Autowired
+    AccessSpaceMapper accessSpaceMapper;
+
     /**
      * TODO  智能看板 -- 楼宇态势
      * @Description
@@ -48,10 +55,10 @@ public class SpaceServiceImpl implements SpaceService {
     }
 
     @Override
-    public ReturnMsg getFloorCoreIndicators(String tier) {
+    public ReturnMsg getFloorCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
-        BuildingSpace buildingSpace = buildingSpaceMapper.getByTier(tier);
+        BuildingSpace buildingSpace = buildingSpaceMapper.getByTier(iocParam);
         if(buildingSpace!=null){
             objects.get(0).put("value",buildingSpace.getUsedStation());
             objects.get(1).put("value",buildingSpace.getStationCount());
@@ -78,8 +85,8 @@ public class SpaceServiceImpl implements SpaceService {
 
     @Override
     public ReturnMsg getAccessPersonnel(IocParam iocParam) {
-
-        return ReturnMsg.ok(FalseData.ACCESSLIST);
+        List<AccessSpace> list = accessSpaceMapper.getByTier(iocParam);
+        return ReturnMsg.ok(list);
     }
 
     @Override