fix:bug修复

server-service/src/main/java/com/makeit/entity/platform/elder/PlatElderSleepAnalysis.java

@@ -47,12 +47,5 @@ public class PlatElderSleepAnalysis extends BaseBusEntity {
     @ApiModelProperty(value = "翻身次数")
     private Integer turnedCount;
 
-    // @TableField(exist = false)
-    // private String remark;
-    //
-    // @ApiModelProperty(value = "睡眠评分")
-    // @TableField(exist = false)
-    // private String oldSleepScore;
-
 
 }

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

@@ -3,6 +3,7 @@ package com.makeit.service.platform.elder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.makeit.entity.platform.elder.PlatElderSleep;
 import com.makeit.entity.platform.elder.PlatElderSleepAnalysis;
+import com.makeit.entity.saas.analysis.SaasSleepEvaluateStandardReport;
 
 import java.util.List;
 
@@ -19,4 +20,7 @@ public interface PlatElderSleepService extends IService<PlatElderSleep> {
     List<PlatElderSleepAnalysis> elderSleepSleepAnalysisTask(Integer month, Integer day);
 
     void test1();
+
+    String calculateScores(long daySleepTime, long dayRestTime, long deepTime, long soberTime, long lightTime,
+                                  SaasSleepEvaluateStandardReport evaluateStandardReport);
 }

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

@@ -4,22 +4,24 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
+import com.makeit.common.entity.BaseEntity;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.entity.platform.alarm.PlatAlarmRecord;
 import com.makeit.entity.platform.alarm.PlatDayDurationRecord;
 import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.entity.platform.elder.*;
+import com.makeit.entity.saas.analysis.SaasSleepEvaluateStandardReport;
 import com.makeit.enums.CommonEnum;
 import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
 import com.makeit.module.iot.service.IotProductDeviceService;
 import com.makeit.module.iot.vo.analysis.EvaluateReportVO;
-import com.makeit.module.iot.vo.breathe.DeviceInfoContentBreathe;
 import com.makeit.module.iot.vo.fall.DeviceInfoContentFall;
 import com.makeit.module.iot.vo.space.DeviceInfoContentSpace;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.service.platform.alarm.PlatDayDurationRecordService;
 import com.makeit.service.platform.elder.*;
 import com.makeit.service.saas.SaasSleepEvaluateReportService;
+import com.makeit.service.saas.SaasSleepEvaluateStandardReportService;
 import com.makeit.utils.LongTimestampUtil;
 import com.makeit.utils.data.convert.MathUtil;
 import com.makeit.utils.data.convert.StreamUtil;
@@ -72,6 +74,8 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
     private PlatElderCoordinateRecordService platElderCoordinateRecordService;
     @Autowired
     private PlatElderBreatheHeartRateRecordService platElderBreatheHeartRateRecordService;
+    @Autowired
+    private SaasSleepEvaluateStandardReportService saasSleepEvaluateStandardReportService;
 
     private static LocalDateTime dayStartNow(LocalDate now) {
         return LocalDateTimeUtils.getDayStart(now);
@@ -118,7 +122,12 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
         if (platElderSleepAnalysis == null) {
             return platElderSleepEvaluationVO;
         }
-        String sleepScore = platElderSleepAnalysis.getSleepScore();
+        SaasSleepEvaluateStandardReport evaluateStandardReport = saasSleepEvaluateStandardReportService.getOne(
+                new QueryWrapper<SaasSleepEvaluateStandardReport>().lambda().orderByDesc(BaseEntity::getCreateDate)
+                .last("limit 1"));
+        // String sleepScore = platElderSleepAnalysis.getSleepScore();
+        String sleepScore = platElderSleepService.calculateScores(Long.parseLong(platElderSleepAnalysis.getSleepTime()),
+                Long.parseLong(platElderSleepAnalysis.getRestTime()), 0, 0, 0, evaluateStandardReport);
 
         EvaluateReportVO evaluateReport = sleepEvaluateReportService.getByScore(Long.parseLong(sleepScore));
 

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

@@ -553,7 +553,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
             }
 
             SaasSleepEvaluateStandardReport evaluateStandardReport = saasSleepEvaluateStandardReportService.getOne(new QueryWrapper<SaasSleepEvaluateStandardReport>().lambda()
-                    .orderByDesc(BaseEntity::getCreateBy)
+                    .orderByDesc(BaseEntity::getCreateDate)
                     .last("limit 1"));
 
             // 算出每一段睡觉的不同睡眠类型的时间段
@@ -715,23 +715,21 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
             elderSleepAnalysis.setActionCount(totalActionCount);
             elderSleepAnalysis.setTurnedCount(totalTurnedCount);
             elderSleepAnalysis.setHappenDate(currentDate);
-            // elderSleepAnalysis.setOldSleepScore(String.valueOf(totalScore));
             elderSleepAnalysis.setSleepScore(score);
             elderSleepAnalysis.setSleepTime(String.valueOf(daySleepTime));
             elderSleepAnalysis.setRestTime(String.valueOf(dayRestTime));
             elderSleepAnalysis.setSleepResult(sleepReport.getResult());
             elderSleepAnalysis.setTenantId(tenantId);
             elderSleepAnalysis.setSleepEvaluate(sleepReport.getEvaluate());
-            // elderSleepAnalysis.setRemark(String.format("sleepScore:%s + deepScore:%s + lightScore:%s - soberScore:%s"
-            //         , sleepScore, deepScore, lightScore, soberScore));
             result.add(elderSleepAnalysis);
             platElderSleepAnalysisService.save(elderSleepAnalysis);
         }
         return result;
     }
 
-    private String calculateScores(long daySleepTime, long dayRestTime, long deepTime, long soberTime, long lightTime,
-                                   SaasSleepEvaluateStandardReport evaluateStandardReport) {
+    @Override
+    public String calculateScores(long daySleepTime, long dayRestTime, long deepTime, long soberTime, long lightTime,
+                                  SaasSleepEvaluateStandardReport evaluateStandardReport) {
         List<SleepConfigVO> sleepDeepConfigList = JSON.parseArray(evaluateStandardReport.getSleepDeepConfig(), SleepConfigVO.class);
         List<SleepConfigVO> soberConfigList = JSON.parseArray(evaluateStandardReport.getSoberConfig(), SleepConfigVO.class);
         SleepConfigVO lightnessConfig = JSON.parseObject(evaluateStandardReport.getSleepLightnessConfig(), SleepConfigVO.class);