增加验证码配置常量，特殊字段名映射

jinpengyong

2021-03-25 25aeb531c8064ca768bb2d6f179ec7411b824b43

增加验证码配置常量，特殊字段名映射

 screen-api/src/main/java/com/moral/api/controller/GroupController.java

@@ -6,13 +6,12 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import javax.servlet.http.HttpServletRequest;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -41,11 +40,10 @@

    @ApiOperation(value = "添加组", notes = "添加组")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "groupName", value = "组名", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    @RequestMapping(value = "addGroup", method = RequestMethod.POST)
    private ResultMessage addGroup(Group group, HttpServletRequest request) {
    private ResultMessage addGroup(@RequestBody Group group, HttpServletRequest request) {
        if (group.getGroupName().isEmpty()) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -60,16 +58,16 @@

    @ApiOperation(value = "删除组", notes = "删除组")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "groupId", value = "组id", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    @RequestMapping(value = "deleteGroup", method = RequestMethod.POST)
    public ResultMessage deleteGroup(String groupId) {
        if (groupId == null) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
    public ResultMessage deleteGroup(@RequestBody Map<String, Object> parameters) {
        if (!parameters.containsKey("groupId")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        QueryWrapper<Group> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("id", groupId);
        queryWrapper.eq("id", parameters.get("groupId"));
        Group group = groupService.getOne(queryWrapper);
        if (group == null) {
            return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(), ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
@@ -80,11 +78,10 @@

    @ApiOperation(value = "修改组信息", notes = "修改组信息")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "groupName", value = "组名", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    @RequestMapping(value = "updateGroup", method = RequestMethod.POST)
    public ResultMessage updateUser(Group group, HttpServletRequest request) {
    public ResultMessage updateUser(@RequestBody Group group, HttpServletRequest request) {
        String token = request.getHeader("token");
        Map<String, Object> result = groupService.updateGroup(group, token);
        if (!result.isEmpty()) {
@@ -95,15 +92,14 @@

    @ApiOperation(value = "分页查询组列表", notes = "分页查询组列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "page", value = "当前页", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "size", value = "每页条数", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "page", value = "当前页", required = false, paramType = "query", dataType = "Integer"),
            @ApiImplicitParam(name = "size", value = "每页条数", required = false, paramType = "query", dataType = "Integer"),
            @ApiImplicitParam(name = "order", value = "排序字段", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
            @ApiImplicitParam(name = "groupName", value = "组名模糊查询", required = false, paramType = "query", dataType = "String")
    })
    @RequestMapping(value = "selectGroups", method = RequestMethod.POST)
    public ResultMessage selectGroups(HttpServletRequest request) {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
    public ResultMessage selectGroups(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
        parameters.put("token", request.getHeader("token"));
        Page<Group> userPage = groupService.selectGroups(parameters);
        PageResult<Group> pageResult = new PageResult<>(
@@ -114,23 +110,15 @@

    @ApiOperation(value = "用户分配组", notes = "用户分配组")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "groupIds", value = "组id,多个逗号隔开", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    @RequestMapping(value = "allotGroups", method = RequestMethod.POST)
    public ResultMessage allotGroups(HttpServletRequest request) {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
    public ResultMessage allotGroups(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
        if (!parameters.containsKey("userId")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        String token = request.getHeader("token");
        String[] groupIds = parameters.get("groupIds").toString().split(",");
        List<Integer> gIds = new ArrayList<>();
        for (String groupId : groupIds) {
            gIds.add(Integer.parseInt(groupId));
        }
        parameters.put("groupIds", gIds);
        userGroupService.allotGroups(parameters, token);
        return ResultMessage.ok();
    }

 screen-api/src/main/java/com/moral/api/controller/LoginController.java

@@ -45,7 +45,8 @@
    @RequestMapping(value = "login", method = RequestMethod.POST)
    public ResultMessage login(@RequestBody Map<String, Object> parameters) {
        if (!(parameters.containsKey("account") && parameters.containsKey("password"))) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        Map<String, Object> result = userService.login(parameters);
        if (!result.containsKey("data")) {
@@ -57,15 +58,15 @@
    @ApiOperation(value = "退出", notes = "退出")
    @RequestMapping(value = "logout", method = RequestMethod.POST)
    @ApiImplicitParams({
            @ApiImplicitParam(name = "uid", value = "用户id", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    public ResultMessage logout(String uid, HttpServletRequest request) {
        if (uid == null) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
    public ResultMessage logout(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
        if (!parameters.containsKey("uid")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        String token = request.getHeader("token");
        TokenUtils.destoryToken(uid, token);
        TokenUtils.destoryToken(parameters.get("uid").toString(), token);
        return ResultMessage.ok();
    }

@@ -84,7 +85,7 @@
        queryWrapper.eq("type", Constants.VERIFICATION_TYPE);
        SysConfig sysConfig = sysConfigService.getOne(queryWrapper);
        String code = sysConfig.getCode();
        if (Constants.VERIFICATION_OPEN_CODE.equals(code)) {
        if (Constants.VERFICATIONCODE_OPEN.equals(code)) {
            try {
                response.sendRedirect("/verificationCode/get");
            } catch (IOException e) {

 screen-api/src/main/java/com/moral/api/controller/MenuController.java

@@ -6,13 +6,12 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import javax.servlet.http.HttpServletRequest;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -22,7 +21,6 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.TokenUtils;
import com.moral.util.WebUtils;

@Slf4j
@Api(tags = {"菜单"})
@@ -38,23 +36,15 @@

    @ApiOperation(value = "组分配菜单", notes = "组分配菜单")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "groupId", value = "组id", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "menuIds", value = "菜单id,多个逗号隔开", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
    })
    @RequestMapping(value = "allotMenus", method = RequestMethod.POST)
    public ResultMessage allotMenus(HttpServletRequest request) {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
    public ResultMessage allotMenus(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
        if (!parameters.containsKey("groupId")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        String token = request.getHeader("token");
        String[] menuIds = parameters.get("menuIds").toString().split(",");
        List<Integer> mIds = new ArrayList<>();
        for (String menuId : menuIds) {
            mIds.add(Integer.parseInt(menuId));
        }
        parameters.put("menuIds", mIds);
        groupMenuService.allotMenus(parameters, token);
        return ResultMessage.ok();
    }

 screen-api/src/main/java/com/moral/api/controller/UserController.java

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;

import lombok.extern.slf4j.Slf4j;

import java.util.Map;
@@ -23,7 +24,6 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.PageResult;
import com.moral.util.WebUtils;

@Slf4j
@Api(tags = {"用户"})
@@ -54,18 +54,20 @@

    @ApiOperation(value = "删除账户", notes = "删除账户")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "query", dataType = "String")
            @ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "query", dataType = "Integer")
    })
    @RequestMapping(value = "deleteUser", method = RequestMethod.POST)
    public ResultMessage deleteUser(String userId) {
        if (userId == null) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
    public ResultMessage deleteUser(@RequestBody Map<String, Object> parameters) {
        if (!parameters.containsKey("uid")) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("id", userId);
        queryWrapper.eq("id", parameters.get("uid"));
        User user = userService.getOne(queryWrapper);
        if (user == null) {
            return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(), ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
            return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode(),
                    ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
        }
        userService.deleteUser(user);
        return ResultMessage.ok();
@@ -91,20 +93,19 @@

    @ApiOperation(value = "分页查询账户列表", notes = "分页查询账户列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "page", value = "当前页", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "size", value = "每页条数", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "page", value = "当前页", required = false, paramType = "query", dataType = "Integer"),
            @ApiImplicitParam(name = "size", value = "每页条数", required = false, paramType = "query", dataType = "Integer"),
            @ApiImplicitParam(name = "order", value = "排序字段", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
            @ApiImplicitParam(name = "account", value = "账号模糊查询", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "userName", value = "用户名模糊查询", required = false, paramType = "header", dataType = "String"),
            @ApiImplicitParam(name = "userName", value = "用户名模糊查询", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "mobile", value = "手机号模糊查询", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "email", value = "邮箱模糊查询", required = false, paramType = "header", dataType = "String"),
            @ApiImplicitParam(name = "wechat", value = "微信模糊查询", required = false, paramType = "header", dataType = "String"),
            @ApiImplicitParam(name = "email", value = "邮箱模糊查询", required = false, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "wechat", value = "微信模糊查询", required = false, paramType = "query", dataType = "String"),

    })
    @RequestMapping(value = "selectUsers", method = RequestMethod.POST)
    public ResultMessage selectUsers(HttpServletRequest request) {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
    public ResultMessage selectUsers(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
        parameters.put("token", request.getHeader("token"));
        Page<User> userPage = userService.selectUsers(parameters);
        PageResult<User> pageResult = new PageResult<>(

 screen-api/src/main/java/com/moral/api/entity/SysConfig.java

@@ -1,10 +1,13 @@
package com.moral.api.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;

import java.io.Serializable;
import java.util.Date;

import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -36,22 +39,24 @@
    /**
     * 状态码
     */
    @TableField(value = "`code`")
    private String code;

    /**
     * 描述
     */
    @TableField(value = "`desc`")
    private String desc;

    /**
     * 创建时间
     */
    private LocalDateTime createTime;
    private Date createTime;

    /**
     * 更新时间
     */
    private LocalDateTime updateTime;
    private Date updateTime;

    /**
     * 是否删除

 screen-api/src/main/java/com/moral/api/mapper/UserMapper.java

@@ -1,11 +1,10 @@
package com.moral.api.mapper;

import java.util.List;
import java.util.Map;

import com.moral.api.entity.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.pojo.UserBo;
import com.moral.api.pojo.UserBO;

/**
 * <p>
@@ -17,9 +16,6 @@
 */
public interface UserMapper extends BaseMapper<User> {

    List<Map<String, Object>> selectUsers(Map<String, Object> parameters);
    UserBO selectUserInfo(Map<String, Object> parameters);

    UserBo selectUserInfo(Map<String, Object> parameters);

    User selectUser(Map<String, Object> parameters);
}

 screen-api/src/main/java/com/moral/api/pojo/UserBO.java

File was renamed from screen-api/src/main/java/com/moral/api/pojo/UserBo.java
@@ -14,7 +14,7 @@

@Data
@EqualsAndHashCode(callSuper = false)
public class UserBo extends User {
public class UserBO extends User {

    @Transient
    private Organization organization;

 screen-api/src/main/java/com/moral/api/service/UserService.java

@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.UserBo;
import com.moral.api.pojo.UserBO;

/**
 * <p>
@@ -31,6 +31,6 @@

    Page<User> selectUsers(Map<String, Object> parameters);

    UserBo selectUserInfo(Map<String, Object> parameters);
    UserBO selectUserInfo(Map<String, Object> parameters);

}

 screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java

@@ -133,10 +133,8 @@
        } else {
            queryWrapper.orderByAsc(order.toString(), "id");
        }
        Page<Group> groupPage = groupMapper.selectPage(pageData, queryWrapper);

        pageData.setRecords(groupPage.getRecords());
        return groupPage;
        groupMapper.selectPage(pageData, queryWrapper);
        return pageData;
    }

}

 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java

@@ -21,7 +21,7 @@
import com.moral.api.mapper.MenuMapper;
import com.moral.api.mapper.UserGroupMapper;
import com.moral.api.mapper.UserMapper;
import com.moral.api.pojo.UserBo;
import com.moral.api.pojo.UserBO;
import com.moral.api.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -60,13 +60,13 @@
    private String AESKey;

    @Override
    public UserBo selectUserInfo(Map<String, Object> parameters) {
    public UserBO selectUserInfo(Map<String, Object> parameters) {
        return userMapper.selectUserInfo(parameters);
    }

    @Override
    public Map<String, Object> login(Map<String, Object> parameters) {
        UserBo userBo = selectUserInfo(parameters);
        UserBO userBo = selectUserInfo(parameters);
        Map<String, Object> result = new HashMap<>();
        //校验账户
        if (userBo == null) {
@@ -357,8 +357,8 @@
            queryWrapper.like("wechat", wechat);
        }

        int page = Integer.parseInt(parameters.get("page").toString());
        int size = Integer.parseInt(parameters.get("size").toString());
        Integer page = (Integer) parameters.get("page");
        Integer size = (Integer) parameters.get("size");
        Page<User> pageData = new Page<>(page, size);
        //排序参数,默认id升序
        if (order == null) {
@@ -366,9 +366,8 @@
        } else {
            queryWrapper.orderByAsc(order.toString(), "id");
        }
        Page<User> userPage = userMapper.selectPage(pageData, queryWrapper);
        pageData.setRecords(userPage.getRecords());
        return userPage;
        userMapper.selectPage(pageData, queryWrapper);
        return pageData;
    }

}

 screen-api/src/main/resources/mapper/UserMapper.xml

@@ -19,7 +19,7 @@
        <result column="is_delete" property="isDelete"/>
    </resultMap>

    <resultMap id="userInfoMap" type="com.moral.api.pojo.UserBo" extends="BaseResultMap">
    <resultMap id="userInfoMap" type="com.moral.api.pojo.UserBO" extends="BaseResultMap">
        <!--用户组织-->
        <association property="organization" javaType="com.moral.api.entity.Organization">
            <result column="id" property="id" jdbcType="INTEGER"/>

 screen-common/src/main/java/com/moral/constant/Constants.java

@@ -49,5 +49,14 @@
    * */
    public static Integer DELETE_CHILDREN_ORG = 1;

    /*
     * web端通道
     * */
    public static Integer WEB_CHANNEL = 1;

    /*
     * web端验证码配置列名
     * */
    public static String VERIFICATION_TYPE = "front_verificationCode";

}

 screen-manage/src/main/java/com/moral/api/entity/SysConfig.java

@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;

@@ -39,12 +38,13 @@
    /**
     * 状态码
     */
    @TableField(value = "`code`")
    private String code;

    /**
     * 描述
     */
    @TableField("`desc`")
    @TableField(value = "`desc`")
    private String desc;

    /**