|
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Component;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.time.LocalDate;
|
|
|
+import java.time.LocalTime;
|
|
|
|
|
|
@Component
|
|
|
@Slf4j
|
|
@@ -89,7 +90,7 @@ public class CaptureStreamListener implements StreamListener<String, ObjectRecor
|
|
|
fileName.append("-");
|
|
|
fileName.append(DateTime.now().toString("yyyyMMddHHmmss"));
|
|
|
String isNormalPath = isAlarm ? "alarm" : "normal";
|
|
|
- String filePath = dataDict.getStr("address")+"/"+isNormalPath+"/"+railwayName+"/"+installMiles+"/"+ LocalDate.now().getYear() +"/"+ LocalDate.now().getMonthValue() +"/"+LocalDate.now().getDayOfMonth()+ "/" +fileName + ".jpeg";
|
|
|
+ String filePath = dataDict.getStr("address")+"/"+isNormalPath+"/"+railwayName+"/"+installMiles+"/"+ LocalDate.now().getYear() +"/"+ LocalDate.now().getMonthValue() +"/"+LocalDate.now().getDayOfMonth()+ "/"+ LocalTime.now().getHour()+"/" +fileName + ".jpeg";
|
|
|
// 超过时间则进行抓拍
|
|
|
if (now.isAfterOrEquals(nextExecuteTime) && nextExecuteTime.between(now, DateUnit.MINUTE) < 2) {
|
|
|
genPictureTaskService.makePicture(cameraCode, dataDict.getStr("channel"), filePath, vo.getIsAlarm());
|