ids);
}
diff --git a/service/src/main/java/cn/bunny/services/service/MessageService.java b/service/src/main/java/cn/bunny/services/service/MessageService.java
index 165585e..dfed33f 100644
--- a/service/src/main/java/cn/bunny/services/service/MessageService.java
+++ b/service/src/main/java/cn/bunny/services/service/MessageService.java
@@ -1,7 +1,16 @@
package cn.bunny.services.service;
+import cn.bunny.dao.dto.system.message.MessageAddDto;
+import cn.bunny.dao.dto.system.message.MessageDto;
+import cn.bunny.dao.dto.system.message.MessageUpdateDto;
import cn.bunny.dao.entity.system.Message;
+import cn.bunny.dao.pojo.result.PageResult;
+import cn.bunny.dao.vo.system.message.MessageVo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import jakarta.validation.Valid;
+
+import java.util.List;
/**
*
@@ -9,8 +18,35 @@ import com.baomidou.mybatisplus.extension.service.IService;
*
*
* @author Bunny
- * @since 2024-10-30
+ * @since 2024-10-30 15:19:56
*/
public interface MessageService extends IService {
+ /**
+ * * 获取系统消息列表
+ *
+ * @return 系统消息返回列表
+ */
+ PageResult getMessageList(Page pageParams, MessageDto dto);
+
+ /**
+ * * 添加系统消息
+ *
+ * @param dto 添加表单
+ */
+ void addMessage(@Valid MessageAddDto dto);
+
+ /**
+ * * 更新系统消息
+ *
+ * @param dto 更新表单
+ */
+ void updateMessage(@Valid MessageUpdateDto dto);
+
+ /**
+ * * 删除|批量删除系统消息类型
+ *
+ * @param ids 删除id列表
+ */
+ void deleteMessage(List ids);
}
diff --git a/service/src/main/java/cn/bunny/services/service/UserService.java b/service/src/main/java/cn/bunny/services/service/UserService.java
index 662ae81..a30701e 100644
--- a/service/src/main/java/cn/bunny/services/service/UserService.java
+++ b/service/src/main/java/cn/bunny/services/service/UserService.java
@@ -3,10 +3,7 @@ package cn.bunny.services.service;
import cn.bunny.dao.dto.system.user.*;
import cn.bunny.dao.entity.system.AdminUser;
import cn.bunny.dao.pojo.result.PageResult;
-import cn.bunny.dao.vo.system.user.AdminUserVo;
-import cn.bunny.dao.vo.system.user.LoginVo;
-import cn.bunny.dao.vo.system.user.RefreshTokenVo;
-import cn.bunny.dao.vo.system.user.UserVo;
+import cn.bunny.dao.vo.system.user.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
@@ -108,7 +105,7 @@ public interface UserService extends IService {
* @param keyword 查询用户信息关键字
* @return 用户信息列表
*/
- List queryUser(String keyword);
+ List queryUser(String keyword);
/**
* * 修改用户状态
diff --git a/service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java
index 3e44e88..83a9135 100644
--- a/service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/impl/MessageServiceImpl.java
@@ -1,20 +1,92 @@
package cn.bunny.services.service.impl;
+import cn.bunny.dao.dto.system.message.MessageAddDto;
+import cn.bunny.dao.dto.system.message.MessageDto;
+import cn.bunny.dao.dto.system.message.MessageUpdateDto;
import cn.bunny.dao.entity.system.Message;
+import cn.bunny.dao.pojo.result.PageResult;
+import cn.bunny.dao.vo.system.message.MessageVo;
import cn.bunny.services.mapper.MessageMapper;
import cn.bunny.services.service.MessageService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jakarta.validation.Valid;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
*
* 系统消息 服务实现类
*
*
* @author Bunny
- * @since 2024-10-30
+ * @since 2024-10-30 15:19:56
*/
@Service
public class MessageServiceImpl extends ServiceImpl implements MessageService {
+ /**
+ * * 系统消息 服务实现类
+ *
+ * @param pageParams 系统消息分页查询page对象
+ * @param dto 系统消息分页查询对象
+ * @return 查询分页系统消息返回对象
+ */
+ @Override
+ public PageResult getMessageList(Page pageParams, MessageDto dto) {
+ // 分页查询菜单图标
+ IPage page = baseMapper.selectListByPage(pageParams, dto);
+
+ List voList = page.getRecords().stream().map(message -> {
+ MessageVo messageVo = new MessageVo();
+ BeanUtils.copyProperties(message, messageVo);
+ return messageVo;
+ }).toList();
+
+ return PageResult.builder()
+ .list(voList)
+ .pageNo(page.getCurrent())
+ .pageSize(page.getSize())
+ .total(page.getTotal())
+ .build();
+ }
+
+ /**
+ * 添加系统消息
+ *
+ * @param dto 系统消息添加
+ */
+ @Override
+ public void addMessage(@Valid MessageAddDto dto) {
+ // 保存数据
+ Message message = new Message();
+ BeanUtils.copyProperties(dto, message);
+ save(message);
+ }
+
+ /**
+ * 更新系统消息
+ *
+ * @param dto 系统消息更新
+ */
+ @Override
+ public void updateMessage(@Valid MessageUpdateDto dto) {
+ // 更新内容
+ Message message = new Message();
+ BeanUtils.copyProperties(dto, message);
+ updateById(message);
+ }
+
+ /**
+ * 删除|批量删除系统消息
+ *
+ * @param ids 删除id列表
+ */
+ @Override
+ public void deleteMessage(List ids) {
+ baseMapper.deleteBatchIdsWithPhysics(ids);
+ }
}
diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java
index 22013e5..e6f414b 100644
--- a/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java
+++ b/service/src/main/java/cn/bunny/services/service/impl/UserServiceImpl.java
@@ -18,10 +18,7 @@ import cn.bunny.dao.pojo.result.PageResult;
import cn.bunny.dao.pojo.result.ResultCodeEnum;
import cn.bunny.dao.view.ViewUserDept;
import cn.bunny.dao.vo.system.files.FileInfoVo;
-import cn.bunny.dao.vo.system.user.AdminUserVo;
-import cn.bunny.dao.vo.system.user.LoginVo;
-import cn.bunny.dao.vo.system.user.RefreshTokenVo;
-import cn.bunny.dao.vo.system.user.UserVo;
+import cn.bunny.dao.vo.system.user.*;
import cn.bunny.services.factory.EmailFactory;
import cn.bunny.services.factory.UserFactory;
import cn.bunny.services.mapper.*;
@@ -46,7 +43,6 @@ import org.springframework.util.DigestUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -284,12 +280,18 @@ public class UserServiceImpl extends ServiceImpl implemen
* @return 用户信息列表
*/
@Override
- public List queryUser(String keyword) {
- if (!StringUtils.hasText(keyword)) return new ArrayList<>();
+ public List queryUser(String keyword) {
+ if (!StringUtils.hasText(keyword)) {
+ return list(Page.of(1, 20), Wrappers.lambdaQuery().eq(AdminUser::getStatus, false)).stream().map(adminUser -> {
+ SearchUserinfoVo adminUserVo = new SearchUserinfoVo();
+ BeanUtils.copyProperties(adminUser, adminUserVo);
+ return adminUserVo;
+ }).toList();
+ }
List list = baseMapper.queryUser(keyword);
return list.stream().map(adminUser -> {
- AdminUserVo adminUserVo = new AdminUserVo();
+ SearchUserinfoVo adminUserVo = new SearchUserinfoVo();
BeanUtils.copyProperties(adminUser, adminUserVo);
return adminUserVo;
}).toList();
diff --git a/service/src/main/resources/mapper/MessageMapper.xml b/service/src/main/resources/mapper/MessageMapper.xml
index 9795c03..5936a84 100644
--- a/service/src/main/resources/mapper/MessageMapper.xml
+++ b/service/src/main/resources/mapper/MessageMapper.xml
@@ -5,22 +5,68 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- id, received_user_id, send_user_id, send_nick_name, message_type, content, editor_type, status, create_time, update_time, update_user, is_deleted
+ id, create_time, update_time, create_user, update_user, is_deleted, title, received_user_id, send_user_id, send_nick_name, message_type, content, editor_type, status
+
+
+
+
+
+ delete
+ from sys_message
+ where id in
+
+ #{id}
+
+
+