From 4a2eea196bbd16ea4237bdc25e5fd501e24e6049 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 31 五月 2024 17:03:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java | 39 ++++++++++++---------------------------
1 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
index 08e7159..f661eaf 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
@@ -1,15 +1,16 @@
package com.ycl.jxkg.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.exception.BusinessException;
-import com.ycl.jxkg.domain.User;
+import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.event.OnRegistrationCompleteEvent;
-import com.ycl.jxkg.repository.UserMapper;
+import com.ycl.jxkg.mapper.UserMapper;
import com.ycl.jxkg.service.UserService;
-import com.ycl.jxkg.viewmodel.admin.user.UserPageRequestVM;
+import com.ycl.jxkg.vo.admin.user.UserPageRequestVO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -20,47 +21,31 @@
@Service
-public class UserServiceImpl extends BaseServiceImpl<User> implements UserService {
+@RequiredArgsConstructor
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
private final UserMapper userMapper;
private final ApplicationEventPublisher eventPublisher;
- @Autowired
- public UserServiceImpl(UserMapper userMapper, ApplicationEventPublisher eventPublisher) {
- super(userMapper);
- this.userMapper = userMapper;
- this.eventPublisher = eventPublisher;
- }
-
- @Override
public List<User> getUsers() {
return userMapper.getAllUser();
}
- @Override
public User getUserById(Integer id) {
return userMapper.getUserById(id);
}
- @Override
public User getUserByUserName(String username) {
return userMapper.getUserByUserName(username);
}
- @Override
public int insertByFilter(User record) {
- return super.insertByFilter(record);
+ return baseMapper.insert(record);
}
- @Override
public int updateByIdFilter(User record) {
- return super.updateByIdFilter(record);
- }
-
- @Override
- public int updateById(User record) {
- return super.updateById(record);
+ return baseMapper.updateById(record);
}
@Override
@@ -91,7 +76,7 @@
@Override
- public PageInfo<User> userPage(UserPageRequestVM requestVM) {
+ public PageInfo<User> userPage(UserPageRequestVO requestVM) {
return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
userMapper.userPage(requestVM)
);
@@ -100,7 +85,7 @@
@Override
public void insertUser(User user) {
- userMapper.insertSelective(user);
+ userMapper.insert(user);
eventPublisher.publishEvent(new OnRegistrationCompleteEvent(user));
}
@@ -155,6 +140,6 @@
User changePictureUser = new User();
changePictureUser.setId(user.getId());
changePictureUser.setImagePath(imagePath);
- userMapper.updateByPrimaryKeySelective(changePictureUser);
+ userMapper.updateById(changePictureUser);
}
}
--
Gitblit v1.8.0