1.保安员导入

tangzy

2021-08-09 43c71c228dcd806c9dd8303d133ca4b3ba9c1275

1.保安员导入

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -236,21 +236,21 @@
        return R.success("操作成功");
    }

    /**
     * 导出用户
     */
    @GetMapping("export-user")
    @ApiOperationSupport(order = 13)
    @ApiOperation(value = "导出用户", notes = "传入user")
    public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
        QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
        if (!AuthUtil.isAdministrator()) {
            queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId());
        }
        queryWrapper.lambda().eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED);
        List<UserExcel> list = userService.exportUser(queryWrapper);
        ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
    }
//    /**
//     * 导出用户
//     */
//    @GetMapping("export-user")
//    @ApiOperationSupport(order = 13)
//    @ApiOperation(value = "导出用户", notes = "传入user")
//    public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
//        QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
//        if (!AuthUtil.isAdministrator()) {
//            queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId());
//        }
//        queryWrapper.lambda().eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED);
//        List<UserExcel> list = userService.exportUser(queryWrapper);
//        ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
//    }

    /**
     * 导出模板

 src/main/java/org/springblade/modules/system/excel/UserExcel.java

@@ -39,24 +39,8 @@
    private static final long serialVersionUID = 1L;

    @ColumnWidth(15)
    @ExcelProperty("保安单位编号")
    private String tenantId;

    @ExcelIgnore
    @ExcelProperty("用户平台")
    private String userType;

    @ColumnWidth(20)
    @ExcelProperty("用户平台名称")
    private String userTypeName;

    @ColumnWidth(15)
    @ExcelProperty("账户")
    private String account;

    @ColumnWidth(10)
    @ExcelProperty("昵称")
    private String name;

    @ColumnWidth(10)
    @ExcelProperty("姓名")
@@ -69,29 +53,41 @@
    @ExcelProperty("手机")
    private String phone;

    @ExcelIgnore
    @ExcelProperty("角色ID")
    private String roleId;

    @ExcelIgnore
    @ExcelProperty("部门ID")
    private String deptId;
    @ExcelProperty("性别")
    private String sex;

    @ExcelIgnore
    @ExcelProperty("岗位ID")
    private String postId;
    @ExcelProperty("身份证")
    private String cardid;

    @ExcelProperty("角色名称")
    private String roleName;
    @ExcelProperty("籍贯")
    private String nativeplace;

    @ExcelProperty("部门名称")
    private String deptName;
    @ExcelProperty("民族")
    private String nation;

    @ExcelProperty("岗位名称")
    private String postName;
    @ExcelProperty("政治面貌")
    private String politicaloutlook;

    @ColumnWidth(20)
    @ExcelProperty("生日")
    private Date birthday;

    @ExcelProperty("身高")
    private Float height;


    @ExcelProperty("联系地址")
    private String address;

    @ExcelProperty("户口所在地")
    private String registered;

    @ExcelProperty("入职时间")
    private String rtime;

    @ExcelProperty("是否持证")
    private String hold;

    @ExcelProperty("保安员证编码")
    private String securitynumber;


}

 src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -179,7 +179,7 @@
     * @param queryWrapper
     * @return
     */
    List<UserExcel> exportUser(Wrapper<User> queryWrapper);
    //List<UserExcel> exportUser(Wrapper<User> queryWrapper);

    /**
     * 注册用户

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -300,46 +300,29 @@
    public void importUser(List<UserExcel> data, Boolean isCovered) {
        data.forEach(userExcel -> {
            User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
            // 设置用户平台
            user.setUserType(Func.toInt(DictCache.getKey(DictEnum.USER_TYPE, userExcel.getUserTypeName()), 1));
            // 设置部门ID
            user.setDeptId(SysCache.getDeptIds(userExcel.getTenantId(), userExcel.getDeptName()));
            // 设置岗位ID
            user.setPostId(SysCache.getPostIds(userExcel.getTenantId(), userExcel.getPostName()));
            // 设置角色ID
            user.setRoleId(SysCache.getRoleIds(userExcel.getTenantId(), userExcel.getRoleName()));
            // 设置租户ID
            if (!AuthUtil.isAdministrator() || StringUtil.isBlank(user.getTenantId())) {
                user.setTenantId(AuthUtil.getTenantId());
            }
            // 覆盖数据
            if (isCovered) {
                // 查询用户是否存在
                User oldUser = UserCache.getUser(userExcel.getTenantId(), userExcel.getAccount());
                if (oldUser != null && oldUser.getId() != null) {
                    user.setId(oldUser.getId());
                    this.updateUser(user);
                    return;
                }
            }
            // 获取默认密码配置
            user.setRoleId("1412226235153731586");
            //获取默认密码配置
            String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
            user.setPassword(initPassword);
            this.submit(user);
        });
    }

    @Override
    public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
        List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
        userList.forEach(user -> {
            user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
            user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
            user.setDeptName(StringUtil.join(SysCache.getDeptNames(user.getDeptId())));
            user.setPostName(StringUtil.join(SysCache.getPostNames(user.getPostId())));
        });
        return userList;
    }
//    @Override
//    public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
//        List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
//        userList.forEach(user -> {
//            user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
//            user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
//            user.setDeptName(StringUtil.join(SysCache.getDeptNames(user.getDeptId())));
//            user.setPostName(StringUtil.join(SysCache.getPostNames(user.getPostId())));
//        });
//        return userList;
//    }

    @Override
    @Transactional(rollbackFor = Exception.class)