From 932433e05499d1a26ba422ec1f918168c4ea6917 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 09 Nov 2023 20:33:07 +0800
Subject: [PATCH] 无人机 - 查询监控列表新增序列号参数
---
src/main/java/com/dji/sample/media/dao/IFileMapper.xml | 4 ++--
src/main/java/com/dji/sample/manage/service/ILiveStreamService.java | 2 +-
src/main/java/com/dji/sample/manage/controller/LiveStreamController.java | 4 ++--
src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java | 3 ++-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java b/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
index afc6ed7..7c1d18b 100644
--- a/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
+++ b/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
@@ -53,11 +53,11 @@
* @return live capability
*/
@GetMapping("/capacity/{workspace_id}")
- public ResponseResult<List<CapacityDeviceDTO>> getLiveCapacity(@PathVariable("workspace_id") String workspaceId) {
+ public ResponseResult<List<CapacityDeviceDTO>> getLiveCapacity(@PathVariable("workspace_id") String workspaceId,String sn) {
// Get information about the current user. 获取当前登录用户的信息
// CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
- List<CapacityDeviceDTO> liveCapacity = liveStreamService.getLiveCapacity(workspaceId);
+ List<CapacityDeviceDTO> liveCapacity = liveStreamService.getLiveCapacity(workspaceId,sn);
return ResponseResult.success(liveCapacity);
}
diff --git a/src/main/java/com/dji/sample/manage/service/ILiveStreamService.java b/src/main/java/com/dji/sample/manage/service/ILiveStreamService.java
index 97ae5d4..4e60ac0 100644
--- a/src/main/java/com/dji/sample/manage/service/ILiveStreamService.java
+++ b/src/main/java/com/dji/sample/manage/service/ILiveStreamService.java
@@ -20,7 +20,7 @@
* @param workspaceId
* @return
*/
- List<CapacityDeviceDTO> getLiveCapacity(String workspaceId);
+ List<CapacityDeviceDTO> getLiveCapacity(String workspaceId,String sn);
/**
* Save live capability data.
diff --git a/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java
index 9886a63..c37dba9 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java
@@ -53,13 +53,14 @@
private IDeviceRedisService deviceRedisService;
@Override
- public List<CapacityDeviceDTO> getLiveCapacity(String workspaceId) {
+ public List<CapacityDeviceDTO> getLiveCapacity(String workspaceId,String sn) {
// Query all devices in this workspace.
//查询该工作区中的所有设备。
List<DeviceDTO> devicesList = deviceService.getDevicesByParams(
DeviceQueryParam.builder()
.workspaceId(workspaceId)
+ .deviceSn(sn)
.domains(List.of(DeviceDomainEnum.SUB_DEVICE.getVal(), DeviceDomainEnum.DOCK.getVal()))
.build());
diff --git a/src/main/java/com/dji/sample/media/dao/IFileMapper.xml b/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
index 0b6ed2e..07d136d 100644
--- a/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
+++ b/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
@@ -55,10 +55,10 @@
<if test="param.endTime !=null and param.endTime !=null">
AND DATE_FORMAT(FROM_UNIXTIME(j.create_time/1000,'%Y-%m-%d'),'%Y-%m-%d') <= DATE_FORMAT(#{param.endTime},'%Y-%m-%d')
</if>
- <if test="param.sort != null and param.sort = 2">
+ <if test="param.sort eq 2">
and j.collect_status = 1
</if>
- <if test="param.sort != null and param.sort = 3">
+ <if test="param.sort eq 3">
and m.collect_status = 1
</if>
GROUP BY m.job_id
--
Gitblit v1.9.3