From 7d3040d4c742af5e13f7327e7397a0524c1ffdec Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 21 二月 2024 16:06:31 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserService.java | 5 ++ zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserMapper.java | 8 +++ zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java | 8 ++++ zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java | 8 ++++ zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java | 4 ++ zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml | 12 ++++++ zy-asrs-flow/src/pages/system/user/index.jsx | 2 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageResult.java | 33 ++++++++++++++++ 8 files changed, 78 insertions(+), 2 deletions(-) diff --git a/zy-asrs-flow/src/pages/system/user/index.jsx b/zy-asrs-flow/src/pages/system/user/index.jsx index b385852..70fe28f 100644 --- a/zy-asrs-flow/src/pages/system/user/index.jsx +++ b/zy-asrs-flow/src/pages/system/user/index.jsx @@ -558,7 +558,7 @@ ], }} request={(params, sorter, filter) => - Http.doPostPromise('/api/user/page', { ...params, ...searchParam }, (res) => { + Http.doPostPromise('/api/user/page1', { ...params, ...searchParam }, (res) => { return { data: res.data.records, total: res.data.total, diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java index eb9202c..915624b 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java @@ -156,4 +156,8 @@ return queryWrapper; } + public Map<String, Object> pickOutMap() { + return where.getMap(); + } + } diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageResult.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageResult.java new file mode 100644 index 0000000..086fc1e --- /dev/null +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageResult.java @@ -0,0 +1,33 @@ +package com.zy.asrs.wcs.common.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author vincent + * @since 2017-06-10 10:10:02 + */ +@Data +public class PageResult<T> implements Serializable { + + private static final long serialVersionUID = 1L; + + private List<T> records; + + private Long total; + + public PageResult() { + } + + public PageResult(List<T> records) { + this(records, null); + } + + public PageResult(List<T> records, Long total) { + this.records = records; + this.total = total; + } + +} diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java index bcaba13..2d39a81 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java @@ -36,6 +36,14 @@ } @PreAuthorize("hasAuthority('system:user:list')") + @PostMapping("/user/page1") + public R page1(@RequestBody Map<String, Object> map) { + BaseParam baseParam = buildParam(map, BaseParam.class); + PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class); + return R.ok().add(userService.pageRel(pageParam)); + } + + @PreAuthorize("hasAuthority('system:user:list')") @PostMapping("/user/list") public R list(@RequestBody Map<String, Object> map) { return R.ok().add(userService.list()); diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserMapper.java index df2573f..ab6b549 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserMapper.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/UserMapper.java @@ -1,16 +1,22 @@ package com.zy.asrs.wcs.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.zy.asrs.wcs.system.entity.User; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zy.asrs.wcs.system.entity.User; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Map; + @Mapper @Repository public interface UserMapper extends BaseMapper<User> { + List<User> selectPageRel(@Param("page") IPage<User> page, @Param("param") Map<String, Object> param); + @InterceptorIgnore(tenantLine = "true") User selectByUsername(@Param("username") String username, @Param("hostId") Long hostId); diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserService.java index 7654f3a..e1eaeb7 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserService.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/UserService.java @@ -1,10 +1,15 @@ package com.zy.asrs.wcs.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.zy.asrs.wcs.common.domain.BaseParam; +import com.zy.asrs.wcs.common.domain.PageParam; +import com.zy.asrs.wcs.common.domain.PageResult; import com.zy.asrs.wcs.system.entity.User; public interface UserService extends IService<User> { + PageResult<User> pageRel(PageParam<User, BaseParam> pageParam); + User getByUsername(String username, Long hostId); User getByIdRel(Long userId); diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java index ed6d298..adb4bce 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/UserServiceImpl.java @@ -2,6 +2,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zy.asrs.framework.common.Cools; +import com.zy.asrs.wcs.common.domain.BaseParam; +import com.zy.asrs.wcs.common.domain.PageParam; +import com.zy.asrs.wcs.common.domain.PageResult; import com.zy.asrs.wcs.system.entity.User; import com.zy.asrs.wcs.system.mapper.UserMapper; import com.zy.asrs.wcs.system.service.RoleMenuService; @@ -23,6 +26,11 @@ private BCryptPasswordEncoder bCryptPasswordEncoder; @Override + public PageResult<User> pageRel(PageParam<User, BaseParam> pageParam) { + return new PageResult<>(this.baseMapper.selectPageRel(pageParam, pageParam.pickOutMap()), pageParam.getTotal()); + } + + @Override public User getByUsername(String username, Long hostId) { if (Cools.isEmpty(username)) { return null; diff --git a/zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml index 2648c30..6cbeac3 100644 --- a/zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml +++ b/zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml @@ -13,4 +13,16 @@ </if> </select> + <select id="selectPageRel" resultType="com.zy.asrs.wcs.system.entity.User"> + select + su.* + from sys_user su + left join sys_dept sd on su.dept_id = sd.id + where 1=1 + <if test="param.deptId != null"> + and (FIND_IN_SET(#{param.deptId}, sd.`path`) OR sd.`id` = #{param.deptId}) + </if> + order by su.create_time desc + </select> + </mapper> -- Gitblit v1.9.1