From 255a6915a9898fe6c1a6649cae707649226ec177 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 08 九月 2023 16:30:34 +0800
Subject: [PATCH] 程序启动清空相机缓存列表重新加载 增加sdk获取相机聚焦值接口 修改相机登录时离线清空通道列表 增加获取码流压缩参数（分辨率/编码格式/码率/流类型） 优化相机在线离线业务方法，修改仅在线设备上传ptz
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java
index 526a75c..ef9d092 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyUserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.sy.controller;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -45,10 +46,13 @@
*/
@PreAuthorize("@ss.hasPermi('sy:syUser:list')")
@GetMapping("/list")
+ @ApiOperation("鏌ヨ涓変竴杞﹁締鎸傛帴鐢ㄦ埛")
public TableDataInfo list(ArdSyUser ardSyUser)
{
startPage();
- List<ArdSyUser> list = ardSyUserService.selectArdSyUserList(ardSyUser);
+ /*List<ArdSyUser> list = ardSyUserService.selectArdSyUserList(ardSyUser);
+ return getDataTable(list);*/
+ List<Map<String,Object>> list = ardSyUserService.selectArdSyUserListWithSysUser(ardSyUser);
return getDataTable(list);
}
@@ -127,13 +131,13 @@
/**
* 鏌ヨ鏈寕鎺ヤ笁涓�杞﹁締鐨�4.0鐢ㄦ埛
*/
- /*@PreAuthorize("@ss.hasPermi('sy:syUser:getSysUserNoSY')")
+ @PreAuthorize("@ss.hasPermi('sy:syUser:getSysUserNoSY')")
@GetMapping("/getSysUserNoSY")
@ApiOperation("鏌ヨ鏈寕鎺ヤ笁涓�杞﹁締鐨�4.0鐢ㄦ埛")
public AjaxResult getSysUserNoSY()
{
- //startPage();
+ startPage();
List<SysUser> list = ardSyUserService.getSysUserNoSY();
return success(list);
- }*/
+ }
}
--
Gitblit v1.9.3