From aa638475e955207a5d5f76f9ec99415b5a18f5db Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 25 八月 2022 12:30:32 +0800
Subject: [PATCH] update 同步 ruoyi 新功能
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java | 56 +++++++++++++++++++++++++++++---------------------------
1 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
index 9681b3d..7e2a56c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
@@ -1,18 +1,19 @@
package com.ruoyi.system.service.impl;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.mapper.SysPostMapper;
import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.system.service.ISysPostService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Arrays;
@@ -23,19 +24,21 @@
*
* @author Lion Li
*/
+@RequiredArgsConstructor
@Service
-public class SysPostServiceImpl extends ServicePlusImpl<SysPostMapper, SysPost, SysPost> implements ISysPostService {
+public class SysPostServiceImpl implements ISysPostService {
- @Autowired
- private SysUserPostMapper userPostMapper;
+ private final SysPostMapper baseMapper;
+ private final SysUserPostMapper userPostMapper;
@Override
- public TableDataInfo<SysPost> selectPagePostList(SysPost post) {
+ public TableDataInfo<SysPost> selectPagePostList(SysPost post, PageQuery pageQuery) {
LambdaQueryWrapper<SysPost> lqw = new LambdaQueryWrapper<SysPost>()
- .like(StringUtils.isNotBlank(post.getPostCode()), SysPost::getPostCode, post.getPostCode())
- .eq(StringUtils.isNotBlank(post.getStatus()), SysPost::getStatus, post.getStatus())
- .like(StringUtils.isNotBlank(post.getPostName()), SysPost::getPostName, post.getPostName());
- return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
+ .like(StringUtils.isNotBlank(post.getPostCode()), SysPost::getPostCode, post.getPostCode())
+ .eq(StringUtils.isNotBlank(post.getStatus()), SysPost::getStatus, post.getStatus())
+ .like(StringUtils.isNotBlank(post.getPostName()), SysPost::getPostName, post.getPostName());
+ Page<SysPost> page = baseMapper.selectPage(pageQuery.build(), lqw);
+ return TableDataInfo.build(page);
}
/**
@@ -46,10 +49,10 @@
*/
@Override
public List<SysPost> selectPostList(SysPost post) {
- return list(new LambdaQueryWrapper<SysPost>()
- .like(StringUtils.isNotBlank(post.getPostCode()), SysPost::getPostCode, post.getPostCode())
- .eq(StringUtils.isNotBlank(post.getStatus()), SysPost::getStatus, post.getStatus())
- .like(StringUtils.isNotBlank(post.getPostName()), SysPost::getPostName, post.getPostName()));
+ return baseMapper.selectList(new LambdaQueryWrapper<SysPost>()
+ .like(StringUtils.isNotBlank(post.getPostCode()), SysPost::getPostCode, post.getPostCode())
+ .eq(StringUtils.isNotBlank(post.getStatus()), SysPost::getStatus, post.getStatus())
+ .like(StringUtils.isNotBlank(post.getPostName()), SysPost::getPostName, post.getPostName()));
}
/**
@@ -59,7 +62,7 @@
*/
@Override
public List<SysPost> selectPostAll() {
- return list();
+ return baseMapper.selectList();
}
/**
@@ -70,7 +73,7 @@
*/
@Override
public SysPost selectPostById(Long postId) {
- return getById(postId);
+ return baseMapper.selectById(postId);
}
/**
@@ -80,7 +83,7 @@
* @return 閫変腑宀椾綅ID鍒楄〃
*/
@Override
- public List<Integer> selectPostListByUserId(Long userId) {
+ public List<Long> selectPostListByUserId(Long userId) {
return baseMapper.selectPostListByUserId(userId);
}
@@ -92,10 +95,10 @@
*/
@Override
public String checkPostNameUnique(SysPost post) {
- Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
- SysPost info = getOne(new LambdaQueryWrapper<SysPost>()
- .eq(SysPost::getPostName, post.getPostName()).last("limit 1"));
- if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) {
+ boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysPost>()
+ .eq(SysPost::getPostName, post.getPostName())
+ .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId()));
+ if (exist) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -109,10 +112,10 @@
*/
@Override
public String checkPostCodeUnique(SysPost post) {
- Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
- SysPost info = getOne(new LambdaQueryWrapper<SysPost>()
- .eq(SysPost::getPostCode, post.getPostCode()).last("limit 1"));
- if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) {
+ boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysPost>()
+ .eq(SysPost::getPostCode, post.getPostCode())
+ .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId()));
+ if (exist) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -145,7 +148,6 @@
*
* @param postIds 闇�瑕佸垹闄ょ殑宀椾綅ID
* @return 缁撴灉
- * @throws Exception 寮傚父
*/
@Override
public int deletePostByIds(Long[] postIds) {
--
Gitblit v1.9.3