Merge remote-tracking branch 'origin/master'

石广澎

2023-12-12 45bfb77d4b4d1b1d3204475caba9b9c0e3e04ef9

 consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java

@@ -1,7 +1,6 @@
package com.consum.base.controller;

import java.io.IOException;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -40,7 +39,7 @@
import com.consum.base.pojo.response.UserVO;
import com.consum.base.service.FinSysTenantDepartmentService;
import com.consum.base.service.FinSysTenantService;
import com.consum.base.service.FinSysTenantUserServiceImpl;
import com.consum.base.service.FinSysTenantUserService;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
@@ -78,7 +77,7 @@

    private String roleName;

    private FinSysTenantUserServiceImpl finSysTenantUserService;
    private FinSysTenantUserService finSysTenantUserService;

    private UserServiceImpl userService;

@@ -96,7 +95,7 @@

    @Autowired
    public FinSysTenantUserController(FinSysTenantService finSysTenantService,
        FinSysTenantUserServiceImpl finSysTenantUserService, RoleServiceImpl roleService) {
        FinSysTenantUserService finSysTenantUserService, RoleServiceImpl roleService) {
        this.finSysTenantUserService = finSysTenantUserService;
        this.finSysTenantService = finSysTenantService;
        this.roleService = roleService;
@@ -114,75 +113,38 @@
        CommonUtil.copyProperties(param, param2);
        param = param2;
        if (param.getTenantCode() == 0) {
            FinSysTenantUser user = new FinSysTenantUser();
            Long id = this.getCurrentUser().getId();
            user.setSysUserId(id);
            List<FinSysTenantUser> select = finSysTenantUserService.select(user);
            if (select.size() > 0) {
                param.setTenantCode(new Long(select.get(0).getTenantCode()));
            String tenantId = this.getSysInfo().getTenantId();
            FinSysTenant finSysTenant = finSysTenantService.selectById(Long.valueOf(tenantId));
            if (finSysTenant != null) {
                param.setTenantCode(Long.valueOf(finSysTenant.getCode()));
            }
        }
        GenericPager<FinSysTenantUser> pager = this.finSysTenantUserService.queryAllPageUser(param);

        List<FinSysTenantUserVO> resultList = Lists.newArrayList();
        List<FinSysTenantUser> datas = pager.getDatas();
        if (datas.size() > 0) {
            for (FinSysTenantUser finSysTenantUser : datas) {
                FinSysTenantUserVO userVO = new FinSysTenantUserVO();
                if (finSysTenantUser.getUserPhone() != null) {
                    // 解密并脱敏
                    String tel = null;
                    try {
                        tel = AESUtils.decryptStrAES(finSysTenantUser.getUserPhone(), PlatformRSAUtils.AES_KEY);
                    } catch (Exception e) {
                        logger.error("解密手机号失败，原因：" + e);
                        tel = null;
                    }
                    if (StringUtils.isNotEmpty(tel)) {
                        finSysTenantUser.setUserPhone(PhoneNumberUtils.maskMobile(tel));
                    } else {
                        finSysTenantUser.setUserPhone("");
                    }
                } else {
                    finSysTenantUser.setUserPhone("");
                }
        List<FinSysTenantUserVO> resultList = new ArrayList<>();
        for (FinSysTenantUser finSysTenantUser : pager.getDatas()) {
            FinSysTenantUserVO userVO = new FinSysTenantUserVO();
            String tel = finSysTenantUser.getUserPhone() != null
                ? AESUtils.decryptStrAES(finSysTenantUser.getUserPhone(), PlatformRSAUtils.AES_KEY) : null;
            finSysTenantUser.setUserPhone(StringUtils.isNotEmpty(tel) ? PhoneNumberUtils.maskMobile(tel) : "");

                // 循环去查角色
                Long sysUserId = finSysTenantUser.getSysUserId();
                if (sysUserId != null) {
                    List<S_role> list = finSysTenantUserService.getByUserId(sysUserId);
                    String roleStr = "";
                    for (S_role s_role : list) {
                        roleStr = roleStr + s_role.getRole_name() + "  ";
                    }
                    finSysTenantUser.setRoleStr(roleStr);
                }
            List<S_role> list = finSysTenantUserService.getByUserId(finSysTenantUser.getSysUserId());
            StringBuilder roleStr = new StringBuilder();
            list.forEach(s_role -> roleStr.append(s_role.getRole_name()).append(" "));
            finSysTenantUser.setRoleStr(roleStr.toString());

                // 循环查询运维商id
                if (finSysTenantUser.getSupplierId() != null) {
                    finSysTenantUser.setIsSupplier("是");
                } else {
                    finSysTenantUser.setIsSupplier("否");
                }
                BeanUtils.copyProperties(finSysTenantUser, userVO);
                Long sysDeptId = finSysTenantUser.getSysDeptId();
                FinSysTenantDepartment department = finSysTenantDepartmentService.getById(sysDeptId);
                if (Objects.nonNull(department)) {
                    userVO.setSysDeptName(department.getName());
                }
                resultList.add(userVO);
            finSysTenantUser.setIsSupplier(finSysTenantUser.getSupplierId() != null ? "是" : "否");

            BeanUtils.copyProperties(finSysTenantUser, userVO);
            FinSysTenantDepartment department = finSysTenantDepartmentService.getById(finSysTenantUser.getSysDeptId());
            if (Objects.nonNull(department)) {
                userVO.setSysDeptName(department.getName());
            }
            resultList.add(userVO);
        }

        try {
            Field fieldDatas = GenericPager.class.getDeclaredField("datas");
            // fieldDatas.setAccessible(true);
            // fieldDatas.set(pager, resultList);
            ReflectUtil.setFieldValue(pager, fieldDatas, resultList);
        ReflectUtil.setFieldValue(pager, "datas", resultList);

        } catch (Exception e) {
            logger.error("分页列表查询失败，原因：" + e);
        }
        return ResponseValue.success(pager);
    }

@@ -213,25 +175,41 @@
            return ResponseValue.error("参数为空");
        }
        // 根据员工编号查询，如果存在则提示
        if (finSysTenantUserService.getByUserCode(tenantUser.getUserCode()) != null
            && finSysTenantUserService.getByUserCode(tenantUser.getUserCode()) > 0) {
        FinSysTenantUser userCode = finSysTenantUserService.getByUserCode(tenantUser.getUserCode());
        if (userCode != null) {
            return ResponseValue.error("员工编号重复");
        }

        if (StringUtils.isEmpty(tenantUser.getTenantId()) || "0".equals(tenantUser.getTenantId())) {
            return ResponseValue.error("添加时请选择区县");
        }

        if (StringUtils.isEmpty(tenantUser.getTenantCode()) || "0".equals(tenantUser.getTenantCode())) {
            return ResponseValue.error("添加时请选择区县");
        }
        // 插入系统用户
        buildTenantUser(tenantUser, null);
        this.finSysTenantUserService.insert(tenantUser);

        // 插入平台用户
        S_user_core userCore = getsUserCore(tenantUser);
        this.userService.insert(userCore);
        // 插入平台机构
        // 少角色id
        // 机构id 多个
        List<Long> roleList = user.getRoleList();
        if (!CollectionUtils.isEmpty(roleList)) {
            // 用户id
            Long sysUserId = tenantUser.getSysUserId();
            this.finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
        }
        // this.getFinCustomerCache().remove();
        return ResponseValue.success(1);
    }

    private void buildTenantUser(FinSysTenantUser tenantUser, FinSysTenantUser sysInfo) {
        tenantUser.setId(NumberGenerator.getLongSequenceNumber());
        tenantUser.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
        tenantUser.setCreateBy(this.getCurrentUser().getUser_name());
        tenantUser.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
        tenantUser.setUpdateBy(this.getCurrentUser().getUser_name());
        // user.setStatus(1);// 0禁用 1启用
        // 是否删除 0是 1否
        tenantUser.setIsDelete(0);
        tenantUser.setSysUserId(NumberGenerator.getLongSequenceNumber());
        // 加密手机号
@@ -241,32 +219,46 @@
            encPhone = AESUtils.encryptStrAES(tenantUser.getUserPhone(), key);
        }
        tenantUser.setUserPhone(encPhone);
        // 怎么获取左侧机构树数据
        // tenantUser.setSysDeptId(3L); // 对应平台机构id 默认为平台管理
        this.finSysTenantUserService.insert(tenantUser);
        String tenantId = tenantUser.getTenantId();
        FinSysTenant finSysTenant = finSysTenantService.selectById(Long.valueOf(tenantId));
        tenantUser.setTenantCode(finSysTenant.getCode());

        // 插入平台用户
        // 处理方法addSupplier
        if (sysInfo != null) {
            tenantUser.setIsDelete(1);
            tenantUser.setLv(sysInfo.getLv());
            tenantUser.setTenantCode(sysInfo.getTenantCode());
            tenantUser.setTenantId(sysInfo.getTenantId());
            // 运维管理
            tenantUser.setSysDeptId(2l);
        }

    }

    private S_user_core getsUserCore(FinSysTenantUser tenantUser) {
        S_user_core userCore = new S_user_core();
        userCore.setId(tenantUser.getSysUserId());
        userCore.setDept_id(3L); // 部门id，目前写死
        userCore.setOrg_id(tenantUser.getSysDeptId()); // 机构id
        // 部门id 部门信息未同步，只填充数据
        userCore.setDept_id(tenantUser.getSysDeptId());
        // 机构id
        userCore.setOrg_id(tenantUser.getSysDeptId());
        userCore.setOrg_id(1L);
        userCore.setUser_name(tenantUser.getUserCode()); // 用户账号
        // 用户账号
        userCore.setUser_name(tenantUser.getUserCode());
        userCore.setNick_name(tenantUser.getUserName());
        // 用户类型 先默认设置为2
        userCore.setUser_type(2);
        userCore.setPhonenumber(encPhone);
        userCore.setPhonenumber(tenantUser.getUserPhone());
        userCore.setSex(tenantUser.getSex().toString());
        // 初始化密码 123456
        String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
        userCore.setPassword(pws);
        // 平台用户表和系统用户 表状态相反
        if (tenantUser.getStatus() == 0) {
            tenantUser.setStatus(1);
            userCore.setStatus(1);
        } else {
            tenantUser.setStatus(0);
            userCore.setStatus(0);
        }
        userCore.setStatus(tenantUser.getStatus());
        userCore.setDel_flag(0);
        userCore.setCreate_by(this.getCurrentUser().getUser_name());
        userCore.setCreate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
@@ -289,16 +281,7 @@
        userCore.setType(1);
        // 商户id，0-平台
        userCore.setMer_id(0L);
        this.userService.insert(userCore);
        // 插入平台机构
        // 少角色id
        List<Long> roleList = user.getRoleList(); // 机构id 多个
        if (!CollectionUtils.isEmpty(roleList)) {
            Long sysUserId = tenantUser.getSysUserId(); // 用户id
            this.finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
        }
        // this.getFinCustomerCache().remove();
        return ResponseValue.success(1);
        return userCore;
    }

    /**
@@ -335,7 +318,7 @@
                    throw new ImportUserParamVerifyException("单元格不能为空!");
                }
                // 根据员工编号查询，如果存在则提示
                if (finSysTenantUserService.getByUserCode(data.getUserCode()) > 0) {
                if (finSysTenantUserService.getByUserCode(data.getUserCode()) != null) {
                    throw new ImportUserParamVerifyException("员工编号为空或已存在!");
                }
                if (data.getSex() < 1 && data.getSex() > 0) {
@@ -415,49 +398,7 @@
        ArrayList<S_user_core> sUserCores = new ArrayList<>();
        for (FinSysTenantUser user : finSysTenantUsers) {
            // 插入平台用户
            S_user_core userCore = new S_user_core();
            userCore.setId(user.getSysUserId());
            userCore.setDept_id(3L); // 部门id，目前写死
            userCore.setOrg_id(user.getSysDeptId()); // 机构id
            userCore.setOrg_id(1L);
            userCore.setUser_name(user.getUserCode()); // 用户账号
            userCore.setNick_name(user.getUserName());
            // 用户类型 先默认设置为2
            userCore.setUser_type(2);
            userCore.setPhonenumber(user.getUserPhone());
            userCore.setSex(user.getSex().toString());
            // 初始化密码 123456
            String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
            userCore.setPassword(pws);
            // 平台用户表和系统用户 表状态相反
            if (user.getStatus() == 0) {
                user.setStatus(1);
            } else {
                user.setStatus(0);
            }
            userCore.setStatus(user.getStatus());
            userCore.setDel_flag(0);
            userCore.setCreate_by(this.getCurrentUser().getUser_name());
            userCore.setCreate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
            userCore.setRemark(user.getRemark());
            userCore.setType(1);
            userCore.setBind_client_id("0");
            userCore.setBind_wechat(0);
            userCore.setModify_pwd(0);
            userCore.setBind_mobile(0);
            userCore.setBind_mail(0);
            userCore.setProfile_id(0L);
            userCore.setIs_wechat_public(0);
            userCore.setIs_wechat_routine(0);
            userCore.setIs_wechat_ios(0);
            userCore.setIs_wechat_android(0);
            userCore.setIs_logoff(0);
            userCore.setLogoff_time(0L);
            userCore.setIs_sms(0);
            // 管理员类型：1= 平台超管, 2=商户超管, 3=系统管理员，4=商户管理员
            userCore.setType(1);
            // 商户id，0-平台
            userCore.setMer_id(0L);
            S_user_core userCore = getsUserCore(user);
            sUserCores.add(userCore);
        }
        // 保存用户信息
@@ -503,17 +444,37 @@
        // 1.更新系统用户 FIN_SYS_TENANT_USER
        finSysTenantUserService.update(tenantUser);
        // 2.更新平台用户 S_USER_CORE
        S_user_core userCore = buildUpdateUserCore(user);
        this.userService.update(userCore);
        // 3. 更新角色配置 S_ROLE_USER
        // 1. 根据 user.getSysUserId() 查询
        // 已有的权限
        Long sysUserId = user.getSysUserId();
        List<S_role> list = finSysTenantUserService.getByUserId(sysUserId);
        // 选择的权限
        List<Long> roleList = user.getRoleList();
        // 先删除再添加
        if (list != null && list.size() > 0) {
            finSysTenantUserService.execDelRoleUserList(sysUserId);
        }
        if (roleList != null && roleList.size() > 0) {
            finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
        }
        this.getFinSysTenantUserCache().remove(sysUserId.toString());
        return ResponseValue.success(1);
    }

    private S_user_core buildUpdateUserCore(FinSysTenantUser user) {
        S_user_core userCore = new S_user_core();
        userCore.setId(user.getSysUserId());
        userCore.setUpdate_by(this.getCurrentUser().getUser_name());
        userCore.setUpdate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
        // 平台用户表和系统用户 表状态相反
        if (user.getStatus() == 0) {
            user.setStatus(1);
            userCore.setStatus(1);
        } else {
            user.setStatus(0);
            userCore.setStatus(0);
        }
        userCore.setStatus(user.getStatus());
        if (user.getSex() != null) {
            userCore.setSex(user.getSex().toString());
        }
@@ -521,20 +482,8 @@
        userCore.setNick_name(user.getUserName());
        // 加密手机号
        userCore.setPhonenumber(user.getUserPhone());
        this.userService.update(userCore);
        // 3. 更新角色配置 S_ROLE_USER
        // 1. 根据 user.getSysUserId() 查询
        List<S_role> list = finSysTenantUserService.getByUserId(user.getSysUserId()); // 已有的权限
        List<Long> roleList = user.getRoleList(); // 选择的权限
        // 先删除再添加
        if (list != null && list.size() > 0) {
            finSysTenantUserService.execDelRoleUserList(user.getSysUserId());
        }
        if (roleList != null && roleList.size() > 0) {
            finSysTenantUserService.execInsertRoleUserList(roleList, user.getSysUserId());
        }
        this.getFinSysTenantUserCache().remove(user.getSysUserId() + "");
        return ResponseValue.success(1);

        return userCore;
    }

    /**
@@ -552,25 +501,14 @@
            return ResponseValue.error("参数为空");
        }
        // 1.更新系统用户 FIN_SYS_TENANT_USER 应该是查询 然后只改状态
        List<FinSysTenantUser> select = finSysTenantUserService.select(new FinSysTenantUser(tenantUser.getId()));
        if (select == null || select.size() == 0) {
        FinSysTenantUser finSysTenantUser = finSysTenantUserService.queryOneById(tenantUser.getId().toString());
        if (finSysTenantUser == null) {
            return ResponseValue.error("用户不存在");
        }
        FinSysTenantUser finSysTenantUser = select.get(0);
        finSysTenantUser.setStatus(user.getStatus());
        finSysTenantUserService.update(finSysTenantUser);
        // 2.更新平台用户 S_USER_CORE
        S_user_core userCore = new S_user_core();
        userCore.setId(user.getSysUserId());
        userCore.setUpdate_by(this.getCurrentUser().getUser_name());
        userCore.setUpdate_time(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
        // 平台用户表和系统用户 表状态相反
        if (user.getStatus() == 0) {
            user.setStatus(1);
        } else {
            user.setStatus(0);
        }
        userCore.setStatus(user.getStatus());
        S_user_core userCore = buildUpdateUserCore(tenantUser);
        this.userService.update(userCore);
        return ResponseValue.success(1);
    }
@@ -591,13 +529,14 @@
            return ResponseValue.error("用户信息不存在");
        }
        // 初始化密码 123456
        String stringValue = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();// 密文
        // 密文
        String password = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
        // 1. 修改用户表
        // 用户表id
        Long sysUserId = user.getSysUserId();
        S_user_core userCore = new S_user_core();
        userCore.setId(sysUserId);
        userCore.setPassword(stringValue);
        userCore.setPassword(password);
        userCore.setModify_pwd(0);
        userService.update(userCore);
        // 2. 修改平台用户（不用修改）
@@ -693,8 +632,10 @@
            return ResponseValue.error("参数为空");
        }
        // 1. 根据 user.getSysUserId() 查询
        List<S_role> list = finSysTenantUserService.getByUserId(user.getSysUserId()); // 已有的权限
        List<Long> roleList = user.getRoleList(); // 选择的权限
        // 已有的权限
        List<S_role> list = finSysTenantUserService.getByUserId(user.getSysUserId());
        // 选择的权限
        List<Long> roleList = user.getRoleList();
        // 先删除再添加
        if (list != null && list.size() > 0) {
            finSysTenantUserService.execDelRoleUserList(user.getSysUserId());
@@ -726,76 +667,18 @@
            return ResponseValue.error(roleName + "的角色不存在");
        }
        // 根据员工编号查询，如果存在则提示
        if (finSysTenantUserService.getByUserCode(user.getUserCode()) != null
            && finSysTenantUserService.getByUserCode(user.getUserCode()) > 0) {
        if (finSysTenantUserService.getByUserCode(user.getUserCode()) != null) {
            return ResponseValue.error("员工编号重复");
        }
        FinSysTenantUser sysInfo = this.getSysInfo();
        // 插入系统用户
        user.setId(NumberGenerator.getLongSequenceNumber());
        user.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
        user.setCreateBy(this.getCurrentUser().getUser_name());
        user.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
        user.setUpdateBy(this.getCurrentUser().getUser_name());
        user.setIsDelete(0);// 是否删除 0是 1否
        user.setSysUserId(NumberGenerator.getLongSequenceNumber());
        user.setIsDelete(1);
        user.setLv(sysInfo.getLv());
        user.setTenantCode(sysInfo.getTenantCode());
        user.setTenantId(sysInfo.getTenantId());
        user.setSysDeptId(2l); // 运维管理
        // 加密手机号
        String key = PlatformRSAUtils.AES_KEY;
        String userPhone = user.getUserPhone();
        String encPhone = "";
        if (userPhone != null) {
            encPhone = AESUtils.encryptStrAES(userPhone, key);
            user.setUserPhone(encPhone);
        }

        buildTenantUser(user, sysInfo);
        this.finSysTenantUserService.insert(user);
        // 插入平台用户
        S_user_core userCore = new S_user_core();
        userCore.setId(user.getSysUserId());
        userCore.setDept_id(depts.get(0).getId()); // 部门
        userCore.setOrg_id(1L);
        // userCore.setUser_name(); //用户账号
        userCore.setUser_name(user.getUserCode()); // 用户账号
        userCore.setNick_name(user.getUserName());
        // 用户类型 先默认设置为2
        userCore.setUser_type(2);

        userCore.setPhonenumber(userPhone);
        // 初始化密码 123456
        String pws = this.getArgumentVariable(ArgumentsConstants.KEY_SECURITY_PASSWORD_INIT).getStringValue();
        userCore.setPassword(pws);
        if (user.getStatus() == 0) {
            userCore.setStatus(1);
        } else {
            userCore.setStatus(0);
        }
        userCore.setDel_flag(0);
        userCore.setCreate_by(this.getCurrentUser().getCreate_by());
        userCore.setCreate_time(DateUtils.getDateTimeNumber());
        userCore.setRemark(user.getRemark());
        userCore.setType(1);
        userCore.setBind_client_id("0");
        userCore.setBind_wechat(0);
        userCore.setModify_pwd(0);
        userCore.setBind_mobile(0);
        userCore.setBind_mail(0);
        userCore.setProfile_id(0L);
        userCore.setIs_wechat_public(0);
        userCore.setIs_wechat_routine(0);
        userCore.setIs_wechat_ios(0);
        userCore.setIs_wechat_android(0);
        userCore.setIs_logoff(0);
        userCore.setLogoff_time(0L);
        userCore.setIs_sms(0);
        // 管理员类型：1= 平台超管, 2=商户超管, 3=系统管理员，4=商户管理员
        S_user_core userCore = buildUpdateUserCore(user);
        // 部门
        userCore.setDept_id(depts.get(0).getId());
        userCore.setType(2);
        // 商户id，0-平台
        userCore.setMer_id(0L);
        this.userService.insert(userCore);
        // 插入平台机构
        // 少角色id