GoCo/OL-LearnPlatform-Backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev2' into dev2

Browse Source
This commit is contained in:
Lqc 2025-09-23 11:03:38 +08:00
commit 319f57419f
5 changed files with 444 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
jeecg-boot/jeecg-boot-module/jeecg-module-aiol/src/main/java/org/jeecg/modules/aiol/controller/AiolChatController.java
View File

@ -1,5 +1,6 @@
package org.jeecg.modules.aiol.controller; package org.jeecg.modules.aiol.controller;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -33,6 +34,7 @@ import org.jeecg.modules.system.mapper.SysUserRoleMapper;
import org.jeecg.modules.aiol.constant.RoleConst; import org.jeecg.modules.aiol.constant.RoleConst;
import org.jeecg.modules.aiol.service.IAiolChatService; import org.jeecg.modules.aiol.service.IAiolChatService;
import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.entity.SysUserRole;
import org.jeecg.modules.system.mapper.SysUserMapper; import org.jeecg.modules.system.mapper.SysUserMapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -56,13 +58,14 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
/**
* @Description: 会话 * @Description: 会话
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2025-09-11 * @Date: 2025-09-11
* @Version: V1.0 * @Version: V1.0
*/ */
@Tag(name="会话") @Tag(name = "会话")
@RestController @RestController
@RequestMapping("/aiol/aiolChat") @RequestMapping("/aiol/aiolChat")
@Slf4j @Slf4j
@ -100,15 +103,14 @@ public class AiolChatController extends JeecgController<AiolChat, IAiolChatServi
* @param req * @param req
* @return * @return
*/ */
//@AutoLog(value = "会话-分页列表查询") // @AutoLog(value = "会话-分页列表查询")
@Operation(summary="会话-分页列表查询") @Operation(summary = "会话-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<AiolChat>> queryPageList(AiolChat aiolChat, public Result<IPage<AiolChat>> queryPageList(AiolChat aiolChat,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<AiolChat> queryWrapper = QueryGenerator.initQueryWrapper(aiolChat, req.getParameterMap()); QueryWrapper<AiolChat> queryWrapper = QueryGenerator.initQueryWrapper(aiolChat, req.getParameterMap());
Page<AiolChat> page = new Page<AiolChat>(pageNo, pageSize); Page<AiolChat> page = new Page<AiolChat>(pageNo, pageSize);
IPage<AiolChat> pageList = aiolChatService.page(page, queryWrapper); IPage<AiolChat> pageList = aiolChatService.page(page, queryWrapper);
@ -122,7 +124,7 @@ public class AiolChatController extends JeecgController<AiolChat, IAiolChatServi
* @return * @return
*/ */
@AutoLog(value = "会话-添加") @AutoLog(value = "会话-添加")
@Operation(summary="会话-添加") @Operation(summary = "会话-添加")
@RequiresPermissions("aiol:aiol_chat:add") @RequiresPermissions("aiol:aiol_chat:add")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<String> add(@RequestBody AiolChat aiolChat) { public Result<String> add(@RequestBody AiolChat aiolChat) {
@ -138,9 +140,9 @@ public class AiolChatController extends JeecgController<AiolChat, IAiolChatServi
* @return * @return
*/ */
@AutoLog(value = "会话-编辑") @AutoLog(value = "会话-编辑")
@Operation(summary="会话-编辑") @Operation(summary = "会话-编辑")
@RequiresPermissions("aiol:aiol_chat:edit") @RequiresPermissions("aiol:aiol_chat:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
public Result<String> edit(@RequestBody AiolChat aiolChat) { public Result<String> edit(@RequestBody AiolChat aiolChat) {
aiolChatService.updateById(aiolChat); aiolChatService.updateById(aiolChat);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
@ -153,10 +155,10 @@ public class AiolChatController extends JeecgController<AiolChat, IAiolChatServi
* @return * @return
*/ */
@AutoLog(value = "会话-通过id删除") @AutoLog(value = "会话-通过id删除")
@Operation(summary="会话-通过id删除") @Operation(summary = "会话-通过id删除")
@RequiresPermissions("aiol:aiol_chat:delete") @RequiresPermissions("aiol:aiol_chat:delete")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) { public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
aiolChatService.removeById(id); aiolChatService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
@ -168,10 +170,10 @@ public class AiolChatController extends JeecgController<AiolChat, IAiolChatServi
* @return * @return
*/ */
@AutoLog(value = "会话-批量删除") @AutoLog(value = "会话-批量删除")
@Operation(summary="会话-批量删除") @Operation(summary = "会话-批量删除")
@RequiresPermissions("aiol:aiol_chat:deleteBatch") @RequiresPermissions("aiol:aiol_chat:deleteBatch")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.aiolChatService.removeByIds(Arrays.asList(ids.split(","))); this.aiolChatService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
@ -182,12 +184,12 @@ public class AiolChatController extends JeecgController<AiolChat, IAiolChatServi
* @param id * @param id
* @return * @return
*/ */
//@AutoLog(value = "会话-通过id查询") // @AutoLog(value = "会话-通过id查询")
@Operation(summary="会话-通过id查询") @Operation(summary = "会话-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<AiolChat> queryById(@RequestParam(name="id",required=true) String id) { public Result<AiolChat> queryById(@RequestParam(name = "id", required = true) String id) {
AiolChat aiolChat = aiolChatService.getById(id); AiolChat aiolChat = aiolChatService.getById(id);
if(aiolChat==null) { if (aiolChat == null) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
} }
return Result.OK(aiolChat); return Result.OK(aiolChat);
@ -298,6 +300,10 @@ public class AiolChatController extends JeecgController<AiolChat, IAiolChatServi
return Result.OK(new java.util.ArrayList<>()); return Result.OK(new java.util.ArrayList<>());
} }
// 将成员列表按userId建立映射，便于取出member相关字段
Map<String, AiolChatMember> userIdToMemberMap = chatMembers.stream()
.collect(Collectors.toMap(AiolChatMember::getUserId, m -> m, (a, b) -> a));
// 2. 提取用户ID列表 // 2. 提取用户ID列表
List<String> userIds = chatMembers.stream() List<String> userIds = chatMembers.stream()
.map(AiolChatMember::getUserId) .map(AiolChatMember::getUserId)
@ -307,17 +313,17 @@ public class AiolChatController extends JeecgController<AiolChat, IAiolChatServi
List<SysUser> userList = sysUserMapper.selectByIds(userIds); List<SysUser> userList = sysUserMapper.selectByIds(userIds);
// 4. 查询所有用户的教师角色身份 // 4. 查询所有用户的教师角色身份
Map<String, Boolean> teacherStatusMap = new java.util.HashMap<>(); Map<String, Boolean> teacherStatusMap = new HashMap<>();
if (!userIds.isEmpty()) { if (!userIds.isEmpty()) {
try { try {
QueryWrapper<org.jeecg.modules.system.entity.SysUserRole> roleWrapper = new QueryWrapper<>(); QueryWrapper<SysUserRole> roleWrapper = new QueryWrapper<>();
roleWrapper.eq("role_id", RoleConst.TEACHER_ROLE_ID) roleWrapper.eq("role_id", RoleConst.TEACHER_ROLE_ID)
.in("user_id", userIds); .in("user_id", userIds);
List<org.jeecg.modules.system.entity.SysUserRole> teacherRoleList = sysUserRoleMapper.selectList(roleWrapper); List<SysUserRole> teacherRoleList = sysUserRoleMapper.selectList(roleWrapper);
// 构建教师身份映射 // 构建教师身份映射
for (org.jeecg.modules.system.entity.SysUserRole userRole : teacherRoleList) { for (SysUserRole userRole : teacherRoleList) {
teacherStatusMap.put(userRole.getUserId(), true); teacherStatusMap.put(userRole.getUserId(), true);
} }
} catch (Exception e) { } catch (Exception e) {
@ -326,9 +332,9 @@ public class AiolChatController extends JeecgController<AiolChat, IAiolChatServi
} }
// 5. 构建返回结果 // 5. 构建返回结果
List<Map<String, Object>> result = new java.util.ArrayList<>(); List<Map<String, Object>> result = new ArrayList<>();
for (SysUser user : userList) { for (SysUser user : userList) {
Map<String, Object> memberInfo = new java.util.HashMap<>(); Map<String, Object> memberInfo = new HashMap<>();
memberInfo.put("id", user.getId()); memberInfo.put("id", user.getId());
memberInfo.put("realname", user.getRealname()); memberInfo.put("realname", user.getRealname());
memberInfo.put("avatar", user.getAvatar()); memberInfo.put("avatar", user.getAvatar());
@ -343,6 +349,15 @@ public class AiolChatController extends JeecgController<AiolChat, IAiolChatServi
memberInfo.put("email", user.getEmail()); memberInfo.put("email", user.getEmail());
memberInfo.put("sex", user.getSex()); memberInfo.put("sex", user.getSex());
// 新增：返回aiol_chat_member表中的角色与设置字段
AiolChatMember member = userIdToMemberMap.get(user.getId());
if (member != null) {
memberInfo.put("role", member.getRole());
memberInfo.put("izMuted", member.getIzMuted());
memberInfo.put("izNotDisturb", member.getIzNotDisturb());
memberInfo.put("lastReadMsgId", member.getLastReadMsgId());
}
result.add(memberInfo); result.add(memberInfo);
} }
@ -410,20 +425,24 @@ public class AiolChatController extends JeecgController<AiolChat, IAiolChatServi
// 添加发送者信息 // 添加发送者信息
SysUser sender = senderMap.get(message.getSenderId()); SysUser sender = senderMap.get(message.getSenderId());
if (sender != null) { if (sender != null) {
messageInfo.put("senderInfo", new java.util.HashMap<String, Object>() {{ messageInfo.put("senderInfo", new java.util.HashMap<String, Object>() {
{
put("id", sender.getId()); put("id", sender.getId());
put("realname", sender.getRealname()); put("realname", sender.getRealname());
put("avatar", sender.getAvatar()); put("avatar", sender.getAvatar());
put("username", sender.getUsername()); put("username", sender.getUsername());
}}); }
});
} else { } else {
// 如果找不到发送者信息，设置默认值 // 如果找不到发送者信息，设置默认值
messageInfo.put("senderInfo", new java.util.HashMap<String, Object>() {{ messageInfo.put("senderInfo", new java.util.HashMap<String, Object>() {
{
put("id", message.getSenderId()); put("id", message.getSenderId());
put("realname", "未知用户"); put("realname", "未知用户");
put("avatar", ""); put("avatar", "");
put("username", ""); put("username", "");
}}); }
});
} }
result.add(messageInfo); result.add(messageInfo);
@ -708,7 +727,8 @@ public class AiolChatController extends JeecgController<AiolChat, IAiolChatServi
* @param operationName 操作名称 * @param operationName 操作名称
* @return * @return
*/ */
private Result<String> updateMemberSetting(String chatId, String userId, String fieldName, Integer value, String operationName) { private Result<String> updateMemberSetting(String chatId, String userId, String fieldName, Integer value,
String operationName) {
// 1. 查询群聊成员是否存在 // 1. 查询群聊成员是否存在
QueryWrapper<AiolChatMember> memberWrapper = new QueryWrapper<>(); QueryWrapper<AiolChatMember> memberWrapper = new QueryWrapper<>();
memberWrapper.eq("chat_id", chatId).eq("user_id", userId); memberWrapper.eq("chat_id", chatId).eq("user_id", userId);
@ -739,12 +759,14 @@ public class AiolChatController extends JeecgController<AiolChat, IAiolChatServi
/** /**
* 将AiolChat转换为包含未读消息数的DTO * 将AiolChat转换为包含未读消息数的DTO
*
* @param chat 会话实体 * @param chat 会话实体
* @param chatMembers 会话成员列表 * @param chatMembers 会话成员列表
* @param userId 当前用户ID * @param userId 当前用户ID
* @return 包含未读消息数的DTO * @return 包含未读消息数的DTO
*/ */
private ChatWithUnreadCountDTO convertToChatWithUnreadCount(AiolChat chat, List<AiolChatMember> chatMembers, String userId) { private ChatWithUnreadCountDTO convertToChatWithUnreadCount(AiolChat chat, List<AiolChatMember> chatMembers,
String userId) {
ChatWithUnreadCountDTO chatDTO = new ChatWithUnreadCountDTO(); ChatWithUnreadCountDTO chatDTO = new ChatWithUnreadCountDTO();
// 复制基本属性 // 复制基本属性

6
jeecg-boot/jeecg-boot-module/jeecg-module-aiol/src/main/java/org/jeecg/modules/aiol/controller/AiolChatMemberController.java
View File

@ -11,11 +11,16 @@ import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.aiol.entity.AiolChatMember; import org.jeecg.modules.aiol.entity.AiolChatMember;
import org.jeecg.modules.aiol.entity.AiolChatMessage;
import org.jeecg.modules.aiol.service.IAiolChatMemberService; import org.jeecg.modules.aiol.service.IAiolChatMemberService;
import org.jeecg.modules.aiol.service.IAiolChatMessageService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -27,6 +32,7 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

111
jeecg-boot/jeecg-boot-module/jeecg-module-aiol/src/main/java/org/jeecg/modules/aiol/controller/AiolChatMessageController.java
View File

@ -13,8 +13,12 @@ import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.aiol.entity.AiolChatMember;
import org.jeecg.modules.aiol.entity.AiolChatMessage; import org.jeecg.modules.aiol.entity.AiolChatMessage;
import org.jeecg.modules.aiol.service.IAiolChatMemberService;
import org.jeecg.modules.aiol.service.IAiolChatMessageService; import org.jeecg.modules.aiol.service.IAiolChatMessageService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -27,6 +31,7 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -37,14 +42,16 @@ import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
/**
* @Description: 会话消息 * @Description: 会话消息
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2025-09-11 * @Date: 2025-09-11
* @Version: V1.0 * @Version: V1.0
*/ */
@Tag(name="会话消息") @Tag(name = "会话消息")
@RestController @RestController
@RequestMapping("/aiol/aiolChatMessage") @RequestMapping("/aiol/aiolChatMessage")
@Slf4j @Slf4j
@ -52,6 +59,11 @@ public class AiolChatMessageController extends JeecgController<AiolChatMessage,
@Autowired @Autowired
private IAiolChatMessageService aiolChatMessageService; private IAiolChatMessageService aiolChatMessageService;
@Autowired
private ISysBaseAPI sysBaseApi;
@Autowired
private IAiolChatMemberService aiolChatMemberService;
/** /**
* 分页列表查询 * 分页列表查询
* *
@ -61,16 +73,16 @@ public class AiolChatMessageController extends JeecgController<AiolChatMessage,
* @param req * @param req
* @return * @return
*/ */
//@AutoLog(value = "会话消息-分页列表查询") // @AutoLog(value = "会话消息-分页列表查询")
@Operation(summary="会话消息-分页列表查询") @Operation(summary = "会话消息-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<AiolChatMessage>> queryPageList(AiolChatMessage aiolChatMessage, public Result<IPage<AiolChatMessage>> queryPageList(AiolChatMessage aiolChatMessage,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<AiolChatMessage> queryWrapper = QueryGenerator.initQueryWrapper(aiolChatMessage,
QueryWrapper<AiolChatMessage> queryWrapper = QueryGenerator.initQueryWrapper(aiolChatMessage, req.getParameterMap()); req.getParameterMap());
Page<AiolChatMessage> page = new Page<AiolChatMessage>(pageNo, pageSize); Page<AiolChatMessage> page = new Page<AiolChatMessage>(pageNo, pageSize);
IPage<AiolChatMessage> pageList = aiolChatMessageService.page(page, queryWrapper); IPage<AiolChatMessage> pageList = aiolChatMessageService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
@ -83,13 +95,12 @@ public class AiolChatMessageController extends JeecgController<AiolChatMessage,
* @return * @return
*/ */
@AutoLog(value = "会话消息-添加") @AutoLog(value = "会话消息-添加")
@Operation(summary="会话消息-添加") @Operation(summary = "会话消息-添加")
@RequiresPermissions("aiol:aiol_chat_message:add")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<String> add(@RequestBody AiolChatMessage aiolChatMessage) { public Result<String> add(@RequestBody AiolChatMessage aiolChatMessage) {
aiolChatMessageService.save(aiolChatMessage); aiolChatMessageService.save(aiolChatMessage);
return Result.OK("添加成功！"); return Result.OK(aiolChatMessage.getId());
} }
/** /**
@ -99,9 +110,9 @@ public class AiolChatMessageController extends JeecgController<AiolChatMessage,
* @return * @return
*/ */
@AutoLog(value = "会话消息-编辑") @AutoLog(value = "会话消息-编辑")
@Operation(summary="会话消息-编辑") @Operation(summary = "会话消息-编辑")
@RequiresPermissions("aiol:aiol_chat_message:edit") @RequiresPermissions("aiol:aiol_chat_message:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
public Result<String> edit(@RequestBody AiolChatMessage aiolChatMessage) { public Result<String> edit(@RequestBody AiolChatMessage aiolChatMessage) {
aiolChatMessageService.updateById(aiolChatMessage); aiolChatMessageService.updateById(aiolChatMessage);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
@ -114,10 +125,10 @@ public class AiolChatMessageController extends JeecgController<AiolChatMessage,
* @return * @return
*/ */
@AutoLog(value = "会话消息-通过id删除") @AutoLog(value = "会话消息-通过id删除")
@Operation(summary="会话消息-通过id删除") @Operation(summary = "会话消息-通过id删除")
@RequiresPermissions("aiol:aiol_chat_message:delete") @RequiresPermissions("aiol:aiol_chat_message:delete")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) { public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
aiolChatMessageService.removeById(id); aiolChatMessageService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
} }
@ -129,10 +140,10 @@ public class AiolChatMessageController extends JeecgController<AiolChatMessage,
* @return * @return
*/ */
@AutoLog(value = "会话消息-批量删除") @AutoLog(value = "会话消息-批量删除")
@Operation(summary="会话消息-批量删除") @Operation(summary = "会话消息-批量删除")
@RequiresPermissions("aiol:aiol_chat_message:deleteBatch") @RequiresPermissions("aiol:aiol_chat_message:deleteBatch")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.aiolChatMessageService.removeByIds(Arrays.asList(ids.split(","))); this.aiolChatMessageService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!"); return Result.OK("批量删除成功!");
} }
@ -143,12 +154,12 @@ public class AiolChatMessageController extends JeecgController<AiolChatMessage,
* @param id * @param id
* @return * @return
*/ */
//@AutoLog(value = "会话消息-通过id查询") // @AutoLog(value = "会话消息-通过id查询")
@Operation(summary="会话消息-通过id查询") @Operation(summary = "会话消息-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<AiolChatMessage> queryById(@RequestParam(name="id",required=true) String id) { public Result<AiolChatMessage> queryById(@RequestParam(name = "id", required = true) String id) {
AiolChatMessage aiolChatMessage = aiolChatMessageService.getById(id); AiolChatMessage aiolChatMessage = aiolChatMessageService.getById(id);
if(aiolChatMessage==null) { if (aiolChatMessage == null) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
} }
return Result.OK(aiolChatMessage); return Result.OK(aiolChatMessage);
@ -179,4 +190,62 @@ public class AiolChatMessageController extends JeecgController<AiolChatMessage,
return super.importExcel(request, response, AiolChatMessage.class); return super.importExcel(request, response, AiolChatMessage.class);
} }
/**
* 发送消息
* 前端传递 chat_id、content、message_type、file_url，sender_id 从token获取
*/
@AutoLog(value = "会话用户-发送消息")
@Operation(summary = "会话用户-发送消息", description = "发送会话消息，sender_id从token获取")
@PostMapping(value = "/send")
public Result<String> sendMessage(@RequestBody Map<String, Object> body, HttpServletRequest request) {
try {
// 1. 从token获取当前用户
String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
if (token == null || token.trim().isEmpty()) {
return Result.error("用户未登录");
}
String username = JwtUtil.getUsername(token);
LoginUser sysUser = sysBaseApi.getUserByName(username);
if (sysUser == null) {
return Result.error("用户信息不存在");
}
// 2. 解析参数
String chatId = body.get("chat_id") != null ? String.valueOf(body.get("chat_id")) : null;
String content = body.get("content") != null ? String.valueOf(body.get("content")) : null;
Integer messageType = body.get("message_type") != null
? Integer.parseInt(String.valueOf(body.get("message_type")))
: 0;
String fileUrl = body.get("file_url") != null ? String.valueOf(body.get("file_url")) : null;
if (chatId == null || chatId.trim().isEmpty()) {
return Result.error("chat_id不能为空");
}
// 3. 校验用户是否在该会话中
QueryWrapper<AiolChatMember> memberWrapper = new QueryWrapper<>();
memberWrapper.eq("chat_id", chatId).eq("user_id", sysUser.getId());
AiolChatMember chatMember = aiolChatMemberService.getOne(memberWrapper);
if (chatMember == null) {
return Result.error("您不是该会话的成员");
}
// 4. 组装消息并保存
AiolChatMessage message = new AiolChatMessage();
message.setChatId(chatId);
message.setSenderId(sysUser.getId());
message.setContent(content);
message.setMessageType(messageType);
message.setStatus(0);
message.setFileUrl(fileUrl);
aiolChatMessageService.save(message);
log.info("用户 {} 在会话 {} 发送消息成功, messageId={}", username, chatId, message.getId());
return Result.OK(message.getId());
} catch (Exception e) {
log.error("发送消息失败: error={}", e.getMessage(), e);
return Result.error("发送消息失败: " + e.getMessage());
}
}
} }

45
jeecg-boot/jeecg-boot-module/jeecg-module-aiol/src/main/java/org/jeecg/modules/aiol/controller/AiolCourseSectionController.java
View File

@ -105,17 +105,14 @@ public class AiolCourseSectionController extends JeecgController<AiolCourseSecti
// 2. 处理资源关联 // 2. 处理资源关联
if (sectionDTO.getTargetId() != null && !sectionDTO.getTargetId().trim().isEmpty() && if (sectionDTO.getTargetId() != null && !sectionDTO.getTargetId().trim().isEmpty() &&
sectionDTO.getTargetType() != null && !sectionDTO.getTargetType().trim().isEmpty()) { sectionDTO.getType() != null) {
AiolEntityLink entityLink = new AiolEntityLink(); aiolEntityLinkService.save(
entityLink.setSourceType("course_section"); EntityLinkConst.SourceType.COURSE_SECTION,
entityLink.setSourceId(sectionDTO.getId()); sectionDTO.getId(),
entityLink.setTargetType(sectionDTO.getTargetType()); getTargetType(sectionDTO.getType()),
entityLink.setTargetId(sectionDTO.getTargetId()); sectionDTO.getTargetId()
entityLink.setCreateBy(sectionDTO.getCreateBy()); );
entityLink.setCreateTime(new Date());
aiolEntityLinkMapper.insert(entityLink);
} }
return Result.OK(sectionDTO.getId()); return Result.OK(sectionDTO.getId());
@ -125,6 +122,25 @@ public class AiolCourseSectionController extends JeecgController<AiolCourseSecti
} }
} }
private String getTargetType(Integer type) {
switch (type) {
case 0:
return EntityLinkConst.TargetType.RESOURCE;
case 1:
return EntityLinkConst.TargetType.RESOURCE;
case 2:
return EntityLinkConst.TargetType.EXAM;
case 3:
return EntityLinkConst.TargetType.HOMEWORK;
case 4:
return EntityLinkConst.TargetType.EXAM;
case 5:
return EntityLinkConst.TargetType.DISCUSSION;
default:
return null;
}
}
/** /**
* 编辑 * 编辑
* *
@ -143,7 +159,7 @@ public class AiolCourseSectionController extends JeecgController<AiolCourseSecti
// 2. 处理资源关联更新 // 2. 处理资源关联更新
if (sectionDTO.getTargetId() != null && !sectionDTO.getTargetId().trim().isEmpty() && if (sectionDTO.getTargetId() != null && !sectionDTO.getTargetId().trim().isEmpty() &&
sectionDTO.getTargetType() != null && !sectionDTO.getTargetType().trim().isEmpty()) { sectionDTO.getType() != null) {
// 先删除旧的关联关系 // 先删除旧的关联关系
QueryWrapper<AiolEntityLink> deleteWrapper = new QueryWrapper<>(); QueryWrapper<AiolEntityLink> deleteWrapper = new QueryWrapper<>();
@ -152,7 +168,12 @@ public class AiolCourseSectionController extends JeecgController<AiolCourseSecti
aiolEntityLinkMapper.delete(deleteWrapper); aiolEntityLinkMapper.delete(deleteWrapper);
// 创建新的关联关系 // 创建新的关联关系
aiolEntityLinkService.save(EntityLinkConst.SourceType.COURSE_SECTION, sectionDTO.getId(), sectionDTO.getTargetType(), sectionDTO.getTargetId()); aiolEntityLinkService.save(
EntityLinkConst.SourceType.COURSE_SECTION,
sectionDTO.getId(),
getTargetType(sectionDTO.getType()),
sectionDTO.getTargetId()
);
} else { } else {
// 如果没有提供资源信息，删除所有关联关系 // 如果没有提供资源信息，删除所有关联关系
QueryWrapper<AiolEntityLink> deleteWrapper = new QueryWrapper<>(); QueryWrapper<AiolEntityLink> deleteWrapper = new QueryWrapper<>();

6
jeecg-boot/jeecg-boot-module/jeecg-module-aiol/src/main/java/org/jeecg/modules/aiol/dto/AiolCourseSectionDTO.java
View File

@ -21,10 +21,4 @@ public class AiolCourseSectionDTO extends AiolCourseSection {
*/ */
@Schema(description = "资源ID") @Schema(description = "资源ID")
private String targetId; private String targetId;
/**
* 资源类型
*/
@Schema(description = "资源类型")
private String targetType;
} }