配置调整

zhongrj

2024-05-29 a5fac95408a43ad43de9d88c30d06c0918c7bc8f

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

@@ -1,19 +1,3 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.springblade.modules.system.service.impl;


@@ -24,9 +8,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.logging.log4j.util.Strings;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
import org.springblade.common.cache.DictCache;
import org.springblade.common.cache.ParamCache;
import org.springblade.common.cache.SysCache;
@@ -45,16 +28,6 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.auth.enums.UserEnum;
import org.springblade.modules.community.entity.CommunityEntity;
import org.springblade.modules.community.service.ICommunityService;
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.house.entity.HouseholdEntity;
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.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;
import org.springblade.modules.system.excel.UserExcel;
@@ -65,9 +38,7 @@
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.*;

import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;

/**
@@ -84,7 +55,6 @@
   private final IUserOauthService userOauthService;
   private final IRoleService roleService;
   private final BladeTenantProperties tenantProperties;
   private final IPoliceAffairsGridService policeAffairsGridService;

   @Override
   @Transactional(rollbackFor = Exception.class)
@@ -147,56 +117,10 @@

   /**
    * 更新警格或网格的绑定
    *
    * @param user
    */
   public void updateGridBind(User user) {
      // 先删除原有区域的绑定
      QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
      queryWrapper.eq("is_deleted",0).like("police_user_id",user.getId());
      // 删除掉之前已绑定的
      List<PoliceAffairsGridEntity> list = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
      // 遍历
      for (PoliceAffairsGridEntity policeAffairsGridEntity : list) {
         List<String> arrayList = new ArrayList<>(Arrays.asList(policeAffairsGridEntity.getPoliceUserId().split(",")));
         arrayList.remove(user.getId().toString());
         // 更新
         policeAffairsGridEntity.setPoliceUserId(String.join(",",arrayList));
         // 解决更新报错
         policeAffairsGridEntity.setGeom(null);
         SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
      }
      // 判断机构类型
      List<String> deptIds = new ArrayList<>(Arrays.asList(user.getDeptId().split(",")));
      for (String deptId : deptIds) {
         // 查询对应的机构
         Dept dept = SpringUtil.getBean(IDeptService.class).getById(deptId);
         if (null!=dept.getDeptNature()
            && !Strings.isBlank(dept.getRegionCode())
            && dept.getDeptNature()==1
         ){
            QueryWrapper<PoliceAffairsGridEntity> wrapper = new QueryWrapper<>();
            wrapper.eq("is_deleted",0).eq("jw_grid_code",dept.getRegionCode());
            PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridService.getOne(wrapper);
            // 更新
            if (null!=policeAffairsGridEntity){
               if (!Strings.isBlank(policeAffairsGridEntity.getPoliceUserId())) {
                  if (!policeAffairsGridEntity.getPoliceUserId().contains(user.getId().toString())) {
                     policeAffairsGridEntity.setPoliceUserId(policeAffairsGridEntity.getPoliceUserId() + "," + user.getId());
                     // 解决更新报错
                     policeAffairsGridEntity.setGeom(null);
                     // 更新
                     SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
                  }
               }else {
                  policeAffairsGridEntity.setPoliceUserId(user.getId().toString());
                  // 解决更新报错
                  policeAffairsGridEntity.setGeom(null);
                  // 更新
                  SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
               }
            }
         }
      }
   }

   private boolean submitUserDept(User user) {
@@ -257,6 +181,12 @@
   @Override
   public User userByAccount(String tenantId, String account) {
      return baseMapper.selectOne(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, account).eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED));
   }

   @Override
   public UserInfo userInfo(String tenantId, String account) {
      User user = baseMapper.selectOne(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, account).eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED));
      return buildUserInfo(user);
   }

   @Override
@@ -374,7 +304,7 @@
         throw new ServiceException("不能删除本账号!");
      }
      boolean deleteLogic = deleteLogic(Func.toLongList(userIds));
      if (deleteLogic){
      if (deleteLogic) {
         // 删除警格绑定
         removePoliceGridBind(userIds);
      }
@@ -383,29 +313,10 @@

   /**
    * 删除警格绑定
    *
    * @param userIds
    */
   public void removePoliceGridBind(String userIds) {
      List<String> userIdList = new ArrayList<>(Arrays.asList(userIds.split(",")));
      for (String userId : userIdList) {
         // 先删除原有区域的绑定
         QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted",0).like("police_user_id",userId);
         // 删除掉之前已绑定的
         List<PoliceAffairsGridEntity> list = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
         if (list.size()>0) {
            // 遍历
            for (PoliceAffairsGridEntity policeAffairsGridEntity : list) {
               List<String> arrayList = new ArrayList<>(Arrays.asList(policeAffairsGridEntity.getPoliceUserId().split(",")));
               arrayList.remove(userId);
               // 更新
               policeAffairsGridEntity.setPoliceUserId(String.join(",", arrayList));
               // 解决更新报错
               policeAffairsGridEntity.setGeom(null);
               SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
            }
         }
      }
   }

   @Override
@@ -443,8 +354,12 @@
   }

   @Override
   public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
      List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
   public List<UserExcel> exportUser(Wrapper<User> queryWrapper, String deptId) {
      if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
         deptId = AuthUtil.getDeptId();
      }
      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      List<UserExcel> userList = baseMapper.exportUser(queryWrapper, deptIdList);
      userList.forEach(user -> {
         user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
         user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
@@ -595,31 +510,6 @@
      return baseMapper.searchUserById(id);
   }

   @Override
   public List<UserEntity> getUserInfoByCode(String houseCode, String type) {
      if (type.equals("0")) {
         IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
         return bean.getGridManByCode(houseCode);
      } else {
//         IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
//         return bean1.getDistictUserByCode(houseCode);
         String deptId = AuthUtil.getDeptId();
         List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
         return baseMapper.selectUserByDept(deptIdList);
      }
   }

   @Override
   public List<UserEntity> getUserInfoByDistrictId(String districtId, String building) {
      return baseMapper.getUserInfoByDistrictId(districtId, building);
   }

   @Override
   public List<User> getUserInfoByDistrictIds(String districtIds) {
      List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
      return baseMapper.getUserInfoByDistrictIds(list);
   }

   /**
    * 处理漏绑定的user_dept
    */
@@ -640,37 +530,17 @@

   @Override
   public List<User> getUserInfoByPropertyId(String propertyCompanyId, String roleId) {
      // 查询物业公司，获取物业公司的机构
      if(StringUtils.isBlank(propertyCompanyId)){
         return new ArrayList<>();
      }
      IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
      PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getId, propertyCompanyId));
      return baseMapper.getUserInfoByPropertyId(one.getDeptId().toString(), roleId);
      return null;
   }

   @Override
   public Object handleUser() {
      List<User> list = list(Wrappers.<User>lambdaQuery()
         .eq(User::getDeptId, "1727979636479037441")
         .eq(User::getRoleId, "1717429059648606209"));
      IHouseholdService bean = SpringUtil.getBean(IHouseholdService.class);
      int a = 0;
      for (User user : list) {
         System.out.println("查詢處理啊的人：" + user.getId());
         HouseholdEntity one = bean.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
            .eq(HouseholdEntity::getAssociatedUserId, user.getId())
            .eq(HouseholdEntity::getIsDeleted, 0));
         if (one != null) {
            a++;
         }
         System.out.println("查詢處理啊的人：" + a);
      }
      return null;
   }

   /**
    * 导入民警信息
    *
    * @param data
    */
   @Override
@@ -679,21 +549,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 +574,7 @@
            user.setPhone(userExcel.getPhone());
            user.setAccount(userExcel.getPhone());
            // 更新机构
            setDeptId(user,userExcel);
            setDeptId(user, userExcel);
            // 设置初始密码
            user.setPassword("123456");
            // 保存
@@ -720,58 +590,38 @@
   /**
    * 设置机构
    */
   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());
            }
         }
      }
   public void setDeptId(User user, PoliceUserExcel userExcel) {
   }

   /**
    * 机构不为空时处理
    *
    * @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,28 +631,12 @@

   /**
    * 更新社区民警绑定信息
    *
    * @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);
         }
      }

   }

   @Override
@@ -814,4 +648,27 @@
   public List<User> getUserListByDeptIds(String receiveDept) {
      return baseMapper.getUserListByDeptIds(receiveDept);
   }

   /**
    * 通过经纬度查询最近的民警人员
    *
    * @param longitude
    * @param latitude
    * @return
    */
   @Override
   public List<User> getPoliceUser(String longitude, String latitude, String houseCode) {
      List<User> policeUser = baseMapper.getPoliceUser(longitude, latitude);
      // 自动生成警单
//      if (StringUtils.isNotBlank(houseCode)) {
//         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;
   }
}