feat：放开激活按钮限制

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -895,7 +895,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
         saasPidManageService.updateById(saasPidManage);
         saasPidManageService.updateById(saasPidManage);
 
 
         // 先为了业务测试注释
         // 先为了业务测试注释
-    /*    String active = shengwangHttpUtil.active(platDevice.getOriDeviceId(),saasPidManage.getPid());
+        String active = shengwangHttpUtil.active(platDevice.getOriDeviceId(),saasPidManage.getPid());
         ApiResponseEntity responseEntity = JSON.parseObject(active, ApiResponseEntity.class);
         ApiResponseEntity responseEntity = JSON.parseObject(active, ApiResponseEntity.class);
         if (responseEntity.getCode() != 200) {
         if (responseEntity.getCode() != 200) {
             throw new RuntimeException(responseEntity.getMessage());
             throw new RuntimeException(responseEntity.getMessage());
@@ -917,7 +917,7 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
             if (StringUtils.isNotEmpty(result)) {
             if (StringUtils.isNotEmpty(result)) {
                 throw new RuntimeException(result);
                 throw new RuntimeException(result);
             }
             }
-        }*/
+        }
 
 
     }
     }
 
 

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

@@ -27,6 +27,7 @@ import com.makeit.service.saas.*;
 import com.makeit.utils.data.convert.JsonUtil;
 import com.makeit.utils.data.convert.JsonUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.vo.platform.elder.report.day.PlatSleepRangeVO;
 import com.makeit.vo.platform.elder.report.day.PlatSleepRangeVO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -49,6 +50,7 @@ import java.util.stream.Collectors;
  * @since 2023-09-13
  * @since 2023-09-13
  */
  */
 @Service
 @Service
+@Slf4j
 public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, PlatElderSleep> implements PlatElderSleepService {
 public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, PlatElderSleep> implements PlatElderSleepService {
 
 
     private static final DateTimeFormatter DEFAULT_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
     private static final DateTimeFormatter DEFAULT_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
@@ -281,6 +283,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
             }
             }
 
 
             if (totalMap.isEmpty()) {
             if (totalMap.isEmpty()) {
+                log.info("呼吸设备上报的数据为空");
                 continue;
                 continue;
             }
             }
 
 
@@ -482,6 +485,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
             Map<String, List<SleepTimeAnalysisVO>> sleepMap = StreamUtil.groupBy(sleepTimeAnalysisVOList, SleepTimeAnalysisVO::getType);
             Map<String, List<SleepTimeAnalysisVO>> sleepMap = StreamUtil.groupBy(sleepTimeAnalysisVOList, SleepTimeAnalysisVO::getType);
             List<SleepTimeAnalysisVO> sleepList = sleepMap.get(SleepTypeEnum.SLEEP.getCode());
             List<SleepTimeAnalysisVO> sleepList = sleepMap.get(SleepTypeEnum.SLEEP.getCode());
             if (CollectionUtils.isEmpty(sleepList)) {
             if (CollectionUtils.isEmpty(sleepList)) {
+                log.info("通过模型分析得出长者没有睡觉");
                 continue;
                 continue;
             }
             }
             // 遍历得出长者一天多次睡眠中包含的不同睡眠类型
             // 遍历得出长者一天多次睡眠中包含的不同睡眠类型