From 9437600612eb0243a3371ff1e4fa3689cce8c83a Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Sat, 29 Nov 2025 22:40:41 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/group/ImGroupController.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/group/ImGroupController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/group/ImGroupController.java
index 26dd46f..4011139 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/group/ImGroupController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/group/ImGroupController.java
@@ -12,8 +12,11 @@
import com.ruoyi.im.dto.UpdateUserBusinessDto;
import com.ruoyi.im.service.NeteaseTeamService;
import com.ruoyi.system.domain.NeteaseTeam;
+import com.ruoyi.system.domain.SystemConfiguration;
import com.ruoyi.system.domain.UserAccount;
+import com.ruoyi.system.domain.vo.GroupVo;
import com.ruoyi.system.domain.vo.UserAccountVo;
+import com.ruoyi.system.mapper.SystemConfigurationMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -43,30 +46,32 @@
@Autowired
NeteaseTeamService neteaseGroupService;
+
+ @Autowired
+ private SystemConfigurationMapper systemConfigurationMapper;
+
@Value("${file.upload-dir}")
private String uploadDir;
- @Value("${file.upload-prefix}")
- private String prefix;
/**
* 获取群组列表
*/
// @PreAuthorize("@ss.hasPermi('im:group:list')")
@GetMapping("/list")
- public TableDataInfo list(@PathVariable(value = "keyword", required = false) String keyword)
+ public TableDataInfo list(GroupVo vo)
{
// 创建查询条件包装器
LambdaQueryWrapper<NeteaseTeam> queryWrapper = new LambdaQueryWrapper<>();
// 只有当 keyword 不为空时才添加 OR 条件
- if (ObjectUtil.isNotEmpty(keyword)) {
+ if (ObjectUtil.isNotEmpty(vo.getKeywords())) {
queryWrapper.and(wrapper -> wrapper
- .eq(NeteaseTeam::getTid, keyword)
+ .eq(NeteaseTeam::getTid, vo.getKeywords())
.or()
- .eq(NeteaseTeam::getOwnerAccountId, keyword)
+ .eq(NeteaseTeam::getOwnerAccountId, vo.getKeywords())
.or()
- .eq(NeteaseTeam::getName,keyword)
+ .eq(NeteaseTeam::getName,vo.getKeywords())
);
}
@@ -123,6 +128,11 @@
public Result uploadFile(@RequestParam("file") MultipartFile file) {
try {
+ SystemConfiguration systemConfiguration = systemConfigurationMapper.selectById(1);
+ if(ObjectUtil.isEmpty(systemConfiguration)){
+ return Result.error("文件上传失败！");
+ }
+
// 1. 验证文件类型
String contentType = file.getContentType();
if (contentType == null ||
@@ -152,7 +162,7 @@
setPermissions(filePath.toFile(), "rw-r--r--");
// 5. 调用网易云信API更新头像
- fileName = prefix+"/"+fileName;
+ fileName = systemConfiguration.getImgUrl()+"/"+fileName;
return Result.success("文件上传成功",fileName);
} catch (IOException e) {
return Result.error("文件上传失败");
--
Gitblit v1.9.3