From 0533bbabfe22484a84c85d13a391a1fd5cb949c2 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期二, 25 七月 2023 14:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java b/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
index 0659a99..fd62a92 100644
--- a/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
+++ b/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
@@ -2,13 +2,18 @@
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.device.hiksdk.config.MinioClientSingleton;
+import com.ruoyi.device.hiksdk.util.minio.MinioUtils;
import com.ruoyi.rongcloud.service.RongCloudService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* @Description:
@@ -20,15 +25,27 @@
@RestController
@Api(tags = "铻嶄簯鎺ュ彛")
@Anonymous
+@RequestMapping("/rongCloud")
public class RongCloudController {
@Resource
RongCloudService rongCloudService;
- @GetMapping("getToken")
+ @GetMapping("/getToken")
@ApiOperation("鑾峰彇token")
public AjaxResult getToken(String userId,String name)
{
String token = rongCloudService.getToken(userId, name);
return AjaxResult.success(token);
}
+
+
+
+ @PostMapping("/checkOnline")
+ @ApiOperation("鏌ヨ鐢ㄦ埛鍦ㄧ嚎鐘舵��")
+ public AjaxResult checkOnline(@RequestBody List<String> userIds)
+ {
+ Map map = rongCloudService.checkOnline(userIds);
+ return AjaxResult.success(map);
+ }
+
}
--
Gitblit v1.9.3