From 48835f89a9229732cfec13872094bc362c5b1b13 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Thu, 14 May 2026 13:44:12 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9tplink=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E8=BF=9B=E5=BA=A6=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=9Atplink=E5=A4=84=E7=90=86=E6=88=90=E5=8A=9F=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E8=A7=86=E9=A2=91=E4=B8=8A=E4=BC=A0=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=94=B9=E4=B8=BA=E4=B8=8A=E4=BC=A0=E4=B8=AD=E3=80=81?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=AA=E8=8E=B7=E5=8F=96=E5=88=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=A7=E5=B0=8F=E7=9B=B4=E6=8E=A5=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=B8=BA=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5=202=E3=80=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=80=83=E6=A0=B8tplink=E5=9B=9E=E6=94=BE?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=8E=A5=E5=8F=A3=EF=BC=8Csql=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/nu/entity/Mp4HandleEntity.java | 5 ++++- .../uploadlog/controller/TplinkUploadLogController.java | 5 +++++ .../modules/biz/order/job/TplinkUploadProcessQueryJob.java | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-) 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();