feat：本地不执行定时任务

saas-module/src/main/java/com/makeit/controller/device/SaasDeviceController.java

@@ -66,7 +66,7 @@ public class SaasDeviceController {
         return ApiResponseUtils.success(platDeviceService.readDeviceProperties(dto));
     }
 
-    @ApiOperation("编辑设备属性  主要写入usrServerInfo信息")
+    @ApiOperation("编辑设备属性")
     @PostMapping("editDeviceProperties")
     @TenantIdIgnore
     public ApiResponseEntity<?> editDeviceProperties(@RequestBody PlatDeviceAttrWechatDTO dto) {
@@ -76,6 +76,7 @@ public class SaasDeviceController {
 
     @ApiOperation("编辑设备网络属性 主要写入usrServerInfo信息")
     @PostMapping("editDeviceNetInfo")
+    @TenantIdIgnore
     public ApiResponseEntity<?> editDeviceNetInfo(@RequestBody PlatDeviceNetAttrWechatDTO dto) {
         platDeviceService.editDeviceNetInfo(dto);
         return ApiResponseUtils.success();

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

@@ -7,8 +7,7 @@ import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO;
 import com.makeit.global.annotation.AuthIgnore;
 import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.service.platform.device.PlatDeviceService;
-import com.makeit.service.platform.elder.PlatElderReportMonthService;
-import com.makeit.service.platform.elder.PlatElderSleepService;
+import com.makeit.service.platform.elder.*;
 import com.makeit.task.PlatElderReportTask;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,13 +31,17 @@ import org.springframework.web.bind.annotation.RestController;
 public class PlatElderSleepController {
 
     @Autowired
-    private PlatElderReportTask platElderReportTask;
-    @Autowired
     private PlatElderSleepService platElderSleepService;
     @Autowired
     private PlatDeviceService platDeviceService;
     @Autowired
     private PlatElderReportMonthService platElderReportMonthService;
+    @Autowired
+    private PlatElderBreatheDayStatService platElderBreatheDayStatService;
+    @Autowired
+    private PlatElderBreatheAnalysisService platElderBreatheAnalysisService;
+    @Autowired
+    private PlatElderCoordinateRecordService platElderCoordinateRecordService;
 
 
 
@@ -55,7 +58,7 @@ public class PlatElderSleepController {
     @PostMapping("test2")
     @AuthIgnore
     public ApiResponseEntity<Void> heartRespiratoryTask() {
-        platElderReportTask.heartRespiratoryTask();
+        platElderBreatheDayStatService.heartRespiratoryTask();
         return ApiResponseUtils.success();
     }
 
@@ -63,7 +66,7 @@ public class PlatElderSleepController {
     @PostMapping("test3")
     @AuthIgnore
     public ApiResponseEntity<Void> elderHeartRespiratoryAnalysisTask() {
-        platElderReportTask.elderHeartRespiratoryAnalysisTask();
+        platElderBreatheAnalysisService.elderHeartRespiratoryAnalysisTask();
         return ApiResponseUtils.success();
     }
 
@@ -71,7 +74,7 @@ public class PlatElderSleepController {
     @PostMapping("test4")
     @AuthIgnore
     public ApiResponseEntity<Void> elderSleepSleepAnalysisTask() {
-        platElderReportTask.elderSleepSleepAnalysisTask();
+        platElderSleepService.elderSleepSleepAnalysisTask();
         return ApiResponseUtils.success();
     }
 
@@ -79,7 +82,7 @@ public class PlatElderSleepController {
     @PostMapping("test5")
     @AuthIgnore
     public ApiResponseEntity<Void> coordinateRecordTask() {
-        platElderReportTask.coordinateRecordTask();
+        platElderCoordinateRecordService.coordinateRecordTask();
         return ApiResponseUtils.success();
     }
 

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

@@ -721,7 +721,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
 
     public List<String> getLastDayHourRange() {
         int count = 24;
-        LocalDateTime localDateTime = getDayStart(LocalDate.now()).plusHours(8);
+        LocalDateTime localDateTime = getDayStart(LocalDate.now());
         List<String> list = Lists.newArrayList();
         String startTime;
         String endTime;

server-service/src/main/java/com/makeit/task/DayDurationTask.java

@@ -3,11 +3,13 @@ package com.makeit.task;
 import com.makeit.utils.DayDurationUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
 @Slf4j
+@ConditionalOnProperty(value = {"iot.sync.enable"}, havingValue = "true")
 public class DayDurationTask {
 
     @Autowired

server-service/src/main/java/com/makeit/task/IotSyncTask.java

@@ -3,11 +3,13 @@ package com.makeit.task;
 import com.makeit.service.platform.device.PlatDeviceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
 @Slf4j
+@ConditionalOnProperty(value = {"iot.sync.enable"}, havingValue = "true")
 public class IotSyncTask {
 
     @Autowired

server-service/src/main/java/com/makeit/task/PlatElderReportTask.java

@@ -7,11 +7,13 @@ import com.makeit.service.platform.elder.PlatElderCoordinateRecordService;
 import com.makeit.service.platform.elder.PlatElderSleepService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 @Component
 @Slf4j
+@ConditionalOnProperty(value = {"iot.sync.enable"}, havingValue = "true")
 public class PlatElderReportTask {
 
     @Autowired
@@ -56,7 +58,7 @@ public class PlatElderReportTask {
     /**
      * 长者睡眠分析
      */
-    @Scheduled(cron = "0 0 3 * * ?")
+    @Scheduled(cron = "0 0 8 * * ?")
     @TenantIdIgnore
     public void elderSleepSleepAnalysisTask() {
         log.info("开始定时分析长者睡眠质量");

server-web/src/main/resources/application-dev.yml

@@ -111,6 +111,8 @@ iot:
   url: https://iot.qa.insightica.cn/api/
   clientId: fyxmb5h52iKwE2Hi
   secureKey: 22fZbnH36wdHn7ZTyKKHraFw233npcez
+  sync:
+    enable: false
 
 mqtt:
   username: admin|1693982115969

server-web/src/main/resources/application.yml

@@ -156,3 +156,7 @@ rsa:
   config:
     pk: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNWwXoRRnYSSYp0z5H+LjWIbsMxYO0yLMtBhUSlRM12L62O57FWh+ENphkmMF1LZlG0hPo3rD70Ur6JuaEqwQvk3NA2qXPC+7LczN21JxtSI3mFrQcALvfuENU9WYVUC8ZktyRpYV7djWw/iJS7ugX//D6lsX0oA6GGGT0ubiw9wIDAQAB
     sk: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAM1bBehFGdhJJinTPkf4uNYhuwzFg7TIsy0GFRKVEzXYvrY7nsVaH4Q2mGSYwXUtmUbSE+jesPvRSvom5oSrBC+Tc0Dapc8L7stzM3bUnG1IjeYWtBwAu9+4Q1T1ZhVQLxmS3JGlhXt2NbD+IlLu6Bf/8PqWxfSgDoYYZPS5uLD3AgMBAAECgYEAkpAiWTHoTjt252cDDm7vzLRqQaU+aOrNJpcutwJ6oXW+N2W53XSDBePJRBLaD/2pZahN2WgGvNMVRhA5efpskxifl31x2JJ7/wzNwkNdupGnhfuEvtoPs77TieXS0Zz5p1SbmqABDkUsVeEUa7aj93LZZsLg5S57OrG0+EizC+ECQQDsutESdwBuBcSI4F4yNbGVFfLPJvf4CfYCUqetwuE7xKbci6LIoEcxBG4YbOZKimrU8Qu34IAEK4ym2xuAZvFZAkEA3hJnPPuk67aOb755HpNchtnjbz/Y5Pw6ZIPP+6I+RZcj1QEbMoTG8uUrDHIiKG8oOKUi1L11I0SCj+TuriyazwJBAKtAklKbR/JPtdeXCE2mTisdz6NP+36yJgeUJ70qB6onHtbZJQ+h8x5gqAx/azFtZM9a+TEx9SoPHxbt1r1SuzECQAhv9pAwl3GFPCAuwndQ7gEJokSFzn3Uv3s2Lt7GqUsHlQrwwdHHja+I2XvdkkKrBoIwdARVNnAimDtTXWYst60CQDxqAPn5arLRwSf8eaO2LceAIEdAIFrtfgKyavpmf6OaRMKhabES+UKlF0bggAl8JBPLTWZA+pWA3AjKHp+5qik=
+
+iot:
+  sync:
+    enable: true
\ No newline at end of file

server-web/src/main/resources/logback-spring.xml

@@ -7,6 +7,11 @@
     <property name="pattern"
               value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%X{appName}] [%X{profile}] [%X{traceId:-},%X{spanId:-}] [%X{requestId}] [%X{userId}] [%thread] %-5level %logger{50} - %msg%n"/>
 
+    <springProfile name="dev">
+        <property name="logback.logdir" value="/home/group1_lzy/iot-server/logs"/>
+        <property name="logback.appname" value="app"/>
+    </springProfile>
+
     <springProfile name="prod">
         <property name="logback.logdir" value="/home/group1_lzy/iot-server/logs"/>
         <property name="logback.appname" value="app"/>
@@ -127,6 +132,11 @@
             <appender-ref ref="FILEERRORLOG"/>
             <appender-ref ref="FILEWARNLOG"/>
         </logger>
+        <logger name="com.makeit" level="ERROR" additivity="false">
+            <appender-ref ref="FILEINFOLOG"/>
+            <appender-ref ref="FILEERRORLOG"/>
+            <appender-ref ref="FILEWARNLOG"/>
+        </logger>
     </springProfile>
 
     <springProfile name="test">