通过小区查找整个小区的房号

yezhu-api/src/main/java/com/kioor/room/controller/ApiRoomController.java

@@ -81,11 +81,11 @@ public class ApiRoomController {
         List<AllRoomDTO> list = buildingService.listByHousingEstateId(Long.parseLong(String.valueOf(params.get("housingEstateId"))));
         //级联依次查询单元、楼层、房号
         for(AllRoomDTO building : list){
-            building.setChildren(unitService.listByBuildingId(building.getId()));
+            building.setChildren(unitService.listByBuildingId(building.getValue()));
             for(AllRoomDTO unit : building.getChildren()){
-                unit.setChildren(floorService.listByUnitId(unit.getId()));
+                unit.setChildren(floorService.listByUnitId(unit.getValue()));
                 for(AllRoomDTO floor : unit.getChildren()){
-                    floor.setChildren(roomService.listByFloorId(floor.getId()));
+                    floor.setChildren(roomService.listByFloorId(floor.getValue()));
                 }
             }
         }
@@ -107,17 +107,17 @@ public class ApiRoomController {
             }
         }
 
-        //同楼上的房间，设置数量和floorList相同的属性全为空的list
+        //楼上的房间，设置数量和floorList相同的属性全为空的list
         List<RoomDetailDTO> upList = new ArrayList<>();
-        //同楼下的房间
+        //楼下的房间
         List<RoomDetailDTO> downList = new ArrayList<>();
 
         for(RoomDetailDTO room :floorList){
             if(room.getSelfFlag() == 1){
                 RoomDetailDTO upDto = roomService.roomUp(userId);
-                upList.add(upDto);
+                upList.add(upDto == null ? new RoomDetailDTO() : upDto);
                 RoomDetailDTO downDto = roomService.roomDown(userId);
-                downList.add(downDto);
+                downList.add(downDto == null ? new RoomDetailDTO() : downDto);
             }else {
                 //往list中添加空的RoomDetailDTO
                 upList.add(new RoomDetailDTO());

yezhu-api/src/main/java/com/kioor/room/dto/AllRoomDTO.java

@@ -25,10 +25,10 @@ import java.util.List;
 public class AllRoomDTO {
 
     @Schema(description = "id")
-    private Long id;
+    private Long value;
 
     @Schema(description = "编号")
-    private String num;
+    private String text;
 
     @Schema(description = "备注")
     private String remark;

yezhu-api/src/main/java/com/kioor/room/service/impl/BuildingServiceImpl.java

@@ -65,8 +65,8 @@ public class BuildingServiceImpl extends BaseServiceImpl<BuildingDao, BuildingEn
         List<AllRoomDTO> dtos = new ArrayList<>();
         for (BuildingEntity entity : buildingEntities) {
             AllRoomDTO dto = new AllRoomDTO();
-            dto.setId(entity.getId());
-            dto.setNum(entity.getBuildingNum());
+            dto.setValue(entity.getId());
+            dto.setText(entity.getBuildingNum());
             dtos.add(dto);
         }
         return dtos;

yezhu-api/src/main/java/com/kioor/room/service/impl/FloorServiceImpl.java

@@ -63,8 +63,8 @@ public class FloorServiceImpl extends BaseServiceImpl<FloorDao, FloorEntity> imp
         List<AllRoomDTO> dtos = new ArrayList<>();
         for (FloorEntity entity : floorEntities) {
             AllRoomDTO dto = new AllRoomDTO();
-            dto.setId(entity.getId());
-            dto.setNum(String.valueOf(entity.getFloorNum())); // 将Integer转换为String
+            dto.setValue(entity.getId());
+            dto.setText(String.valueOf(entity.getFloorNum())); // 将Integer转换为String
             dtos.add(dto);
         }
         return dtos;

yezhu-api/src/main/java/com/kioor/room/service/impl/RoomServiceImpl.java

@@ -69,9 +69,9 @@ public class RoomServiceImpl extends BaseServiceImpl<RoomDao, RoomEntity> implem
         List<AllRoomDTO> dtos = new ArrayList<>();
         for (RoomEntity entity : roomEntities) {
             AllRoomDTO dto = new AllRoomDTO();
-            dto.setId(entity.getId());
-            dto.setNum(String.valueOf(entity.getRoomNum())); // 将Integer转换为String
-            dto.setRemark(entity.getRemark());
+            dto.setValue(entity.getId());
+//            dto.setText(String.valueOf(entity.getRoomNum())); // 将Integer转换为String
+            dto.setText(entity.getRemark());
             dtos.add(dto);
         }
         return dtos;

yezhu-api/src/main/java/com/kioor/room/service/impl/UnitServiceImpl.java

@@ -64,8 +64,8 @@ public class UnitServiceImpl extends BaseServiceImpl<UnitDao, UnitEntity> implem
         List<AllRoomDTO> dtos = new ArrayList<>();
         for (UnitEntity entity : unitEntities) {
             AllRoomDTO dto = new AllRoomDTO();
-            dto.setId(entity.getId());
-            dto.setNum(entity.getUnitNum());
+            dto.setValue(entity.getId());
+            dto.setText(entity.getUnitNum());
             dtos.add(dto);
         }
         return dtos;

yezhu-api/src/main/java/com/kioor/user/service/impl/TokenServiceImpl.java

@@ -22,9 +22,9 @@ import java.util.UUID;
 @Service
 public class TokenServiceImpl extends BaseServiceImpl<TokenDao, TokenEntity> implements TokenService {
 	/**
-	 * 7天后过期
+	 * 365天后过期
 	 */
-	private final static int EXPIRE = 3600 * 24 * 7;
+	private final static long EXPIRE = 3600 * 24 * 365;
 
 	@Override
 	public TokenEntity getByToken(String token) {

yezhu-api/src/main/resources/application.yml

@@ -13,7 +13,7 @@ server:
 spring:
   # 环境 dev|test|prod
   profiles:
-    active: prod
+    active: test
   messages:
     encoding: UTF-8
     basename: i18n/messages