111

src/main/java/com/fdkankan/project/tieta/dto/ScenePushDTO.java

@@ -1,11 +1,13 @@
 package com.fdkankan.project.tieta.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import java.util.Date;
 
 @Data
 @Builder
@@ -18,4 +20,7 @@ public class ScenePushDTO {
 
     @NotBlank(message = "entityId不能为空")
     private String entityId;
+
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date upTime;
 }

src/main/java/com/fdkankan/project/tieta/schedule/Job.java

@@ -65,7 +65,7 @@ public class Job {
                     continue;
                 }
 
-                convertService.scenePush(ScenePushDTO.builder().stationCode(item.getStationCode()).entityId(item.getEntityId()).build(), null);
+                convertService.scenePush(ScenePushDTO.builder().upTime(item.getUpTime()).stationCode(item.getStationCode()).entityId(item.getEntityId()).build(), null);
                 if(maxTime.before(item.getUpTime())){
                     maxTime = item.getUpTime();
                     redisClient.add(Constant.REDIS_SCENE_CONVERT_STARTTIME, DateUtil.format(maxTime, "yyyy-MM-dd HH:mm:ss"));

src/main/java/com/fdkankan/project/tieta/service/impl/ConvertServiceImpl.java

@@ -48,6 +48,7 @@ public class ConvertServiceImpl implements IConvertService {
         JSONObject playload = new JSONObject();
         playload.put("stationCode", dto.getStationCode());
         playload.put("entityId", dto.getEntityId());
+        playload.put("upTime", dto.getUpTime());
         List<FullphotoFileindex> fullphotoFileindices = fullphotoFileindexService.listByStationCodeAndEntityId(dto.getStationCode(), dto.getEntityId());
         if(CollUtil.isEmpty(fullphotoFileindices)){
             return ResultData.error(ServerCode.RESOURCE_NOT_EXIST);