lin
2024-03-13 1ad34492bb286f55d3ce6dcdeb643f0d52062c4a
自动生成警单
3 files modified
108 ■■■■■ changed files
src/main/java/org/springblade/modules/system/controller/UserController.java 6 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/IUserService.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java 100 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -459,9 +459,9 @@
     * latitude
     */
    @GetMapping("/getPoliceUser")
    @ApiOperation(value = "查询物业人员/网格人员")
    public R getPoliceUser(@RequestParam("distrlongitudeictId") String longitude, @RequestParam(value = "latitude", required = false) String latitude) {
        return R.data(userService.getPoliceUser(longitude, latitude));
    @ApiOperation(value = "通过经纬度查询最近的民警人员")
    public R getPoliceUser(@RequestParam("longitude") String longitude, @RequestParam(value = "latitude") String latitude,@RequestParam(value = "houseCode",required = false) String houseCode) {
        return R.data(userService.getPoliceUser(longitude, latitude,houseCode));
    }
}
src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -276,5 +276,5 @@
     * @param latitude
     * @return
     */
    List<User> getPoliceUser(String longitude, String latitude);
    List<User> getPoliceUser(String longitude, String latitude, String houseCode);
}
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -52,8 +52,9 @@
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity;
import org.springblade.modules.policeAlarmRecords.service.IPoliceAlarmRecordsService;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.excel.PoliceUserExcel;
@@ -147,12 +148,13 @@
    /**
     * 更新警格或网格的绑定
     *
     * @param user
     */
    public void updateGridBind(User user) {
        // 先删除原有区域的绑定
        QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("is_deleted",0).like("police_user_id",user.getId());
        queryWrapper.eq("is_deleted", 0).like("police_user_id", user.getId());
        // 删除掉之前已绑定的
        List<PoliceAffairsGridEntity> list = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
        // 遍历
@@ -160,7 +162,7 @@
            List<String> arrayList = new ArrayList<>(Arrays.asList(policeAffairsGridEntity.getPoliceUserId().split(",")));
            arrayList.remove(user.getId().toString());
            // 更新
            policeAffairsGridEntity.setPoliceUserId(String.join(",",arrayList));
            policeAffairsGridEntity.setPoliceUserId(String.join(",", arrayList));
            // 解决更新报错
            policeAffairsGridEntity.setGeom(null);
            SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
@@ -170,15 +172,15 @@
        for (String deptId : deptIds) {
            // 查询对应的机构
            Dept dept = SpringUtil.getBean(IDeptService.class).getById(deptId);
            if (null!=dept.getDeptNature()
            if (null != dept.getDeptNature()
                && !Strings.isBlank(dept.getRegionCode())
                && dept.getDeptNature()==1
            ){
                && dept.getDeptNature() == 1
            ) {
                QueryWrapper<PoliceAffairsGridEntity> wrapper = new QueryWrapper<>();
                wrapper.eq("is_deleted",0).eq("jw_grid_code",dept.getRegionCode());
                wrapper.eq("is_deleted", 0).eq("jw_grid_code", dept.getRegionCode());
                PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridService.getOne(wrapper);
                // 更新
                if (null!=policeAffairsGridEntity){
                if (null != policeAffairsGridEntity) {
                    if (!Strings.isBlank(policeAffairsGridEntity.getPoliceUserId())) {
                        if (!policeAffairsGridEntity.getPoliceUserId().contains(user.getId().toString())) {
                            policeAffairsGridEntity.setPoliceUserId(policeAffairsGridEntity.getPoliceUserId() + "," + user.getId());
@@ -187,7 +189,7 @@
                            // 更新
                            SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
                        }
                    }else {
                    } else {
                        policeAffairsGridEntity.setPoliceUserId(user.getId().toString());
                        // 解决更新报错
                        policeAffairsGridEntity.setGeom(null);
@@ -374,7 +376,7 @@
            throw new ServiceException("不能删除本账号!");
        }
        boolean deleteLogic = deleteLogic(Func.toLongList(userIds));
        if (deleteLogic){
        if (deleteLogic) {
            // 删除警格绑定
            removePoliceGridBind(userIds);
        }
@@ -383,6 +385,7 @@
    /**
     * 删除警格绑定
     *
     * @param userIds
     */
    public void removePoliceGridBind(String userIds) {
@@ -390,10 +393,10 @@
        for (String userId : userIdList) {
            // 先删除原有区域的绑定
            QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("is_deleted",0).like("police_user_id",userId);
            queryWrapper.eq("is_deleted", 0).like("police_user_id", userId);
            // 删除掉之前已绑定的
            List<PoliceAffairsGridEntity> list = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
            if (list.size()>0) {
            if (list.size() > 0) {
                // 遍历
                for (PoliceAffairsGridEntity policeAffairsGridEntity : list) {
                    List<String> arrayList = new ArrayList<>(Arrays.asList(policeAffairsGridEntity.getPoliceUserId().split(",")));
@@ -641,7 +644,7 @@
    @Override
    public List<User> getUserInfoByPropertyId(String propertyCompanyId, String roleId) {
        // 查询物业公司,获取物业公司的机构
        if(StringUtils.isBlank(propertyCompanyId)){
        if (StringUtils.isBlank(propertyCompanyId)) {
            return new ArrayList<>();
        }
        IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
@@ -671,6 +674,7 @@
    /**
     * 导入民警信息
     *
     * @param data
     */
    @Override
@@ -679,21 +683,21 @@
        for (PoliceUserExcel userExcel : data) {
            // 查询用户
            List<User> list = getUserListByPhoneOrAccount(userExcel.getPhone());
            if (list.size()>0){
            if (list.size() > 0) {
                User userInfo = list.get(0);
                // 判断角色
                if (!userInfo.getRoleId().contains("1727864411451359233")){
                if (!userInfo.getRoleId().contains("1727864411451359233")) {
                    userInfo.setRoleId(userInfo.getRoleId() + ",1727864411451359233");
                }
                // 更新机构
                setDeptId(userInfo,userExcel);
                setDeptId(userInfo, userExcel);
                // 更新
                updateById(userInfo);
                // 更新用户机构绑定
                submitUserDept(userInfo);
                // 更新社区民警绑定信息
                updateGridBind(userInfo);
            }else {
            } else {
                // 插入用户角色
                User user = new User();
                user.setTenantId("000000");
@@ -704,7 +708,7 @@
                user.setPhone(userExcel.getPhone());
                user.setAccount(userExcel.getPhone());
                // 更新机构
                setDeptId(user,userExcel);
                setDeptId(user, userExcel);
                // 设置初始密码
                user.setPassword("123456");
                // 保存
@@ -720,24 +724,24 @@
    /**
     * 设置机构
     */
    public void setDeptId(User user,PoliceUserExcel userExcel) {
    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());
        queryWrapper.eq("is_deleted", 0)
            .eq("community_code", userExcel.getCommunityCode())
            .eq("pcs_name", userExcel.getPoliceStationName());
        PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridService.getOne(queryWrapper);
        if (null!=policeAffairsGridEntity){
        if (null != policeAffairsGridEntity) {
            // 查询对应绑定的机构
            QueryWrapper<Dept> wrapper = new QueryWrapper<>();
            wrapper.eq("is_deleted",0)
                .eq("dept_nature",1)
                .eq("region_code",policeAffairsGridEntity.getJwGridCode());
            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()){
            if (null != dept) {
                if (null != user.getId()) {
                    DeptNotHandle(user, dept);
                }else {
                } else {
                    user.setDeptId(dept.getId().toString());
                }
            }
@@ -746,32 +750,33 @@
    /**
     * 机构不为空时处理
     *
     * @param user
     * @param dept
     */
    public void DeptNotHandle(User user, Dept dept) {
        // 更新设置机构
        if (!Strings.isBlank(user.getDeptId())){
        if (!Strings.isBlank(user.getDeptId())) {
            // 查询对应的派出所(去掉)
            Dept deptPcs = SpringUtil.getBean(IDeptService.class).getDeptByDeptIds(user.getDeptId());
            if (null!=deptPcs) {
            if (null != deptPcs) {
                // 如果存在需要去掉派出所的机构id
                List<String> list = new ArrayList<>(Arrays.asList(user.getDeptId().split(",")));
                // 先删除派出所对应的机构ID
                if (list.contains(deptPcs.getId().toString())){
                if (list.contains(deptPcs.getId().toString())) {
                    list.remove(deptPcs.getId().toString());
                    user.setDeptId(String.join(",",list));
                    user.setDeptId(String.join(",", list));
                }
                // 删完后可能就没了
                if (!Strings.isBlank(user.getDeptId())) {
                    if (!user.getDeptId().contains(dept.getId().toString())) {
                        user.setDeptId(user.getDeptId() + "," + dept.getId());
                    }
                }else {
                } else {
                    // 删完后的
                    user.setDeptId(dept.getId().toString());
                }
            }else {
            } else {
                if (!user.getDeptId().contains(dept.getId().toString())) {
                    user.setDeptId(user.getDeptId() + "," + dept.getId());
                }
@@ -781,23 +786,24 @@
    /**
     * 更新社区民警绑定信息
     *
     * @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());
        wrapper.eq("is_deleted", 0).eq("code", userExcel.getCommunityCode());
        CommunityEntity one = SpringUtil.getBean(ICommunityService.class).getOne(wrapper);
        if (null!=one){
        if (null != one) {
            String userId = user.getId().toString();
            if (!Strings.isBlank(one.getResPoliceUserId())){
                if(!one.getResPoliceUserId().contains(userId)) {
            if (!Strings.isBlank(one.getResPoliceUserId())) {
                if (!one.getResPoliceUserId().contains(userId)) {
                    one.setResPoliceUserId(one.getResPoliceUserId() + "," + userId);
                    // 更新
                    SpringUtil.getBean(ICommunityService.class).updateById(one);
                }
            }else {
            } else {
                one.setResPoliceUserId(userId);
                // 更新
                SpringUtil.getBean(ICommunityService.class).updateById(one);
@@ -817,12 +823,22 @@
    /**
     * 通过经纬度查询最近的民警人员
     *
     * @param longitude
     * @param latitude
     * @return
     */
    @Override
    public List<User> getPoliceUser(String longitude, String latitude) {
        return baseMapper.getPoliceUser( longitude,  latitude);
    public List<User> getPoliceUser(String longitude, String latitude, String houseCode) {
        List<User> policeUser = baseMapper.getPoliceUser(longitude, latitude);
        // todo 自动生成警单
        IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class);
        PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity();
        policeAlarmRecordsEntity.setHouseCode(houseCode);
        if (policeUser != null && policeUser.size() == 1) {
            policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId());
        }
        policeAlarmRecordsService.save(policeAlarmRecordsEntity);
        return policeUser;
    }
}