From 626bb3aa189053a742cf04f66929f2a54fc9695c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 04 七月 2024 15:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/service/impl/MessageServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/MessageServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/MessageServiceImpl.java
index dade01f..4576982 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/MessageServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/MessageServiceImpl.java
@@ -1,12 +1,12 @@
package com.ycl.jxkg.service.impl;
-import com.ycl.jxkg.domain.Message;
-import com.ycl.jxkg.domain.MessageUser;
-import com.ycl.jxkg.repository.MessageMapper;
-import com.ycl.jxkg.repository.MessageUserMapper;
+import com.ycl.jxkg.domain.entity.Message;
+import com.ycl.jxkg.domain.entity.MessageUser;
+import com.ycl.jxkg.mapper.MessageMapper;
+import com.ycl.jxkg.mapper.MessageUserMapper;
import com.ycl.jxkg.service.MessageService;
-import com.ycl.jxkg.viewmodel.admin.message.MessagePageRequestVM;
-import com.ycl.jxkg.viewmodel.student.user.MessageRequestVM;
+import com.ycl.jxkg.domain.vo.admin.message.MessagePageRequestVO;
+import com.ycl.jxkg.domain.vo.student.user.MessageRequestVO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,14 +34,14 @@
}
@Override
- public PageInfo<MessageUser> studentPage(MessageRequestVM requestVM) {
+ public PageInfo<MessageUser> studentPage(MessageRequestVO requestVM) {
return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
messageUserMapper.studentPage(requestVM)
);
}
@Override
- public PageInfo<Message> page(MessagePageRequestVM requestVM) {
+ public PageInfo<Message> page(MessagePageRequestVO requestVM) {
return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
messageMapper.page(requestVM)
);
@@ -55,7 +55,7 @@
@Override
@Transactional
public void sendMessage(Message message, List<MessageUser> messageUsers) {
- messageMapper.insertSelective(message);
+ messageMapper.insert(message);
messageUsers.forEach(d -> d.setMessageId(message.getId()));
messageUserMapper.inserts(messageUsers);
}
@@ -63,12 +63,12 @@
@Override
@Transactional
public void read(Integer id) {
- MessageUser messageUser = messageUserMapper.selectByPrimaryKey(id);
+ MessageUser messageUser = messageUserMapper.selectById(id);
if (messageUser.getReaded())
return;
messageUser.setReaded(true);
messageUser.setReadTime(new Date());
- messageUserMapper.updateByPrimaryKeySelective(messageUser);
+ messageUserMapper.updateById(messageUser);
messageMapper.readAdd(messageUser.getMessageId());
}
@@ -79,8 +79,8 @@
@Override
public Message messageDetail(Integer id) {
- MessageUser messageUser = messageUserMapper.selectByPrimaryKey(id);
- return messageMapper.selectByPrimaryKey(messageUser.getMessageId());
+ MessageUser messageUser = messageUserMapper.selectById(id);
+ return messageMapper.selectById(messageUser.getMessageId());
}
}
--
Gitblit v1.8.0