zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor 接口

V0.5.x
jay 2023-06-06 19:39:10 +08:00
parent 2c4e7d808d
commit 94cd29e5c0
4 changed files with 99 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
iot-common/iot-common-core/src/main/java/cc/iotkit/common/api/PageRequest.java
View File

@ -94,4 +94,8 @@ public class PageRequest<T> extends Request<T> implements Serializable {
public Integer getPageNum() {
return pageNum == null ? DEFAULT_PAGE_NUM : pageNum;
}
public Integer getOffset() {
return (getPageNum() - 1) * getPageSize();
}
}

10
iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserData.java
View File

@ -41,4 +41,14 @@ public interface ISysUserData extends ICommonData<SysUser, Long> {
Paging<SysUser> selectAllocatedList(PageRequest<SysUser> to);
String selectUserPostGroup(String userName);
String selectUserRoleGroup(String userName);
Paging<SysUser> selectUnallocatedList(PageRequest<SysUser> to);
SysUser findByPhonenumber(String phonenumber);
}

79
iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserDataImpl.java
View File

@ -8,6 +8,8 @@ import cc.iotkit.common.utils.StreamUtils;
import cc.iotkit.common.utils.StringUtils;
import cc.iotkit.data.dao.IJPACommData;
import cc.iotkit.data.dao.SysUserRepository;
import cc.iotkit.data.model.TbSysPost;
import cc.iotkit.data.model.TbSysRole;
import cc.iotkit.data.model.TbSysUser;
import cc.iotkit.data.system.ISysDeptData;
import cc.iotkit.data.system.ISysUserData;
@ -16,6 +18,8 @@ import cc.iotkit.data.util.PredicateBuilder;
import cc.iotkit.model.system.SysDept;
import cc.iotkit.model.system.SysUser;
import cn.hutool.core.util.ObjectUtil;
import com.querydsl.core.QueryResults;
import com.querydsl.core.Tuple;
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.Projections;
import com.querydsl.jpa.impl.JPAQueryFactory;
@ -26,9 +30,14 @@ import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import static cc.iotkit.data.model.QTbSysDept.tbSysDept;
import static cc.iotkit.data.model.QTbSysPost.tbSysPost;
import static cc.iotkit.data.model.QTbSysRole.tbSysRole;
import static cc.iotkit.data.model.QTbSysUser.tbSysUser;
import static cc.iotkit.data.model.QTbSysUserPost.tbSysUserPost;
import static cc.iotkit.data.model.QTbSysUserRole.tbSysUserRole;
/**
@ -155,6 +164,76 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
return MapstructUtils.convert(ret, SysUser.class);
}
@Override
public Paging<SysUser> selectAllocatedList(PageRequest<SysUser> to) {
SysUser data = to.getData();
PredicateBuilder builder = PredicateBuilder.instance()
.and(StringUtils.isNotBlank(data.getPhonenumber()), () -> tbSysUser.phonenumber.like(data.getPhonenumber()))
.and(StringUtils.isNotBlank(data.getUserName()), () -> tbSysUser.userName.like(data.getUserName()))
.and(StringUtils.isNotBlank(data.getStatus()), () -> tbSysUser.status.eq(data.getStatus()))
.and(Objects.nonNull(data.getDeptId()), () -> tbSysUser.deptId.eq(data.getDeptId()))
.and(tbSysUser.delFlag.eq(UserConstants.ROLE_NORMAL));
QueryResults<TbSysUser> tbSysUserQueryResults = jpaQueryFactory.select(Projections.bean(TbSysUser.class, tbSysUser.id, tbSysUser.deptId, tbSysUser.userName,
tbSysUser.nickName, tbSysUser.email, tbSysUser.phonenumber, tbSysUser.createTime)).from(tbSysUser)
.leftJoin(tbSysDept).on(tbSysUser.deptId.eq(tbSysDept.id))
.leftJoin(tbSysUserRole).on(tbSysUser.id.eq(tbSysUserRole.userId))
.leftJoin(tbSysRole).on(tbSysUserRole.roleId.eq(tbSysRole.id))
.where(builder.build()).offset(to.getOffset()).limit(to.getPageSize()).fetchResults();
return new Paging<>(tbSysUserQueryResults.getTotal(), MapstructUtils.convert(tbSysUserQueryResults.getResults(), SysUser.class));
}
@Override
public String selectUserPostGroup(String userName) {
List<TbSysPost> fetch = jpaQueryFactory.select(Projections.bean(TbSysPost.class, tbSysPost.id, tbSysPost.postName, tbSysPost.postCode)).from(tbSysPost)
.leftJoin(tbSysUserPost).on(tbSysPost.id.eq(tbSysUserPost.postId))
.leftJoin(tbSysUser).on(tbSysUserPost.userId.eq(tbSysUser.id))
.where(tbSysUser.userName.eq(userName))
.orderBy(tbSysPost.postSort.asc()).fetch();
return fetch.stream().map(TbSysPost::getPostName).collect(Collectors.joining(","));
}
@Override
public String selectUserRoleGroup(String userName) {
List<TbSysRole> fetch = jpaQueryFactory.select(tbSysRole).from(tbSysRole)
.leftJoin(tbSysUserRole).on(tbSysRole.id.eq(tbSysUserRole.roleId))
.leftJoin(tbSysUser).on(tbSysUserRole.userId.eq(tbSysUser.id))
.where(tbSysUser.userName.eq(userName))
.orderBy(tbSysRole.roleSort.asc()).fetch();
return fetch.stream().map(TbSysRole::getRoleName).collect(Collectors.joining(","));
}
@Override
public Paging<SysUser> selectUnallocatedList(PageRequest<SysUser> to) {
//TODO: 未分配用户列表
SysUser data = to.getData();
PredicateBuilder builder = PredicateBuilder.instance()
.and(StringUtils.isNotBlank(data.getPhonenumber()), () -> tbSysUser.phonenumber.like(data.getPhonenumber()))
.and(StringUtils.isNotBlank(data.getUserName()), () -> tbSysUser.userName.like(data.getUserName()))
.and(StringUtils.isNotBlank(data.getStatus()), () -> tbSysUser.status.eq(data.getStatus()))
.and(Objects.nonNull(data.getDeptId()), () -> tbSysUser.deptId.eq(data.getDeptId()))
.and(tbSysUser.delFlag.eq(UserConstants.ROLE_NORMAL));
QueryResults<SysUser> sysUserQueryResults = jpaQueryFactory.select(Projections.bean(SysUser.class, tbSysUser.id, tbSysUser.deptId, tbSysUser.userName,
tbSysUser.nickName, tbSysUser.email, tbSysUser.phonenumber, tbSysUser.createTime)).from(tbSysUser)
.leftJoin(tbSysDept).on(tbSysUser.deptId.eq(tbSysDept.id))
.leftJoin(tbSysUserRole).on(tbSysUser.id.eq(tbSysUserRole.userId))
.leftJoin(tbSysRole).on(tbSysUserRole.roleId.eq(tbSysRole.id))
.where(builder.build()).offset(to.getOffset()).limit(to.getPageSize()).fetchResults();
return new Paging<>(sysUserQueryResults.getTotal(), sysUserQueryResults.getResults());
}
@Override
public SysUser findByPhonenumber(String phonenumber) {
TbSysUser user = jpaQueryFactory.select(tbSysUser).from(tbSysUser)
.where(PredicateBuilder.instance()
.and(tbSysUser.phonenumber.eq(phonenumber))
.build()).fetchOne();
return MapstructUtils.convert(user, SysUser.class);
}
@Override
public Paging<SysUser> findAll(PageRequest<SysUser> pageRequest) {
return PageBuilder.toPaging(userRepository.findAll(buildQueryCondition(pageRequest.getData()), PageBuilder.toPageable(pageRequest)));

11
iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java
View File

@ -79,17 +79,18 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
@Override
public Paging<SysUserVo> selectUnallocatedList( PageRequest<SysUserBo> query) {
return null;
return sysUserData.selectUnallocatedList(query.to(SysUser.class)).to(SysUserVo.class);
}
@Override
public SysUserVo selectUserByUserName(String userName) {
return null;
return MapstructUtils.convert(sysUserData.selectUserByUserName(userName),SysUserVo.class);
}
@Override
public SysUserVo selectUserByPhonenumber(String phonenumber) {
return null;
return MapstructUtils.convert(sysUserData.findByPhonenumber(phonenumber),SysUserVo.class);
}
@Override
@ -99,12 +100,12 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
@Override
public String selectUserRoleGroup(String userName) {
return null;
return sysUserData.selectUserRoleGroup(userName);
}
@Override
public String selectUserPostGroup(String userName) {
return null;
return sysUserData.selectUserPostGroup(userName);
}
@Override