修改bug

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

@@ -100,6 +100,8 @@ public enum CodeMessageEnum {
 
 
     PLATFORM_ERROR_ELDER_CERTIFICATENUMBER_DUPLICATE(500, "PLATFORM.ERROR.ELDER.CERTIFICATENUMBER.DUPLICATE"),
     PLATFORM_ERROR_ELDER_CERTIFICATENUMBER_DUPLICATE(500, "PLATFORM.ERROR.ELDER.CERTIFICATENUMBER.DUPLICATE"),
 
 
+    PLATFORM_ERROR_CHILDREN_ELDER_ID_BIND_DUPLICATE(500, "PLATFORM.ERROR.CHILDREN.ELDER.ID.BIND.DUPLICATE"),
+
 
 
     PLATFORM_ERROR_SPACE_NAME_DUPLICATE(500, "PLATFORM.ERROR.SPACE.NAME.DUPLICATE"),
     PLATFORM_ERROR_SPACE_NAME_DUPLICATE(500, "PLATFORM.ERROR.SPACE.NAME.DUPLICATE"),
     PLATFORM_ERROR_SPACE_NOT_DEL(500, "PLATFORM.ERROR.SPACE.NOT.DEL"),
     PLATFORM_ERROR_SPACE_NOT_DEL(500, "PLATFORM.ERROR.SPACE.NOT.DEL"),

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

@@ -94,6 +94,7 @@ SYSTEM.ERROR.SMS.CODE.NOT.CORRECT=验证码不正确
 
 
 PLATFORM.ERROR.ELDER.CERTIFICATENUMBER.DUPLICATE=证件号不能重复
 PLATFORM.ERROR.ELDER.CERTIFICATENUMBER.DUPLICATE=证件号不能重复
 
 
+PLATFORM.ERROR.CHILDREN.ELDER.ID.BIND.DUPLICATE=不能重复绑定该老人
 
 
 PLATFORM.ERROR.SPACE.NAME.DUPLICATE=同一层级,空间名称不能重复
 PLATFORM.ERROR.SPACE.NAME.DUPLICATE=同一层级,空间名称不能重复
 PLATFORM.ERROR.SPACE.NOT.DEL=该空间下存在下级或者房间，不可删除
 PLATFORM.ERROR.SPACE.NOT.DEL=该空间下存在下级或者房间，不可删除
@@ -108,7 +109,6 @@ PLATFORM.ERROR.BAD.NOT.DEL=床位已绑定长者或设备，不可删除
 PLATFORM.ERROR.ROOM.OTHER.USED.NOT.DEL=该房间下有床位有其他长者入住
 PLATFORM.ERROR.ROOM.OTHER.USED.NOT.DEL=该房间下有床位有其他长者入住
 PLATFORM.ERROR.BED.BIND_DEVICE_NOT_AUTH=该床位已绑定设备，请重新选择床位
 PLATFORM.ERROR.BED.BIND_DEVICE_NOT_AUTH=该床位已绑定设备，请重新选择床位
 
 
-
 SYSTEM.ERROR.ROLE.ADMIN.CANT.ADD=不能在该节点下新增非管理员角色
 SYSTEM.ERROR.ROLE.ADMIN.CANT.ADD=不能在该节点下新增非管理员角色
 SYSTEM.ERROR.ROLE.ADMIN.CANT.EDIT=管理员角色不能修改
 SYSTEM.ERROR.ROLE.ADMIN.CANT.EDIT=管理员角色不能修改
 
 

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

@@ -164,6 +164,11 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
     public void bind(String elderId) {
     public void bind(String elderId) {
         PlatElderChildrenInfo childrenInfo = getById(WechatUserUtil.getUserId());
         PlatElderChildrenInfo childrenInfo = getById(WechatUserUtil.getUserId());
 
 
+
+        if (StringUtils.isNotBlank(childrenInfo.getElderId()) && childrenInfo.getElderId().contains(elderId)) {
+            throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_CHILDREN_ELDER_ID_BIND_DUPLICATE);
+        }
+
         List<String> list = new ArrayList<>(10);
         List<String> list = new ArrayList<>(10);
         if (StringUtils.isNotBlank(childrenInfo.getElderId())) {
         if (StringUtils.isNotBlank(childrenInfo.getElderId())) {
             list = Arrays.asList(childrenInfo.getElderId().split(","));
             list = Arrays.asList(childrenInfo.getElderId().split(","));

server-service/src/main/java/com/makeit/vo/platform/elder/report/day/PlatElderHeartRespiratoryEvaluationRecordVO.java

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
 @Data
 @Data
 public class PlatElderHeartRespiratoryEvaluationRecordVO {
 public class PlatElderHeartRespiratoryEvaluationRecordVO {
 
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm::ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("时间")
     @ApiModelProperty("时间")
     private LocalDateTime time;
     private LocalDateTime time;