huliguo
4 天以前 679a244ce19309fd8a7e23ff7401dc527c15a7e2
新增
2个文件已添加
7个文件已修改
242 ■■■■ 已修改文件
src/main/java/com/linghu/controller/SectionalizationController.java 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/linghu/controller/UserController.java 100 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/linghu/mapper/UserMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/linghu/model/entity/Sectionalization.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/linghu/model/excel/UserExcel.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/linghu/model/vo/UserPageVO.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/linghu/service/UserService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/linghu/service/impl/UserServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/UserMapper.xml 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/linghu/controller/SectionalizationController.java
@@ -1,11 +1,16 @@
package com.linghu.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.linghu.model.common.ResponseResult;
import com.linghu.model.entity.Sectionalization;
import com.linghu.service.SectionalizationService;
import com.linghu.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/sectionalization")
@@ -14,33 +19,60 @@
    @Autowired
    private SectionalizationService sectionalizationService;
/*
    @PostMapping
    @ApiOperation(value = "添加类型")
    public ResponseResult<User> add(@RequestBody User user) {
        boolean success = typeService.save(type);
        if (success) {
            return ResponseResult.success(type);
        }
        return ResponseResult.error("添加类型失败");
    }
*/
    /**
     * 新增分组
     */
    @PostMapping
    @ApiOperation(value = "添加")
    public ResponseResult add(@RequestBody Sectionalization sectionalization) {
        List<Sectionalization> list = sectionalizationService.list(new LambdaQueryWrapper<Sectionalization>().eq(Sectionalization::getSectionalization_name, sectionalization.getSectionalization_name()));
        if (list != null && list.size() > 0) {
            return ResponseResult.error("该分组已存在");
        }
        sectionalizationService.save(sectionalization);
        return ResponseResult.success();
    }
    /**
     * 修改分组
     */
    @PutMapping
    @ApiOperation(value = "修改")
    public ResponseResult edit(@RequestBody Sectionalization sectionalization) {
        List<Sectionalization> list = sectionalizationService.list(new LambdaQueryWrapper<Sectionalization>()
                        .ne(Sectionalization::getSectionalization_id, sectionalization.getSectionalization_id())
                .eq(Sectionalization::getSectionalization_name, sectionalization.getSectionalization_name()));
        if (list != null && list.size() > 0) {
            return ResponseResult.error("该分组已存在");
        }
        sectionalizationService.updateById(sectionalization);
        return ResponseResult.success();
    }
    /**
     * 删除分组
     */
    @DeleteMapping("/{sectionalization_id}")
    @ApiOperation(value = "删除")
    public ResponseResult delete(@PathVariable("sectionalization_id") Integer sectionalization_id) {
        sectionalizationService.removeById(sectionalization_id);
        return ResponseResult.success();
    }
    /**
     *  分组列表
     */
    @GetMapping()
    @ApiOperation(value = "获取分组列表")
    public ResponseResult<List<Sectionalization>> list() {
        List<Sectionalization>  list = sectionalizationService.list();
        return ResponseResult.success(list);
    }
}
src/main/java/com/linghu/controller/UserController.java
@@ -1,16 +1,28 @@
package com.linghu.controller;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.linghu.model.common.ResponseResult;
import com.linghu.model.entity.Sectionalization;
import com.linghu.model.entity.Type;
import com.linghu.model.entity.User;
import com.linghu.model.excel.KeywordExcel;
import com.linghu.model.excel.UserExcel;
import com.linghu.model.vo.UserPageVO;
import com.linghu.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping("/user")
@@ -19,34 +31,88 @@
    @Autowired
    private UserService userService;
/*
    @PostMapping
    @ApiOperation(value = "添加类型")
    public ResponseResult<User> add(@RequestBody User user) {
        boolean success = typeService.save(type);
        if (success) {
            return ResponseResult.success(type);
        }
        return ResponseResult.error("添加类型失败");
    }
*/
    /**
     * 新增用户
     */
    @PostMapping
    @ApiOperation(value = "添加")
    public ResponseResult add(@RequestBody User user) {
        List<User> list = userService.list(new LambdaQueryWrapper<User>().eq(User::getUser_email, user.getUser_email()));
        if (list != null && list.size() > 0) {
            return ResponseResult.error("该邮箱已存在");
        }
        userService.save(user);
        return ResponseResult.success();
    }
    /**
     * 修改用户
     */
    @PutMapping
    @ApiOperation(value = "添加")
    public ResponseResult edit(@RequestBody User user) {
        List<User> list = userService.list(new LambdaQueryWrapper<User>()
                        .ne(User::getUser_id, user.getUser_id())
                .eq(User::getUser_email, user.getUser_email()));
        if (list != null && list.size() > 0) {
            return ResponseResult.error("该邮箱已存在");
        }
        userService.updateById(user);
        return ResponseResult.success();
    }
    /**
     * 删除用户
     */
    @DeleteMapping("/{user_id}")
    @ApiOperation(value = "删除")
    public ResponseResult delete(@PathVariable("user_id") Integer user_id) {
        userService.removeById(user_id);
        return ResponseResult.success();
    }
    /**
     * 分页查询
     */
    @GetMapping
    @ApiOperation(value = "删除")
    public ResponseResult<Page<UserPageVO>> page(@RequestParam(value = "pageSize", required = false, defaultValue = "10")Integer pageSize,
                                                 @RequestParam(value = "pageNum", required = false,defaultValue = "1")Integer pageNum,
                                                 @RequestParam(value = "sectionalization_id",required = false)Integer sectionalization_id,
                                                 @RequestParam(value = "status" ,required = false)String status) {
        Page<UserPageVO> page = new Page<>(pageNum, pageSize);
        return ResponseResult.success( userService.getPage(page,sectionalization_id,status));
    }
    /**
     * 下载模板
     */
    @PostMapping("/downloadTemplate")
    @ApiOperation("下载模板")
    public ResponseEntity<byte[]> downloadTemplate() throws IOException {
        ByteArrayOutputStream out = new ByteArrayOutputStream();
        EasyExcel.write(out, UserExcel.class).sheet("账号模板").doWrite(new ArrayList<>());
        return ResponseEntity.ok()
                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=keyword_template.xlsx")
                .contentType(MediaType.APPLICATION_OCTET_STREAM)
                .body(out.toByteArray());
    }
    /**
     * 导入文件
     */
}
src/main/java/com/linghu/mapper/UserMapper.java
@@ -1,7 +1,10 @@
package com.linghu.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.linghu.model.entity.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.linghu.model.vo.UserPageVO;
import org.apache.ibatis.annotations.Param;
/**
* @author xy
@@ -11,6 +14,7 @@
*/
public interface UserMapper extends BaseMapper<User> {
    Page<User> getPage(Page<UserPageVO> page, @Param("sectionalizationId") Integer sectionalizationId, @Param("status") String status);
}
src/main/java/com/linghu/model/entity/Sectionalization.java
@@ -6,6 +6,7 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
@Data
@TableName(value = "sectionalization")
@@ -16,7 +17,7 @@
    @TableId
    private Integer sectionalization_id;
    @NotBlank(message = "用户名不能为空")
    @NotEmpty(message = "用户名不能为空")
    private String sectionalization_name;
src/main/java/com/linghu/model/excel/UserExcel.java
New file
@@ -0,0 +1,16 @@
package com.linghu.model.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
@Data
public class UserExcel {
    @ExcelProperty("账户名")
    private String user_name;
    @ExcelProperty("邮箱")
    private String user_email;
    @ExcelProperty("密码")
    private String password;
    @ExcelProperty("账户分组")
    private String sectionalization_name;
}
src/main/java/com/linghu/model/vo/UserPageVO.java
New file
@@ -0,0 +1,27 @@
package com.linghu.model.vo;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class UserPageVO {
    @ApiModelProperty("用户id")
    private Integer user_id;
    @ApiModelProperty("用户名")
    private Integer user_name;
    @ApiModelProperty("用户邮箱")
    private Integer user_email;
    @ApiModelProperty("密码")
    private String password;
    @ApiModelProperty("分组名称")
    private String sectionalization_name;
    @ApiModelProperty("状态")
    private String status;
}
src/main/java/com/linghu/service/UserService.java
@@ -1,7 +1,9 @@
package com.linghu.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.linghu.model.entity.User;
import com.baomidou.mybatisplus.extension.service.IService;
import com.linghu.model.vo.UserPageVO;
/**
* @author xy
@@ -10,4 +12,5 @@
*/
public interface UserService extends IService<User> {
    Page<UserPageVO> getPage(Page<UserPageVO> page, Integer sectionalizationId, String status);
}
src/main/java/com/linghu/service/impl/UserServiceImpl.java
@@ -1,9 +1,12 @@
package com.linghu.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.linghu.model.entity.User;
import com.linghu.model.vo.UserPageVO;
import com.linghu.service.UserService;
import com.linghu.mapper.UserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -15,6 +18,13 @@
public class UserServiceImpl extends ServiceImpl<UserMapper, User>
    implements UserService{
    @Autowired
    private UserMapper userMapper;
    @Override
    public Page<UserPageVO> getPage(Page<UserPageVO> page, Integer sectionalizationId, String status) {
        return userMapper.getPage(page,sectionalizationId,status);
    }
}
src/main/resources/mapper/UserMapper.xml
@@ -18,4 +18,25 @@
        user_id,user_name,user_email,
        password,phone,sectionalization_id,status
    </sql>
    <select id="getPage" resultType="com.linghu.model.entity.User">
        SELECT
            u.user_id,
            u.user_name,
            u.user_email,
            u.`password`,
            s.sectionalization_name,
            u.status
        FROM
            `user` u
                LEFT JOIN sectionalization s on u.sectionalization_id = s.sectionalization_id
        <where>
            <if test="sectionalizationId!=null">
                and s.sectionalization_id= #{sectionalizationId}
            </if>
            <if test="status!=null and '' != status">
                and u.status = #{status}
            </if>
        </where>
    </select>
</mapper>