From 20159916dd5f3a89b97a9ba83bed37b841471921 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 24 七月 2024 12:43:58 +0800
Subject: [PATCH] 上片模块：上片模块对接完成，命令可正常写入 上片逻辑：复位后需要向plc发送联动请求，联动请求为1后可接收到上片机发送的上片请求，否则无法执行上片任务
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
index ac5df96..1e4a478 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/service/impl/SysUserServiceImpl.java
@@ -19,6 +19,7 @@
import com.mes.userinfo.entity.SysUserRole;
import com.mes.userinfo.entity.vo.SysUserVO;
import com.mes.userinfo.mapper.SysUserMapper;
+import com.mes.userinfo.mapper.SysUserRoleMapper;
import com.mes.userinfo.service.SysUserRoleService;
import com.mes.userinfo.service.SysUserService;
import lombok.extern.slf4j.Slf4j;
@@ -71,6 +72,8 @@
@Resource
BCryptPasswordEncoder passwordEncoder;
+ @Autowired
+ private SysUserRoleMapper sysUserRoleMapper;
@Override
public Map<String, String> login(SysUser user) {
@@ -125,10 +128,12 @@
this.updateById(sysUser);
log.info("鍒犻櫎鐢ㄦ埛瑙掕壊淇℃伅");
List<Long> roleIds = user.getRoleList().stream().map(SysRole::getId).collect(Collectors.toList());
- sysUserRoleService.remove(new LambdaQueryWrapper<SysUserRole>()
- .eq(SysUserRole::getUserId, sysUser.getId()).in(CollectionUtil.isNotEmpty(roleIds), SysUserRole::getRoleId, roleIds));
- log.info("淇濆瓨鐢ㄦ埛瑙掕壊淇℃伅");
- saveUserRole(user.getRoleList(), sysUser.getId());
+// sysUserRoleService.remove(new LambdaQueryWrapper<SysUserRole>()
+// .eq(SysUserRole::getUserId, sysUser.getId()).in(CollectionUtil.isNotEmpty(roleIds), SysUserRole::getRoleId, roleIds));
+ SysUserRole sysUserRole = new SysUserRole(sysUser.getId(),roleIds.get(0));
+ sysUserRoleMapper.updateById(sysUserRole);
+// log.info("淇濆瓨鐢ㄦ埛瑙掕壊淇℃伅");
+// saveUserRole(user.getRoleList(), sysUser.getId());
return user;
}
--
Gitblit v1.8.0