fix:合并代码

server-module/src/main/java/com/makeit/module/controller/elder/PlatElderSleepController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO;
 import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO;
+import com.makeit.entity.platform.elder.ElderSleepAnalysisVO;
 import com.makeit.entity.platform.elder.PlatElderBreatheAnalysis;
 import com.makeit.entity.platform.elder.PlatElderBreatheAnalysis;
 import com.makeit.entity.platform.elder.PlatElderSleepAnalysis;
 import com.makeit.entity.platform.elder.PlatElderSleepAnalysis;
 import com.makeit.external.huineng.HuiNengService;
 import com.makeit.external.huineng.HuiNengService;
@@ -73,7 +74,7 @@ public class PlatElderSleepController {
     @GetMapping("test4")
     @GetMapping("test4")
     @AuthIgnore
     @AuthIgnore
     @TenantIdIgnore
     @TenantIdIgnore
-    public ApiResponseEntity<List<PlatElderSleepAnalysis>> elderSleepSleepAnalysisTask(@RequestParam Integer month,
+    public ApiResponseEntity<List<ElderSleepAnalysisVO>> elderSleepSleepAnalysisTask(@RequestParam Integer month,
                                                                                      @RequestParam Integer day) {
                                                                                      @RequestParam Integer day) {
         return ApiResponseUtils.success(platElderSleepService.elderSleepSleepAnalysisTask(month, day));
         return ApiResponseUtils.success(platElderSleepService.elderSleepSleepAnalysisTask(month, day));
     }
     }

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

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

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

@@ -824,7 +824,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
         elderSleepAnalysis.setTenantId(tenantId);
         elderSleepAnalysis.setTenantId(tenantId);
         elderSleepAnalysis.setSleepEvaluate(sleepReport.getEvaluate());
         elderSleepAnalysis.setSleepEvaluate(sleepReport.getEvaluate());
         elderSleepAnalysis.setOriDeviceId(oriDeviceId);
         elderSleepAnalysis.setOriDeviceId(oriDeviceId);
-        // platElderSleepAnalysisService.save(elderSleepAnalysis);
+        platElderSleepAnalysisService.save(elderSleepAnalysis);
         return elderSleepAnalysis;
         return elderSleepAnalysis;
     }
     }
 
 
@@ -928,7 +928,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
                 elderSleepList.add(platElderSleep);
                 elderSleepList.add(platElderSleep);
             }
             }
         }
         }
-        // platElderSleepService.saveBatch(elderSleepList);
+        platElderSleepService.saveBatch(elderSleepList);
         return elderSleepList;
         return elderSleepList;
     }
     }