fixbug

server-service/src/main/java/com/makeit/entity/platform/alarm/PlatDayDurationRecord.java

 package com.makeit.entity.platform.alarm;
 package com.makeit.entity.platform.alarm;
 
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.common.entity.BaseBusEntity;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
@@ -30,9 +31,10 @@ public class PlatDayDurationRecord extends BaseBusEntity {
     private String oriDeviceId;
     private String oriDeviceId;
 
 
     /**
     /**
-     * 日期 yyyyMMdd
+     * 日期
      */
      */
-    private String day;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date day;
 
 
     /**
     /**
      * 本次进入时间
      * 本次进入时间

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

@@ -29,8 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Date;
@@ -141,7 +139,6 @@ public class BehaviorAlarm implements IAlarm {
         PlatRegionSetting platRegionSetting = platAlarmCheckDTO.getPlatRegionSetting();
         PlatRegionSetting platRegionSetting = platAlarmCheckDTO.getPlatRegionSetting();
         Date now = new Date();
         Date now = new Date();
         long endLong = now.getTime();
         long endLong = now.getTime();
-        Long startLong = alarmRedisDTO.getStartLong();
         long count = endLong - alarmRedisDTO.getStartLong();
         long count = endLong - alarmRedisDTO.getStartLong();
         //save db
         //save db
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
@@ -156,8 +153,7 @@ public class BehaviorAlarm implements IAlarm {
         durationRecord.setElderIds(platElderList.stream().map(BaseEntity::getId).collect(Collectors.joining(",")));
         durationRecord.setElderIds(platElderList.stream().map(BaseEntity::getId).collect(Collectors.joining(",")));
         durationRecord.setDuration(count);
         durationRecord.setDuration(count);
         durationRecord.setOriDeviceId(platDevice.getOriDeviceId());
         durationRecord.setOriDeviceId(platDevice.getOriDeviceId());
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-        durationRecord.setDay(dateTimeFormatter.format(LocalDateTime.ofEpochSecond(startLong / 1000, 0, ZoneOffset.ofHours(8))));
+        durationRecord.setDay(alarmRedisDTO.getStart());
         durationRecord.setStartDate(alarmRedisDTO.getStart());
         durationRecord.setStartDate(alarmRedisDTO.getStart());
         durationRecord.setEndDate(now);
         durationRecord.setEndDate(now);
         durationRecord.setTenantId(config.getTenantId());
         durationRecord.setTenantId(config.getTenantId());