楼层概览 楼栋信息数据

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

@@ -25,7 +25,7 @@ public class LoginAspect {
     @Autowired
     private RedisUtil redisUtil;
 
-    @Around("execution(* com.sky.ioc..*Controller.*(..))")
+   // @Around("execution(* com.sky.ioc..*Controller.*(..))")
     public Object aroundLog(ProceedingJoinPoint joinPoint) throws Throwable {
         ServletRequestAttributes sra = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = sra.getRequest();

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

@@ -1,9 +1,9 @@
 package com.sky.ioc.controller.life;
 
 import com.sky.ioc.entity.params.IocParam;
-import com.sky.ioc.service.Parking.IllegalParkingService;
-import com.sky.ioc.service.Parking.ParkService;
-import com.sky.ioc.service.Parking.ParkingService;
+import com.sky.ioc.service.parking.IllegalParkingService;
+import com.sky.ioc.service.parking.ParkService;
+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

@@ -2,6 +2,7 @@ package com.sky.ioc.controller.life;
 
 import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.service.canteen.RestaurantService;
+import com.sky.ioc.service.space.BuildingService;
 import com.sky.ioc.tool.ReturnMsg;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -85,10 +86,13 @@ public class RestaurantController {
         return restaurantService.getTodayMenu();
     }
 
+    @Autowired
+    BuildingService buildingService;
+
     @ApiOperation("查询智慧生活中订单")
     @PostMapping("getOrderData")
     public ReturnMsg  getOrderData(){
-        return restaurantService.getOrderData();
+        return buildingService.getBuildigData();
     }
 
 

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

@@ -9,7 +9,7 @@ public class Building {
     private String name;
 
     private String type;
-    private String buiildArea;
+    private String buildingArea;
     private String useableArea;
 
     private String enterTime;

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

@@ -32,4 +32,10 @@ public interface BuildingSpaceMapper extends BaseMapper<BuildingSpace> {
             "</if>"+
             " order by tier </script>")
     List<BuildingSpace> getListByTier(@Param("iocParam")IocParam iocParam);
+
+    @Select("<script>" +
+            "SELECT sum(meeting_area) as meetingArea,sum(work_area) as workArea,sum(other_area) as otherArea " +
+            " FROM building_space where 1=1 " +
+            " limit 1 </script>")
+    BuildingSpace getSumByTier();
 }

src/main/java/com/sky/ioc/mapper/space/BuildingFloorMapper.java

@@ -2,8 +2,16 @@ package com.sky.ioc.mapper.space;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sky.ioc.entity.domain.space.BuildingFloor;
+import com.sky.ioc.entity.domain.space.BuildingSpace;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface BuildingFloorMapper extends BaseMapper<BuildingFloor> {
+
+    @Select("<script>" +
+            "SELECT sum(meeting_area) as meetingArea,sum(work_area) as workArea,sum(other_area) as otherArea " +
+            " FROM building_space where is_del=0 " +
+            "</script>")
+    BuildingFloor getSumByTier();
 }

src/main/java/com/sky/ioc/mapper/space/BuildingMapper.java

@@ -0,0 +1,9 @@
+package com.sky.ioc.mapper.space;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sky.ioc.entity.domain.space.Building;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BuildingMapper extends BaseMapper<Building> {
+}

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

@@ -886,7 +886,7 @@ public class CarbonServiceImpl implements CarbonService {
 
     @Override
     public ReturnMsg getCarbonQuotaData() {
-        String url =   String.format(CARBON_QUOTA_URL,"http://"+dataIp)+"??pageNum=1&pageSize=1000";
+        String url =   String.format(CARBON_QUOTA_URL,"http://"+dataIp)+"?pageNum=1&pageSize=1000";
         Map<String,String> tokenMap = tokenMapper.getNewToken();
         String token ="Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjUwZTU1NTRkLWJjYzYtNGRhMS1iZDUxLWFhNTc3YzU4YTFiNCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.X10VPYJfeeRTka7OtqNPOGMpL4QkW3fR_TfCKXCmO-yXbIIrr_40fcwiVnpXfYVENo_BvXWEACRd-Y6nXsbkog";
         if(tokenMap!=null){
@@ -937,7 +937,7 @@ public class CarbonServiceImpl implements CarbonService {
     }
     @Override
     public ReturnMsg getCarbonNoticeData() {
-        String url =   String.format(CARBON_NOTICE_URL,"http://"+dataIp)+"??pageNum=1&pageSize=1000";
+        String url =   String.format(CARBON_NOTICE_URL,"http://"+dataIp)+"?pageNum=1&pageSize=1000";
         Map<String,String> tokenMap = tokenMapper.getNewToken();
         String token ="Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjUwZTU1NTRkLWJjYzYtNGRhMS1iZDUxLWFhNTc3YzU4YTFiNCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.X10VPYJfeeRTka7OtqNPOGMpL4QkW3fR_TfCKXCmO-yXbIIrr_40fcwiVnpXfYVENo_BvXWEACRd-Y6nXsbkog";
         if(tokenMap!=null){

src/main/java/com/sky/ioc/service/Parking/IllegalParkingService.java → src/main/java/com/sky/ioc/service/parking/IllegalParkingService.java

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

src/main/java/com/sky/ioc/service/Parking/ParkService.java → src/main/java/com/sky/ioc/service/parking/ParkService.java

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

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

@@ -1,4 +1,4 @@
-package com.sky.ioc.service.Parking;
+package com.sky.ioc.service.parking;
 
 import com.sky.ioc.entity.params.IocParam;
 import com.sky.ioc.tool.ReturnMsg;

src/main/java/com/sky/ioc/service/Parking/impl/IllegalParkingServiceImpl.java → src/main/java/com/sky/ioc/service/parking/impl/IllegalParkingServiceImpl.java

@@ -1,10 +1,9 @@
-package com.sky.ioc.service.Parking.impl;
+package com.sky.ioc.service.parking.impl;
 
 import com.sky.ioc.entity.domain.parking.IllegalParking;
-import com.sky.ioc.entity.domain.parking.Parking;
 import com.sky.ioc.mapper.IllegalParkingMapper;
 import com.sky.ioc.mapper.job.TokenMapper;
-import com.sky.ioc.service.Parking.IllegalParkingService;
+import com.sky.ioc.service.parking.IllegalParkingService;
 import com.sky.ioc.tool.ReturnMsg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +37,7 @@ public class IllegalParkingServiceImpl implements IllegalParkingService {
     final static  String ILLEGAL_PARKING_URL="%s/api/parking/PARKING/illegalParking/list";
     @Override
     public ReturnMsg getIllegalParkingData() {
-        String url =   String.format(ILLEGAL_PARKING_URL,"http://"+dataIp)+"??pageNum=1&pageSize=1000";
+        String url =   String.format(ILLEGAL_PARKING_URL,"http://"+dataIp)+"?pageNum=1&pageSize=1000";
         Map<String,String> tokenMap = tokenMapper.getNewToken();
         String token ="Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjUwZTU1NTRkLWJjYzYtNGRhMS1iZDUxLWFhNTc3YzU4YTFiNCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.X10VPYJfeeRTka7OtqNPOGMpL4QkW3fR_TfCKXCmO-yXbIIrr_40fcwiVnpXfYVENo_BvXWEACRd-Y6nXsbkog";
         if(tokenMap!=null){

src/main/java/com/sky/ioc/service/Parking/impl/ParkServiceImpl.java → src/main/java/com/sky/ioc/service/parking/impl/ParkServiceImpl.java

@@ -1,10 +1,9 @@
-package com.sky.ioc.service.Parking.impl;
+package com.sky.ioc.service.parking.impl;
 
 import com.sky.ioc.entity.domain.parking.Park;
-import com.sky.ioc.entity.domain.parking.Parking;
 import com.sky.ioc.mapper.ParkMapper;
 import com.sky.ioc.mapper.job.TokenMapper;
-import com.sky.ioc.service.Parking.ParkService;
+import com.sky.ioc.service.parking.ParkService;
 import com.sky.ioc.tool.ReturnMsg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +37,7 @@ public class ParkServiceImpl implements ParkService {
 
     @Override
     public ReturnMsg getParkData() {
-        String url =   String.format(PARK_URL,"http://"+dataIp)+"??pageNum=1&pageSize=1000";
+        String url =   String.format(PARK_URL,"http://"+dataIp)+"?pageNum=1&pageSize=1000";
         Map<String,String> tokenMap = tokenMapper.getNewToken();
         String token ="Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjUwZTU1NTRkLWJjYzYtNGRhMS1iZDUxLWFhNTc3YzU4YTFiNCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.X10VPYJfeeRTka7OtqNPOGMpL4QkW3fR_TfCKXCmO-yXbIIrr_40fcwiVnpXfYVENo_BvXWEACRd-Y6nXsbkog";
         if(tokenMap!=null){

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

@@ -1,11 +1,10 @@
-package com.sky.ioc.service.Parking.impl;
+package com.sky.ioc.service.parking.impl;
 
 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.Cake;
-import com.sky.ioc.entity.domain.carbon.CarbonQuota;
 import com.sky.ioc.entity.domain.parking.IllegalParking;
 import com.sky.ioc.entity.domain.parking.Park;
 import com.sky.ioc.entity.domain.parking.Parking;
@@ -15,10 +14,8 @@ import com.sky.ioc.mapper.IllegalParkingMapper;
 import com.sky.ioc.mapper.ParkMapper;
 import com.sky.ioc.mapper.ParkingMapper;
 import com.sky.ioc.mapper.job.TokenMapper;
-import com.sky.ioc.service.Parking.ParkingService;
+import com.sky.ioc.service.parking.ParkingService;
 import com.sky.ioc.tool.DateUtil;
-import com.sky.ioc.tool.FalseData;
-import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -196,7 +193,7 @@ public class ParkingServiceImpl implements ParkingService {
 
     @Override
     public ReturnMsg getParkingData() {
-        String url =   String.format(PARKING_URL,"http://"+dataIp)+"??pageNum=1&pageSize=1000";
+        String url =   String.format(PARKING_URL,"http://"+dataIp)+"?pageNum=1&pageSize=1000";
         Map<String,String> tokenMap = tokenMapper.getNewToken();
         String token ="Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjUwZTU1NTRkLWJjYzYtNGRhMS1iZDUxLWFhNTc3YzU4YTFiNCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.X10VPYJfeeRTka7OtqNPOGMpL4QkW3fR_TfCKXCmO-yXbIIrr_40fcwiVnpXfYVENo_BvXWEACRd-Y6nXsbkog";
         if(tokenMap!=null){

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

@@ -37,7 +37,7 @@ public class SecurityDoorRecordServiceImpl implements SecurityDoorRecordService
     final static  String SECURITY_DOOR_RECORD_URL="%s/api/safety/Hikvision/record/list";
     @Override
     public ReturnMsg getSecurityDoorRecordData() {
-        String url =   String.format(SECURITY_DOOR_RECORD_URL,"http://"+dataIp)+"??pageNum=1&pageSize=1000";
+        String url =   String.format(SECURITY_DOOR_RECORD_URL,"http://"+dataIp)+"?pageNum=1&pageSize=1000";
         Map<String,String> tokenMap = tokenMapper.getNewToken();
         String token ="Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjUwZTU1NTRkLWJjYzYtNGRhMS1iZDUxLWFhNTc3YzU4YTFiNCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.X10VPYJfeeRTka7OtqNPOGMpL4QkW3fR_TfCKXCmO-yXbIIrr_40fcwiVnpXfYVENo_BvXWEACRd-Y6nXsbkog";
         if(tokenMap!=null){

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

@@ -37,7 +37,7 @@ public class SecurityDoorServiceImpl implements SecurityDoorService {
     final static  String SECURITY_DOOR_URL="%s/api/safety/Hikvision/door/list";
     @Override
     public ReturnMsg getSecurityDoorData() {
-        String url =   String.format(SECURITY_DOOR_URL,"http://"+dataIp)+"??pageNum=1&pageSize=1000";
+        String url =   String.format(SECURITY_DOOR_URL,"http://"+dataIp)+"?pageNum=1&pageSize=1000";
         Map<String,String> tokenMap = tokenMapper.getNewToken();
         String token ="Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjUwZTU1NTRkLWJjYzYtNGRhMS1iZDUxLWFhNTc3YzU4YTFiNCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.X10VPYJfeeRTka7OtqNPOGMpL4QkW3fR_TfCKXCmO-yXbIIrr_40fcwiVnpXfYVENo_BvXWEACRd-Y6nXsbkog";
         if(tokenMap!=null){

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

@@ -0,0 +1,8 @@
+package com.sky.ioc.service.space;
+
+import com.sky.ioc.tool.ReturnMsg;
+
+public interface BuildingService {
+
+    ReturnMsg getBuildigData();
+}

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

@@ -0,0 +1,95 @@
+package com.sky.ioc.service.space.impl;
+
+import com.sky.ioc.entity.domain.carbon.CarbonQuota;
+import com.sky.ioc.entity.domain.space.Building;
+import com.sky.ioc.mapper.CuisineMapper;
+import com.sky.ioc.mapper.CuisineOderItemMapper;
+import com.sky.ioc.mapper.job.TokenMapper;
+import com.sky.ioc.mapper.space.BuildingMapper;
+import com.sky.ioc.service.space.BuildingService;
+import com.sky.ioc.tool.ReturnMsg;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.ThreadLocalRandom;
+
+@Service
+@Slf4j
+public class BuildingServiceImpl implements BuildingService {
+
+    @Autowired
+    TokenMapper tokenMapper;
+
+    @Value("${sky.dataIp}")
+    private String dataIp;
+
+    @Autowired
+    BuildingMapper buildingMapper;
+
+    final static  String BUILDING_URL="%s/api/space/SPACE/buildingArea/list";
+
+    @Override
+    public ReturnMsg getBuildigData() {
+        String url =   String.format(BUILDING_URL,"http://"+dataIp)+"?pageNum=1&pageSize=1000";
+        Map<String,String> tokenMap = tokenMapper.getNewToken();
+        String token ="Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjUwZTU1NTRkLWJjYzYtNGRhMS1iZDUxLWFhNTc3YzU4YTFiNCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.X10VPYJfeeRTka7OtqNPOGMpL4QkW3fR_TfCKXCmO-yXbIIrr_40fcwiVnpXfYVENo_BvXWEACRd-Y6nXsbkog";
+        if(tokenMap!=null){
+            token = "Bearer "+tokenMap.get("token");
+        }
+        // 创建一个请求头对象
+        HttpHeaders httpHeaders = new HttpHeaders();
+        // 设置参数
+        httpHeaders.set("authorization", token);
+        // 创建一个响应体对象
+        HttpEntity<String> httpEntity = new HttpEntity(httpHeaders);
+        // 3.创建RestTemplate
+        RestTemplate restTemplate = new RestTemplate();
+        // 发送GET请求
+        ResponseEntity<Map> responseEntity = restTemplate.exchange(url, HttpMethod.GET, httpEntity, Map.class);
+        // 获取响应对象里的 body 对象
+        Map<String, Object> body = responseEntity.getBody();
+        // 获取状态码
+        Integer code = (Integer)body.get("code");
+        // 获取响应信息
+        String message = (String)body.get("msg");
+        if(code==200){
+            ThreadLocalRandom random = ThreadLocalRandom.current();
+            ArrayList list = (ArrayList) body.get("rows");
+            if(list!=null&&list.size()>0){
+                buildingMapper.delete(null);
+                for (int i=0;i<list.size();i++){
+                    LinkedHashMap json = (LinkedHashMap) list.get(i);
+                    Building building = new Building();
+                    building.setId((Integer) json.get("id"));
+                    building.setType(String.valueOf(json.get("buildingType")));
+                    building.setName(String.valueOf(json.get("name")));
+                    if(json.get("buildingArea")!=null){
+                        building.setBuildingArea(String.valueOf(json.get("buildingArea")));
+                    }
+                    if(json.get("usableArea")!=null){
+                        building.setUseableArea(String.valueOf(json.get("usableArea")));
+                    }
+                    if(json.get("enterTime")!=null){
+                        building.setEnterTime(String.valueOf(json.get("enterTime")));
+                    }
+                    buildingMapper.insert(building);
+                }
+            }
+            return ReturnMsg.ok();
+
+        }else{
+            log.info("获取碳配额数据："+message);
+            return  ReturnMsg.fail(message);
+        }
+    }
+}

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

@@ -82,19 +82,34 @@ public class SpaceServiceImpl implements SpaceService {
     public ReturnMsg getFloorCoreIndicators(IocParam iocParam) {
         Indeicator indeicator = new Indeicator();
         List<JSONObject> objects = indeicator.getList();
-        BuildingSpace buildingSpace = buildingSpaceMapper.getByTier(iocParam);
-        String floorCode = iocParam.getFloorId()+"F";
-        if(iocParam.getFloorId()<0){
-            floorCode = "B"+Math.abs(iocParam.getFloorId());
+        BuildingSpace buildingSpace = null;
+        String floorCode = "";
+        BuildingFloor floor = null;
+        if(iocParam.getFloorId()==null){
+            buildingSpace = buildingSpaceMapper.getSumByTier();
+        }else{
+            buildingSpace = buildingSpaceMapper.getByTier(iocParam);
+            floorCode = iocParam.getFloorId()+"F";
+            if(iocParam.getFloorId()<0){
+                floorCode = "B"+Math.abs(iocParam.getFloorId());
+            }
+            floor = buildingFloorMapper.selectOne(new LambdaQueryWrapper<BuildingFloor>().eq(BuildingFloor::getCode,floorCode));
         }
-        BuildingFloor floor = buildingFloorMapper.selectOne(new LambdaQueryWrapper<BuildingFloor>().eq(BuildingFloor::getCode,floorCode));
         Integer result =0;
         Long totalStation = 0l;
+        List<BuildingRoom> rooms = null;
         if(floor!=null){
-            List<BuildingRoom> rooms = buildingRoomMapper.selectList(new LambdaQueryWrapper<BuildingRoom>().eq(BuildingRoom::getFloorId,floor.getId()));
+            rooms = buildingRoomMapper.selectList(new LambdaQueryWrapper<BuildingRoom>().eq(BuildingRoom::getFloorId,floor.getId()));
+        }else{
+            if(iocParam.getFloorId()==null){
+                rooms = buildingRoomMapper.selectList(null);
+            }
+        }
+        if(rooms!=null){
             List<Integer> ids = rooms.stream().map(BuildingRoom::getId).collect(Collectors.toList());
             totalStation = buildingStationMapper.selectCount(new LambdaQueryWrapper<BuildingStation>().in(BuildingStation::getRoomId,ids));
-            Long usedStation = buildingStationMapper.selectCount(new LambdaQueryWrapper<BuildingStation>().in(BuildingStation::getRoomId,ids).eq(BuildingStation::getStatus,2));
+            Long usedStation = buildingStationMapper.selectCount(new LambdaQueryWrapper<BuildingStation>().in(BuildingStation::getRoomId,ids)
+                    .eq(BuildingStation::getStatus,2));
             // 创建一个数值格式化对象
             NumberFormat numberFormat = NumberFormat.getInstance();
             // 设置精确到小数点后2位
@@ -102,7 +117,6 @@ public class SpaceServiceImpl implements SpaceService {
             if (totalStation>0) {
                 result = Integer.parseInt(numberFormat.format((float) usedStation / (float) totalStation * 100));
             }
-
         }
         if (buildingSpace != null) {
             objects.get(0).put("value",result);
@@ -110,18 +124,14 @@ public class SpaceServiceImpl implements SpaceService {
             objects.get(2).put("value", buildingSpace.getWorkArea());
             objects.get(3).put("value", buildingSpace.getMeetingArea());
             objects.add(new JSONObject());
-            objects.add(new JSONObject());
-            objects.get(4).put("value", buildingSpace.getLeadArea());
-            objects.get(5).put("value", buildingSpace.getOtherArea());
+            objects.get(4).put("value", buildingSpace.getOtherArea());
         } else {
             objects.get(0).put("value", result);
             objects.get(1).put("value", totalStation);
             objects.get(2).put("value", 0);
             objects.get(3).put("value", 0);
             objects.add(new JSONObject());
-            objects.add(new JSONObject());
             objects.get(4).put("value", 0);
-            objects.get(5).put("value", 0);
         }
 
         indeicator.setList(objects);

src/main/java/com/sky/ioc/service/system/impl/UserServiceImpl.java

@@ -159,7 +159,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public ReturnMsg getUserData() {
-        String url =   String.format(USER_URL,"http://"+dataIp)+"??pageNum=1&pageSize=1000";
+        String url =   String.format(USER_URL,"http://"+dataIp)+"?pageNum=1&pageSize=1000";
         Map<String,String> tokenMap = tokenMapper.getNewToken();
         String token ="Bearer eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjUwZTU1NTRkLWJjYzYtNGRhMS1iZDUxLWFhNTc3YzU4YTFiNCIsInVzZXJuYW1lIjoiYWRtaW4ifQ.X10VPYJfeeRTka7OtqNPOGMpL4QkW3fR_TfCKXCmO-yXbIIrr_40fcwiVnpXfYVENo_BvXWEACRd-Y6nXsbkog";
         if(tokenMap!=null){