From ba5ba480cef0788a50d9543d4cb3d7c5046243c8 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 25 Aug 2025 23:35:53 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java | 1 +
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountVo.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountUpdateVo.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/im/out/UserAccountOut.java | 2 ++
ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/NeteaseTeamServiceImpl.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java | 12 ++++++------
6 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
index 9bd8f0e..6def4d9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
@@ -125,6 +125,7 @@
return Result.error("账号不存在！");
}
userAccount.setLoginIp(clientIp);
+ userAccount.setLoginTime(new Date());
userAccountService.updateById(userAccount);
return Result.success();
}catch (Exception e){
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/out/UserAccountOut.java b/ruoyi-admin/src/main/java/com/ruoyi/im/out/UserAccountOut.java
index 412cf1a..cce30c5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/out/UserAccountOut.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/out/UserAccountOut.java
@@ -43,4 +43,6 @@
// 个性签名
private String signature;
+ private Date createTime;
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java
index 21eb1a9..3019413 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/ImApiServcieImpl.java
@@ -1,9 +1,11 @@
package com.ruoyi.im.service.impl;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.netease.nim.server.sdk.core.BizName;
import com.netease.nim.server.sdk.core.YunxinApiHttpClient;
@@ -292,7 +294,6 @@
UpdateUserInfoRequest requestBody = new UpdateUserInfoRequest(dto.getAvatar(),
dto.getName(),dto.getSign(),dto.getEmail(),dto.getMobile());
String jsonBody = objectMapper.writeValueAsString(requestBody);
-// String jsonBody = objectMapper.writeValueAsString(body);
httpPatch.setEntity(new StringEntity(jsonBody, StandardCharsets.UTF_8));
// 执行请求
@@ -370,6 +371,7 @@
if (StringUtils.isNotBlank(vo.getSignature())) {
userAccount.setSignature(vo.getSignature());
}
+ userAccount.setStatus(vo.getStatus());
userAccount.setUpdateTime(new Date());
userAccountService.updateById(userAccount);
}else{
@@ -410,16 +412,14 @@
// 创建构建器实例
DynamicRequestBodyBuilder builder = new DynamicRequestBodyBuilder();
- if(null != vo.getStatus() && vo.getStatus() == 0){
+ if(null != vo.getStatus() && vo.getStatus() == 1){
builder.setEnabled(false);
builder.setNeedKick(true);
- }
- if(StringUtils.isNotEmpty(vo.getPassword())){
+ }else if(StringUtils.isNotEmpty(vo.getPassword())){
builder.setToken(vo.getPassword());
}
// 只设置需要的字段
- String body = builder.build();
- String jsonBody = objectMapper.writeValueAsString(body);
+ String jsonBody = builder.build();
httpPatch.setEntity(new StringEntity(jsonBody, StandardCharsets.UTF_8));
// 执行请求
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/NeteaseTeamServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/NeteaseTeamServiceImpl.java
index c428597..61cc05e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/NeteaseTeamServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/service/impl/NeteaseTeamServiceImpl.java
@@ -284,7 +284,7 @@
List<String> inviteAccountIds = new ArrayList<>();
- if(ObjectUtil.isNotEmpty(request.getNumber()) && request.getNumber() > 0){
+ if(ObjectUtil.isEmpty(request.getInviteAccountIds()) && ObjectUtil.isNotEmpty(request.getNumber()) && request.getNumber() > 0){
Result result = imApiServcie.batchRegister(request.getNumber());
if(result.getCode() != 200){
return AjaxResult.error("生成账号错误！");
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountUpdateVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountUpdateVo.java
index 75ccda8..20c3522 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountUpdateVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountUpdateVo.java
@@ -37,7 +37,7 @@
// 昵称
private String nickname;
- // 账号状态: 1:正常 0:禁用
+ // 账号状态: 0:正常 1:禁用
private Integer status;
// 个性签名
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountVo.java
index fdbc29d..dc49423 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserAccountVo.java
@@ -36,7 +36,7 @@
// 昵称
private String nickname;
- // 账号状态: 0:正常 1:禁用
+ // 账号状态: 1:正常 0:禁用
private Integer status;
// 最近登录时间
--
Gitblit v1.9.3