Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

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

@@ -17,6 +17,7 @@
package org.springblade.modules.system.service.impl;


import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -43,16 +44,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;
@@ -82,7 +73,6 @@
   private final IUserOauthService userOauthService;
   private final IRoleService roleService;
   private final BladeTenantProperties tenantProperties;
   private final IPoliceAffairsGridService policeAffairsGridService;

   @Override
   @Transactional(rollbackFor = Exception.class)
@@ -148,53 +138,6 @@
    * @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) {
@@ -212,9 +155,9 @@
   }

   @Override
   public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
      if (null == deptId && !AuthUtil.isAdministrator()) {
         deptId = Long.parseLong(AuthUtil.getDeptId());
   public IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId) {
      if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
         deptId = AuthUtil.getDeptId();
      }
      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
@@ -384,26 +327,6 @@
    * @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
@@ -595,18 +518,18 @@

   @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);
      }
      return null;
   }

   @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);
   }

   /**
@@ -630,28 +553,11 @@
   @Override
   public List<User> getUserInfoByPropertyId(String propertyCompanyId, String roleId) {
      // 查询物业公司，获取物业公司的机构
      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 baseMapper.getUserInfoByPropertyId(null, roleId);
   }

   @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;
   }

@@ -707,27 +613,6 @@
    * 设置机构
    */
   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());
            }
         }
      }
   }

   /**
@@ -761,32 +646,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);
         }
      }
   }