改bug

server-common/src/main/java/com/makeit/enums/CodeMessageEnum.java

@@ -99,6 +99,7 @@ public enum CodeMessageEnum {
     PLATFORM_ERROR_SPACE_NOT_DEL(500, "PLATFORM.ERROR.SPACE.NOT.DEL"),
     PLATFORM_ERROR_SPACE_NOT_DEL(500, "PLATFORM.ERROR.SPACE.NOT.DEL"),
     PLATFORM_ERROR_ROOM_EXIT_BAD(500, "PLATFORM.ERROR.ROOM.EXIT.BAD"),
     PLATFORM_ERROR_ROOM_EXIT_BAD(500, "PLATFORM.ERROR.ROOM.EXIT.BAD"),
     PLATFORM_ERROR_ROOM_BAD_NUMBER_NOT_AUTH(500, "PLATFORM.ERROR.ROOM.BAD.NUMBER.NOT.AUTH"),
     PLATFORM_ERROR_ROOM_BAD_NUMBER_NOT_AUTH(500, "PLATFORM.ERROR.ROOM.BAD.NUMBER.NOT.AUTH"),
+    PLATFORM_ERROR_ROOM_NAME_EXIT(500, "PLATFORM.ERROR.ROOM.NAME.EXIT"),
     PLATFORM_ERROR_BAD_NAME_EXIT(500, "PLATFORM.ERROR.BAD.NAME.EXIT"),
     PLATFORM_ERROR_BAD_NAME_EXIT(500, "PLATFORM.ERROR.BAD.NAME.EXIT"),
     PLATFORM_ERROR_BAD_NOT_DEL(500, "PLATFORM.ERROR.BAD.NOT.DEL"),
     PLATFORM_ERROR_BAD_NOT_DEL(500, "PLATFORM.ERROR.BAD.NOT.DEL"),
     PLATFORM_ERROR_ROOM_OTHER_USED_NOT_DEL(500, "PLATFORM.ERROR.ROOM.OTHER.USED.NOT.DEL"),
     PLATFORM_ERROR_ROOM_OTHER_USED_NOT_DEL(500, "PLATFORM.ERROR.ROOM.OTHER.USED.NOT.DEL"),

server-common/src/main/resources/locale/business_messages.properties

@@ -94,6 +94,7 @@ PLATFORM.ERROR.ELDER.CERTIFICATENUMBER.DUPLICATE=证件号不能重复
 PLATFORM.ERROR.SPACE.NAME.DUPLICATE=同一层级,空间名称不能重复
 PLATFORM.ERROR.SPACE.NAME.DUPLICATE=同一层级,空间名称不能重复
 PLATFORM.ERROR.SPACE.NOT.DEL=该空间下存在下级或者房间，不可删除
 PLATFORM.ERROR.SPACE.NOT.DEL=该空间下存在下级或者房间，不可删除
 PLATFORM.ERROR.ROOM.EXIT.BAD=房间中存在床位，不可删除
 PLATFORM.ERROR.ROOM.EXIT.BAD=房间中存在床位，不可删除
+PLATFORM.ERROR.ROOM.NAME.EXIT=该房间名称已存在
 PLATFORM.ERROR.ROOM.BAD.NUMBER.NOT.AUTH=床位数量不能改小
 PLATFORM.ERROR.ROOM.BAD.NUMBER.NOT.AUTH=床位数量不能改小
 PLATFORM.ERROR.BAD.NAME.EXIT=床位名称已存在
 PLATFORM.ERROR.BAD.NAME.EXIT=床位名称已存在
 PLATFORM.ERROR.BAD.NOT.DEL=床位已绑定长者或设备，不可删除
 PLATFORM.ERROR.BAD.NOT.DEL=床位已绑定长者或设备，不可删除

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatBedServiceImpl.java

@@ -20,6 +20,7 @@ import com.makeit.mapper.platform.space.PlatBedMapper;
 import com.makeit.service.platform.device.PlatDeviceService;
 import com.makeit.service.platform.device.PlatDeviceService;
 import com.makeit.service.platform.space.PlatBedService;
 import com.makeit.service.platform.space.PlatBedService;
 import com.makeit.service.platform.space.PlatRoomBedDeviceService;
 import com.makeit.service.platform.space.PlatRoomBedDeviceService;
+import com.makeit.service.platform.space.PlatRoomService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.data.convert.PageUtil;
 import com.makeit.utils.data.convert.PageUtil;
 import com.makeit.vo.platform.space.PlatBedPanoramaVO;
 import com.makeit.vo.platform.space.PlatBedPanoramaVO;
@@ -40,7 +41,7 @@ import java.util.stream.Collectors;
 public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> implements PlatBedService {
 public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> implements PlatBedService {
 
 
     @Autowired
     @Autowired
-    private PlatDeviceService platDeviceService;
+    private PlatRoomService platRoomService;
 
 
     @Autowired
     @Autowired
     private PlatRoomBedDeviceService platRoomBedDeviceService;
     private PlatRoomBedDeviceService platRoomBedDeviceService;
@@ -106,6 +107,9 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
             throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_BAD_NAME_EXIT);
             throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_BAD_NAME_EXIT);
         }
         }
 
 
+        platBed.setName(dto.getName());
+        updateById(platBed);
+
     }
     }
 
 
     @Override
     @Override
@@ -129,6 +133,10 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
         }
         }
 
 
         removeById(id);
         removeById(id);
+
+        PlatRoom platRoom = platRoomService.getById(platBed.getRoomId());
+        platRoom.setBedNumber(platRoom.getBedNumber()-1);
+        platRoomService.updateById(platRoom);
     }
     }
 
 
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomServiceImpl.java

@@ -36,10 +36,27 @@ public class PlatRoomServiceImpl extends ServiceImpl<PlatRoomMapper, PlatRoom> i
     @Autowired
     @Autowired
     private PlatBedService platBedService;
     private PlatBedService platBedService;
 
 
+    private void checkName(PlatRoom platRoom){
+
+        LambdaQueryWrapper<PlatRoom> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(PlatRoom::getSpaceId,platRoom.getSpaceId());
+        queryWrapper.eq(PlatRoom::getName,platRoom.getName());
+
+        if(platRoom.getId() != null){
+            queryWrapper.ne(PlatRoom::getId,platRoom.getId());
+        }
+        if(count(queryWrapper) > 0){
+            throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_ROOM_NAME_EXIT);
+        }
+
+    }
+
+
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public void add(PlatRoomDTO dto) {
     public void add(PlatRoomDTO dto) {
         PlatRoom platRoom = BeanDtoVoUtils.convert(dto, PlatRoom.class);
         PlatRoom platRoom = BeanDtoVoUtils.convert(dto, PlatRoom.class);
+        checkName(platRoom);
         save(platRoom);
         save(platRoom);
 
 
         platBedService.add(platRoom);
         platBedService.add(platRoom);
@@ -59,8 +76,9 @@ public class PlatRoomServiceImpl extends ServiceImpl<PlatRoomMapper, PlatRoom> i
         platRoom.setDescription(dto.getDescription());
         platRoom.setDescription(dto.getDescription());
         platRoom.setSpaceId(dto.getSpaceId());
         platRoom.setSpaceId(dto.getSpaceId());
         platRoom.setSpacePath(dto.getSpacePath());
         platRoom.setSpacePath(dto.getSpacePath());
-        updateById(platRoom);
+        checkName(platRoom);
 
 
+        updateById(platRoom);
         platBedService.add(platRoom);
         platBedService.add(platRoom);
     }
     }