From 6814e626a7e0d55496d3ebbe7a9abb0f46db8e56 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 22 十二月 2023 13:29:11 +0800
Subject: [PATCH] 群组
---
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java | 14 ++++++++++----
ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java | 5 +++--
ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java | 6 ++----
3 files changed, 15 insertions(+), 10 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 5e07f0d..1fe7b25 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
@@ -50,15 +50,13 @@
@ApiOperation("缇ょ粍绠＄悊-鍒涘缓缇ょ粍")
public AjaxResult groupCreate(@RequestBody RongCloudGroupParam group)
{
- Map map = rongCloudService.groupCreate(group);
- return AjaxResult.success(map);
+ return rongCloudService.groupCreate(group);
}
@PostMapping("/groupDismiss")
@ApiOperation("缇ょ粍绠＄悊-瑙ｆ暎缇ょ粍")
public AjaxResult groupDismiss(@RequestBody RongCloudGroupDisParam groupDis)
{
- Map map = rongCloudService.groupDismiss(groupDis);
- return AjaxResult.success(map);
+ return rongCloudService.groupDismiss(groupDis);
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java b/ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
index 53cf4f2..3d2c334 100644
--- a/ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.rongcloud.service.Impl;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.rongcloud.domain.RongCloudGroupDisParam;
@@ -75,16 +76,21 @@
}
@Override
- public Map<String, Object> groupCreate(RongCloudGroupParam group) {
+ public AjaxResult groupCreate(RongCloudGroupParam group) {
group.setGroupId(String.valueOf(UUID.randomUUID()));
Map<String, Object> groupMap = rongCloudClient.groupCreate(getRongCloudHead(),group);
- return groupMap;
+ groupMap.put("userId",group.getGroupId());
+ groupMap.put("groupId",group.getGroupId());
+ groupMap.put("group",group.getGroupName());
+ return AjaxResult.success(groupMap);
}
@Override
- public Map<String, Object> groupDismiss(RongCloudGroupDisParam groupDis) {
+ public AjaxResult groupDismiss(RongCloudGroupDisParam groupDis) {
Map<String, Object> groupMap = rongCloudClient.groupDismiss(getRongCloudHead(),groupDis);
- return groupMap;
+ groupMap.put("groupId",groupDis.getGroupId());
+ groupMap.put("userId",groupDis.getUserId());
+ return AjaxResult.success(groupMap);
}
/**
diff --git a/ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java b/ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java
index 895ab5a..36dbc1b 100644
--- a/ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java
+++ b/ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java
@@ -1,5 +1,6 @@
package com.ruoyi.rongcloud.service;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.rongcloud.domain.RongCloudGroupDisParam;
import com.ruoyi.rongcloud.domain.RongCloudGroupParam;
@@ -19,6 +20,6 @@
Map<String,Object> checkOnline(List<String>userIds);
Boolean checkOnline(String userId);
- Map<String,Object> groupCreate(RongCloudGroupParam group);
- Map<String,Object> groupDismiss(RongCloudGroupDisParam groupDis);
+ AjaxResult groupCreate(RongCloudGroupParam group);
+ AjaxResult groupDismiss(RongCloudGroupDisParam groupDis);
}
--
Gitblit v1.9.3