diff --git a/nursing-unit-common/src/main/java/com/nu/entity/Mp4HandleEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/Mp4HandleEntity.java index 94ad06a7..5556ce45 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/Mp4HandleEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/Mp4HandleEntity.java @@ -1,6 +1,8 @@ package com.nu.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; import java.util.Date; @@ -17,7 +19,8 @@ public class Mp4HandleEntity implements Serializable { private Date startTime; private Date endTime; private String orgCode; - private String orderId; + private String orderId;//工单id + private java.lang.String sn;//摄像头 private List taskList; } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/uploadlog/controller/TplinkUploadLogController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/uploadlog/controller/TplinkUploadLogController.java index 51a3e238..bf67c83a 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/uploadlog/controller/TplinkUploadLogController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/uploadlog/controller/TplinkUploadLogController.java @@ -197,8 +197,13 @@ public class TplinkUploadLogController extends JeecgController qw = new QueryWrapper<>(); + //查询开始、结束对应的所有日期所有视频信息 如果切视频慢 这里不需要改动 有分区 qw.ge("start_time", normalizedStart) .le("start_time", normalizedEnd); + //上传完成的 + qw.eq("upload_status","2"); + //哪个摄像头 + qw.eq("sn",dto.getSn()); List sourceMp4List = tplinkUploadLogService.list(qw); if (CollectionUtils.isEmpty(sourceMp4List)) { diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/job/TplinkUploadProcessQueryJob.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/job/TplinkUploadProcessQueryJob.java index 64224005..db688af4 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/job/TplinkUploadProcessQueryJob.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/job/TplinkUploadProcessQueryJob.java @@ -69,7 +69,11 @@ public class TplinkUploadProcessQueryJob implements Job { if (code == 200) { long length = conn.getContentLengthLong(); if (length != -1) { - task.setMp4Len(length + ""); + task.setUploadStatus("0");//上传中 + task.setMp4Len(length + "");//视频最终大小 + }else{ + task.setUploadStatus("1");//上传失败 + task.setUploadErrorMsg("未获取到视频大小"); } } conn.disconnect();