Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

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

@@ -115,6 +115,8 @@ public enum CodeMessageEnum {
     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"),
     PLATFORM_ERROR_BED_BIND_DEVICE_NOT_AUTH(500, "PLATFORM.ERROR.BED.BIND_DEVICE_NOT_AUTH"),
     PLATFORM_ERROR_BED_BIND_DEVICE_NOT_AUTH(500, "PLATFORM.ERROR.BED.BIND_DEVICE_NOT_AUTH"),
 
 
+    PLATFORM_ERROR_ELDER_BED_CANT_DEL(500, "PLATFORM.ERROR.ELDER.BED.CANT.DEL"),
+
     SYSTEM_ERROR_CANT_CHANGE_TENANT_STATUS(500, "SYSTEM.ERROR.CANT.CHANGE.TENANT.STATUS"),
     SYSTEM_ERROR_CANT_CHANGE_TENANT_STATUS(500, "SYSTEM.ERROR.CANT.CHANGE.TENANT.STATUS"),
     SYSTEM_ERROR_CANT_REMOVE_TENANT_USER_LINK(500, "SYSTEM.ERROR.CANT.REMOVE.TENANT.USER.LINK"),
     SYSTEM_ERROR_CANT_REMOVE_TENANT_USER_LINK(500, "SYSTEM.ERROR.CANT.REMOVE.TENANT.USER.LINK"),
     SYSTEM_ERROR_TENANT_ID_NOT_BLANK(510, "SYSTEM.ERROR.TENANT.ID.NOT.BLANK"),
     SYSTEM_ERROR_TENANT_ID_NOT_BLANK(510, "SYSTEM.ERROR.TENANT.ID.NOT.BLANK"),

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

@@ -109,6 +109,8 @@ 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=该床位已绑定设备，请重新选择床位
 
 
+PLATFORM.ERROR.ELDER.BED.CANT.DEL=含入住床位的老人，不可删除
+
 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/enums/report/HeartRateTypeEnum.java

@@ -9,7 +9,7 @@ public enum HeartRateTypeEnum {
 
 
 
 
     BRADYCARDIA("bradycardia","心率过缓"),
     BRADYCARDIA("bradycardia","心率过缓"),
-    TACHYCARDIA("tachycardia","呼吸过速");
+    TACHYCARDIA("tachycardia","心率过速");
 
 
     private String code;
     private String code;
     private String value;
     private String value;

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BehaviorAlarm.java

@@ -161,6 +161,9 @@ public class BehaviorAlarm implements IAlarm {
             platElderList = platAlarmCheckDTO.getPlatElderList();
             platElderList = platAlarmCheckDTO.getPlatElderList();
         }
         }
         for (PlatElder platElder : platElderList) {
         for (PlatElder platElder : platElderList) {
+            if(StringUtils.isBlank(platElder.getRegionName())){
+                continue;
+            }
             PlatDayDurationRecord durationRecord = new PlatDayDurationRecord();
             PlatDayDurationRecord durationRecord = new PlatDayDurationRecord();
             durationRecord.setElderIds(platElder.getId());
             durationRecord.setElderIds(platElder.getId());
             durationRecord.setRegionName(platElder.getRegionName());
             durationRecord.setRegionName(platElder.getRegionName());

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

@@ -20,6 +20,7 @@ import com.makeit.service.platform.elder.*;
 import com.makeit.utils.LongTimestampUtil;
 import com.makeit.utils.LongTimestampUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.data.validate.CollectionUtils;
 import com.makeit.utils.data.validate.CollectionUtils;
+import com.makeit.utils.old.StringUtils;
 import com.makeit.utils.time.LocalDateTimeUtils;
 import com.makeit.utils.time.LocalDateTimeUtils;
 import com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO;
 import com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO;
 import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO;
 import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO;
@@ -425,6 +426,11 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
 
 
         });
         });
 
 
+        voList.forEach(e -> {
+            if (StringUtils.isBlank(e.getAreaName())) {
+                e.setAreaName("");
+            }
+        });
         Map<String, List<PlatElderBehaviorDistributionVO>> map = StreamUtil.groupBy(voList, PlatElderBehaviorDistributionVO::getAreaName);
         Map<String, List<PlatElderBehaviorDistributionVO>> map = StreamUtil.groupBy(voList, PlatElderBehaviorDistributionVO::getAreaName);
 
 
         List<PlatElderBehaviorDistributionVO> newVoList = new ArrayList<>(10);
         List<PlatElderBehaviorDistributionVO> newVoList = new ArrayList<>(10);

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

@@ -829,7 +829,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         PlatElder db = getById(id);
         PlatElder db = getById(id);
 
 
         if (StringUtils.isNotBlank(db.getBedId())) {
         if (StringUtils.isNotBlank(db.getBedId())) {
-            throw new RuntimeException();
+            throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_ELDER_BED_CANT_DEL);
         }
         }
 
 
         removeById(id);
         removeById(id);
@@ -842,7 +842,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         dbList.forEach(e -> {
         dbList.forEach(e -> {
 
 
             if (StringUtils.isNotBlank(e.getBedId())) {
             if (StringUtils.isNotBlank(e.getBedId())) {
-                throw new RuntimeException();//TODO ywc 报错具体换
+                throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_ELDER_BED_CANT_DEL);//TODO ywc 报错具体换
             }
             }
 
 
         });
         });