民警导入修改

zhongrj

2024-04-28 ebd41b7b2e44dc8b96f177d7bf88d2f5f997b75c

民警导入修改

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

@@ -24,16 +24,20 @@
    @ExcelProperty("姓名")
    private String realName;

    @ColumnWidth(10)
    @ExcelProperty("性别")
    private String sex;

    @ColumnWidth(15)
    @ExcelProperty("手机")
    @ExcelProperty("联系电话")
    private String phone;

    @ColumnWidth(15)
    @ExcelProperty("社区代码")
    private String communityCode;
    @ExcelProperty("工作单位")
    private String deptName;

    @ColumnWidth(15)
    @ExcelProperty("派出所名称")
    private String policeStationName;
    @ExcelProperty("角色")
    private String roleName;

}

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

@@ -85,6 +85,7 @@
    private final IUserDeptService userDeptService;
    private final IUserOauthService userOauthService;
    private final IRoleService roleService;
    private final IDeptService deptService;
    private final BladeTenantProperties tenantProperties;
    private final IPoliceAffairsGridService policeAffairsGridService;

@@ -116,8 +117,6 @@
            throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
        }
        boolean save = save(user);
        // 更新警格或网格的绑定
        updateGridBind(user);
        // 返回
        return save && submitUserDept(user);
    }
@@ -143,7 +142,7 @@
        user.setPassword(null);
        boolean b = updateById(user);
        // 更新警格或网格的绑定
        updateGridBind(user);
//        updateGridBind(user);
        return b;
    }

@@ -746,20 +745,21 @@
        for (PoliceUserExcel userExcel : data) {
            // 查询用户
            List<User> list = getUserListByPhoneOrAccount(userExcel.getPhone());

            if (list.size() > 0) {
                User userInfo = list.get(0);
                // 判断角色
                if (!userInfo.getRoleId().contains("1727864411451359233")) {
                    userInfo.setRoleId(userInfo.getRoleId() + ",1727864411451359233");
                }
                // 设置性别
                setSex(userInfo,userExcel);
                // 更新机构
                setDeptId(userInfo, userExcel);
                // 更新
                updateById(userInfo);
                // 更新用户机构绑定
                submitUserDept(userInfo);
                // 更新社区民警绑定信息
                updateGridBind(userInfo);
            } else {
                // 插入用户角色
                User user = new User();
@@ -770,6 +770,8 @@
                user.setRealName(userExcel.getRealName());
                user.setPhone(userExcel.getPhone());
                user.setAccount(userExcel.getPhone());
                // 设置性别
                setSex(user,userExcel);
                // 更新机构
                setDeptId(user, userExcel);
                // 设置初始密码
@@ -778,9 +780,21 @@
                submit(user);
                // 更新用户机构绑定
                submitUserDept(user);
                // 更新社区民警绑定信息
                updateGridBind(user);
            }
        }
    }

    /**
     * 设置性别
     * @param user
     * @param userExcel
     */
    private void setSex(User user, PoliceUserExcel userExcel) {
        if (userExcel.getSex().contains("男")){
            user.setSex(1);
        }
        if (userExcel.getSex().contains("女")){
            user.setSex(2);
        }
    }

@@ -789,26 +803,8 @@
     */
    public void setDeptId(User user, PoliceUserExcel userExcel) {
        // 查询机构
        QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("is_deleted", 0)
            .eq("community_code", userExcel.getCommunityCode())
            .eq("pcs_name", userExcel.getPoliceStationName());
        PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridService.getOne(queryWrapper);
        if (null != policeAffairsGridEntity) {
            // 查询对应绑定的机构
            QueryWrapper<Dept> wrapper = new QueryWrapper<>();
            wrapper.eq("is_deleted", 0)
                .eq("dept_nature", 1)
                .eq("region_code", policeAffairsGridEntity.getJwGridCode());
            Dept dept = SpringUtil.getBean(IDeptService.class).getOne(wrapper);
            if (null != dept) {
                if (null != user.getId()) {
                    DeptNotHandle(user, dept);
                } else {
                    user.setDeptId(dept.getId().toString());
                }
            }
        }
        String deptIds = deptService.getDeptIds("000000", userExcel.getDeptName());
        user.setDeptId(deptIds);
    }

    /**
@@ -843,33 +839,6 @@
                if (!user.getDeptId().contains(dept.getId().toString())) {
                    user.setDeptId(user.getDeptId() + "," + dept.getId());
                }
            }
        }
    }

    /**
     * 更新社区民警绑定信息
     *
     * @param userExcel
     * @param user
     */
    public void updateCommunityInfo(PoliceUserExcel userExcel, User user) {
        QueryWrapper<CommunityEntity> wrapper = new QueryWrapper<>();
        System.out.println("wrapper = " + userExcel.getCommunityCode());
        wrapper.eq("is_deleted", 0).eq("code", userExcel.getCommunityCode());
        CommunityEntity one = SpringUtil.getBean(ICommunityService.class).getOne(wrapper);
        if (null != one) {
            String userId = user.getId().toString();
            if (!Strings.isBlank(one.getResPoliceUserId())) {
                if (!one.getResPoliceUserId().contains(userId)) {
                    one.setResPoliceUserId(one.getResPoliceUserId() + "," + userId);
                    // 更新
                    SpringUtil.getBean(ICommunityService.class).updateById(one);
                }
            } else {
                one.setResPoliceUserId(userId);
                // 更新
                SpringUtil.getBean(ICommunityService.class).updateById(one);
            }
        }
    }

 src/main/resources/application.yml

@@ -252,7 +252,7 @@
      - /blade-policeAlarmRecords/policeAlarmRecords/save
      - /blade-smsSend/smsSend/send
#      - /blade-householdLabel/**
#      - /blade-placeRel/**
#      - /blade-system/**
#      - /blade-doorplateAddress/doorplateAddress/**
#      - /blade-house/house/**
#      - /blade-household/household/**