From 2118a0969c631a5aaaec5e97693cfcf763b401f5 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 22 八月 2023 14:19:45 +0800
Subject: [PATCH] 获取封控圈内所有在线app用户改app单兵端
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java | 5 ++---
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java | 2 ++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
index a9d10ef..04f65db 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
@@ -145,6 +145,7 @@
SysUser user = new SysUser();
user.setDeptId(deptId);
+ user.setAppUserType("1");
List<SysUser> appUserList = iSysUserService.selectAllAppUserList(user);
//杩囨护鍦ㄧ嚎
List<SysUser> onLineList = appUserList.stream()
@@ -188,6 +189,7 @@
SysUser user = new SysUser();
user.setDeptId(deptId);
+ user.setAppUserType("1");
List<SysUser> appUserList = iSysUserService.selectAllAppUserList(user);
//杩囨护鍦ㄧ嚎
List<SysUser> onLineList = appUserList.stream()
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
index 5c35e6d..1471f3a 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.common.annotation.SdkOperate;
import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.channel.domain.ArdChannel;
@@ -1149,9 +1150,7 @@
byte[] array = jpegBuffer.array();
//瀛樺偍鍒癿inio
String BucketName = "pic";
- String uuid = UUID.randomUUID().toString().replace("-", "");
- String time = new SimpleDateFormat("yyyyMMdd").format(new Date());
- String ObjectName = time + "/" + uuid + ".jpeg";
+ String ObjectName = "capture/" + IdUtils.simpleUUID() + ".jpeg";
String ContentType = "image/JPEG";
InputStream input = new ByteArrayInputStream(array);
String url = "";
--
Gitblit v1.9.3