From bb758220283deccd1ae7ea79a7c635d8828c71be Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 05 Feb 2024 11:23:35 +0800
Subject: [PATCH] 用户机构调整绑定警格处理
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 6fa8188..4e0bbba 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -48,6 +48,8 @@
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;
@@ -62,10 +64,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
@@ -83,6 +82,7 @@
private final IUserOauthService userOauthService;
private final IRoleService roleService;
private final BladeTenantProperties tenantProperties;
+ private final IPoliceAffairsGridService policeAffairsGridService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -111,7 +111,11 @@
if (userCount > 0L && Func.isEmpty(user.getId())) {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
- return save(user) && submitUserDept(user);
+ boolean save = save(user);
+ // 更新警格或网格的绑定
+ updateGridBind(user);
+ // 返回
+ return save && submitUserDept(user);
}
@Override
@@ -134,7 +138,48 @@
public boolean updateUserInfo(User user) {
user.setPassword(null);
boolean b = updateById(user);
+ // 更新警格或网格的绑定
+ updateGridBind(user);
return b;
+ }
+
+ /**
+ * 更新警格或网格的绑定
+ * @param user
+ */
+ public void updateGridBind(User user) {
+ // 判断机构类型
+ List<String> deptIds = 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) {
@@ -634,4 +679,14 @@
}
}
}
+
+ @Override
+ public List<User> getUserListByIds(String receiveUser) {
+ return baseMapper.selectBatchIds(Arrays.asList(receiveUser.split(",")));
+ }
+
+ @Override
+ public List<User> getUserListByDeptIds(String receiveDept) {
+ return baseMapper.getUserListByDeptIds(receiveDept);
+ }
}
--
Gitblit v1.9.3