新增数据绑定床位

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

@@ -508,6 +508,10 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         save(platElder);
 
+        if (StringUtils.isNotBlank(dto.getBedId())) {
+            checkInInternal(dto.getBedId());
+        }
+
     }
 
     @Override
@@ -516,6 +520,8 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         check(BeanDtoVoUtils.convert(dto, PlatElderAddDTO.class));
 
+        PlatElder db = getById(dto.getId());
+
         PlatElder platElder = BeanDtoVoUtils.convert(dto, PlatElder.class);
 
         updateById(platElder);
@@ -539,6 +545,10 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         platElderOtherInfoService.saveOrUpdate(otherInfo);
 
+        if (StringUtils.isNotBlank(dto.getBedId()) && StringUtils.isBlank(db.getBedId())) {
+            checkInInternal(dto.getBedId());
+        }
+
 
     }
 
@@ -610,6 +620,15 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
     }
 
+    private void checkInInternal(String bedId) {
+        StatusDTO statusDTO = new StatusDTO();
+        statusDTO.setId(bedId);
+        statusDTO.setStatus(CommonEnum.NO.getValue());
+
+        platBedService.changeStatus(statusDTO);
+    }
+
+
     //TODO ywc 可能要改床位表状态
     @Transactional
     @Override
@@ -621,11 +640,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         updateById(db);
 
-        StatusDTO statusDTO = new StatusDTO();
-        statusDTO.setId(dto.getBedId());
-        statusDTO.setStatus(CommonEnum.NO.getValue());
-
-        platBedService.changeStatus(statusDTO);
+        checkInInternal(dto.getBedId());
 
     }
 
@@ -643,13 +658,15 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
         }
 
+        String bedId = db.getBedId();
+
         db.setSpaceId(null);
         db.setStreetSpaceId(null);
         db.setBuildingSpaceId(null);
         db.setUnitSpaceId(null);
         db.setFloorSpaceId(null);
         db.setRoomId(null);
-        db.setBedId(null);
+        db.setBedId(bedId);
         db.setSpacePath(null);
 
         db.setCheckOutTime(LocalDateTime.now());
@@ -659,7 +676,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         //TODO ywc 是否删除房间 及其校验没做
 
         StatusDTO statusDTO = new StatusDTO();
-        statusDTO.setId(db.getBedId());
+        statusDTO.setId(bedId);
         statusDTO.setStatus(CommonEnum.YES.getValue());
 
         platBedService.changeStatus(statusDTO);

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

@@ -141,9 +141,9 @@ public class PlatBedServiceImpl extends ServiceImpl<PlatBedMapper, PlatBed> impl
             throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR);
         }
         PlatBed bed = getById(dto.getId());
-        if (bed.getStatus().equals(dto.getStatus())) {
-            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR);
-        }
+//        if (bed.getStatus().equals(dto.getStatus())) {
+//            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR);
+//        }
 
         bed.setStatus(dto.getStatus());
         updateById(bed);

server-web/src/main/resources/application-dev.yml

@@ -123,8 +123,12 @@ mqtt:
 wx:
   miniapp:
     config:
-      appid: wx48720402e3fdbe0f #微信小程序的appid
-      secret: 2ebae648f45716e70c75b7d78d0660cc #微信小程序的Secret
+#      appid: wx48720402e3fdbe0f #微信小程序的appid
+#      secret: 2ebae648f45716e70c75b7d78d0660cc #微信小程序的Secret
+
+      appid: wx5138507da6bf5709 #微信小程序的appid
+      secret: 2cdf04b11dce20f48402a1fef1cc9842 #微信小程序的Secret
+
       token: #微信小程序消息服务器配置的token
       aesKey: #微信小程序消息服务器配置的EncodingAESKey
       msgDataFormat: JSON