whyczh
2022-05-23 c756b4973494dc657a2e9beaed8202f72bfc0480
用户page接口更新
5个文件已修改
30 ■■■■ 已修改文件
src/main/java/com/whyc/controller/UserController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/UserMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/UserInf.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/UserService.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/UserMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/UserController.java
@@ -1,7 +1,5 @@
package com.whyc.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.whyc.dto.Response;
import com.whyc.pojo.UserInf;
import com.whyc.service.UserService;
@@ -54,9 +52,8 @@
    @GetMapping("page")
    @ApiOperation(value = "查询分页")
    public Response<IPage<UserInf>> getPage(@RequestParam int pageNum,int pageSize){
        Page<Object> page = new Page<>(pageNum, pageSize);
        return new Response<IPage<UserInf>>().set(1,userService.getAllWithPage(page));
    public Response getPage(@RequestParam int pageNum,int pageSize){
        return new Response().set(1,userService.getAllWithPage(pageNum,pageSize));
    }
    @PutMapping
src/main/java/com/whyc/mapper/UserMapper.java
@@ -15,4 +15,7 @@
    List<UserInf> getUserInfoByStationId(@Param("stationId") String stationId);
    List<UserInf> getUserInfAndPermitInf();
}
src/main/java/com/whyc/pojo/UserInf.java
@@ -135,6 +135,9 @@
    /**权限角色组*/
    @TableField(exist = false)
    private Integer permitGroupId;
    @TableField(exist = false)
    private String permitGroupName;
    public UserInf() {
    }
src/main/java/com/whyc/service/UserService.java
@@ -2,9 +2,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.constant.UserConstant;
import com.whyc.dto.Response;
import com.whyc.mapper.UserMapper;
@@ -118,8 +118,11 @@
        return users;
    }
    public IPage<UserInf> getAllWithPage(Page page) {
        return userMapper.selectPage(page, null);
    public Response getAllWithPage(int pageNum,int pageSize) {
        PageHelper.startPage(pageNum,pageSize);
        List<UserInf> list = userMapper.getUserInfAndPermitInf();
        PageInfo<UserInf> pageInfo = new PageInfo<>(list);
        return new Response().set(1,pageInfo,"查询成功");
    }
    public boolean update(UserInf user) {
src/main/resources/mapper/UserMapper.xml
@@ -25,4 +25,10 @@
        and u.uRole != 0
        and group1.StationId = #{stationId}
    </select>
    <select id="getUserInfAndPermitInf" resultType="com.whyc.pojo.UserInf">
        select u.*,p.permit_group_name as permitGroupName,pd.permit_group_id as permitGroupId
        from db_user.tb_user_inf u
        inner db_user.tb_user_permitgroup_data pd on u.uId = pd.uId
        inner db_user.tb_user_permitgroup p on p.permit_group_id = pd.permit_group_id
    </select>
</mapper>