From cb734129b410c02275c0f2fc5e820d6ccc0e17c0 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 18 Jun 2024 18:12:20 +0800
Subject: [PATCH] 出租屋查询房东信息
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 152 +++++++++++++++++++++++++++++++-------------------
1 files changed, 94 insertions(+), 58 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 682f01c..7ed7f80 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
@@ -39,6 +39,7 @@
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.BladeTenantProperties;
import org.springblade.core.tool.constant.BladeConstant;
@@ -65,10 +66,15 @@
import org.springblade.modules.system.vo.UserDetailVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.ReturnType;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
@@ -85,8 +91,13 @@
private final IUserDeptService userDeptService;
private final IUserOauthService userOauthService;
private final IRoleService roleService;
+ private final IDeptService deptService;
private final BladeTenantProperties tenantProperties;
private final IPoliceAffairsGridService policeAffairsGridService;
+
+ @Autowired
+ private BladeRedis redisTemplate;
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -116,8 +127,6 @@
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
boolean save = save(user);
- // 更新警格或网格的绑定
- updateGridBind(user);
// 返回
return save && submitUserDept(user);
}
@@ -143,7 +152,7 @@
user.setPassword(null);
boolean b = updateById(user);
// 更新警格或网格的绑定
- updateGridBind(user);
+// updateGridBind(user);
return b;
}
@@ -216,6 +225,42 @@
return b;
}
+ /**
+ * 尝试获取锁
+ * @param timeout 超时时间（毫秒）
+ * @return 是否成功获取锁
+ */
+ public boolean lock(long timeout,String lockKey) {
+ long endTime = System.currentTimeMillis() + timeout;
+ ValueOperations<String, Object> ops = redisTemplate.getValueOps();
+ while (System.currentTimeMillis() < endTime) {
+ // 使用setIfAbsent命令尝试设置值，仅当key不存在时设置，类似于SETNX
+ Boolean result = ops.setIfAbsent(lockKey, String.valueOf(System.currentTimeMillis() + 5000), 5, TimeUnit.SECONDS);
+ if (result != null && result) {
+ return true;
+ }
+ try {
+ // 短暂休眠，防止CPU过度占用
+ Thread.sleep(10);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new RuntimeException(e);
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 释放锁
+ */
+ public void unlock(String lockKey) {
+ // 使用lua脚本保证操作的原子性，避免删除非本客户端创建的锁
+ String script = "if redis.call('get', KEYS[1]) == ARGV[1] then return redis.call('del', KEYS[1]) else return 0 end";
+ redisTemplate.getRedisTemplate().execute((RedisCallback<Object>) (connection) -> connection.eval(script.getBytes(), ReturnType.INTEGER, 1, lockKey.getBytes(), String.valueOf(redisTemplate.getValueOps().get(lockKey)).getBytes()));
+ }
+
+
+
@Override
public IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId) {
if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
@@ -280,7 +325,7 @@
* @param tenantId
* @param account
* @param password
- * @param type 登录类型 2：pc 3：app
+ * @param type 登录类型 2：pc 3：app
* @return
*/
@Override
@@ -344,7 +389,6 @@
}
/**
- *
* @param user
* @param type 登录类型 2：pc 3：app
* @return
@@ -357,7 +401,7 @@
userInfo.setUser(user);
if (Func.isNotEmpty(user)) {
// 判断登录类型设置对应的角色id
- user.setRoleId(Strings.join(roleService.getRoleIdStrByRoleIdAndType(user.getRoleId(),type), ','));
+ user.setRoleId(Strings.join(roleService.getRoleIdStrByRoleIdAndType(user.getRoleId(), type), ','));
// 设置角色别名
List<String> roleAlias = roleService.getRoleAliases(user.getRoleId());
userInfo.setRoles(roleAlias);
@@ -540,6 +584,28 @@
}
@Override
+ public boolean registerUser(UserVO user) {
+ if (StringUtils.isEmpty(user.getAccount())) {
+ throw new ServiceException("账号不能为空!");
+ }
+ if (StringUtils.isEmpty(user.getPassword())) {
+ throw new ServiceException("密码不能为空!");
+ }
+ if (!StringUtils.equals(user.getPassword(), user.getPassword2())) {
+ throw new ServiceException("两次的密码不一致!");
+ }
+ long count = count(Wrappers.<User>lambdaQuery().eq(User::getAccount, user.getAccount()));
+ if (count > 0) {
+ throw new ServiceException("改账号已存在，请更换其他账号!");
+ }
+
+ user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ user.setRoleId("1717429059648606209");
+ boolean oauthTemp = save(user);
+ return (oauthTemp);
+ }
+
+ @Override
public boolean updatePlatform(Long userId, Integer userType, String userExt) {
if (userType.equals(UserEnum.WEB.getCategory())) {
UserWeb userWeb = new UserWeb();
@@ -685,7 +751,6 @@
}
-
/**
* 处理漏绑定的user_dept
*/
@@ -746,20 +811,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 +836,8 @@
user.setRealName(userExcel.getRealName());
user.setPhone(userExcel.getPhone());
user.setAccount(userExcel.getPhone());
+ // 设置性别
+ setSex(user, userExcel);
// 更新机构
setDeptId(user, userExcel);
// 设置初始密码
@@ -778,9 +846,22 @@
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 +870,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 +906,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);
}
}
}
--
Gitblit v1.9.3