1.修复人员数据

eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/ZkDataSyncTask.java

@@ -40,7 +40,9 @@ import me.zhengjie.modules.system.domain.User;
 import me.zhengjie.modules.system.service.DeptService;
 import me.zhengjie.modules.system.service.UserService;
 import me.zhengjie.modules.system.service.dto.DeptDto;
+import me.zhengjie.modules.system.service.dto.RoleSmallDto;
 import me.zhengjie.modules.system.service.dto.UserDto;
+import me.zhengjie.modules.system.service.mapstruct.RoleMapper;
 import me.zhengjie.utils.RsaUtils;
 import me.zhengjie.utils.SecurityUtils;
 import me.zhengjie.utils.StringUtils;
@@ -73,6 +75,8 @@ public class ZkDataSyncTask {
     private final DmRoomDeviceRepository dmRoomDeviceRepository;
     private final DmCardService dmCardService;
 
+    private final RoleMapper roleMapper;
+
     public void run() throws Exception {
         log.info("deptSync 执行开始");
         deptSync();
@@ -225,6 +229,12 @@ public class ZkDataSyncTask {
                 jobs.add(job);
                 user.setJobs(jobs);
 
+                Set<Role> roles = new HashSet<Role>();
+                Role role = new Role();
+                role.setId(Long.valueOf(2));//普通用户
+                roles.add(role);
+                user.setRoles(roles);
+
                 dmUser = new DmUser();
                 dmUser.setDept(dept);
                 dmUser.setId(user.getId());
@@ -241,6 +251,8 @@ public class ZkDataSyncTask {
                 dmUser.setUserRootGroupName(user.getUserRootGroupName());
                 dmUser.setJobs(jobs);
 
+                dmUser.setRoles(roles);
+
                 try {
                     //1、入用户库
                     dmUserDto = dmUserService.findById(dmUser.getId());
@@ -248,11 +260,11 @@ public class ZkDataSyncTask {
                     if (dmUserDto != null) {
                         dmUserService.update(dmUser);
                     } else {
-                        Set<Role> roles = new HashSet<Role>();
-                        Role role = new Role();
-                        role.setId(Long.valueOf(2));//普通用户
-                        roles.add(role);
-                        dmUser.setRoles(roles);
+//                        Set<Role> roles = new HashSet<Role>();
+//                        Role role = new Role();
+//                        role.setId(Long.valueOf(2));//普通用户
+//                        roles.add(role);
+//                        dmUser.setRoles(roles);
 //                        Snowflake snowflake = IdUtil.createSnowflake(1, 1);
                         DmCardDto dmCardDto = dmCardService.create(new DmCard());
                         dmUser.setCardid(String.valueOf(dmCardDto.getId()));
@@ -266,15 +278,22 @@ public class ZkDataSyncTask {
                     if (userDto != null) {
                         //user.setPassword(passwordEncoder.encode("12345678"));
                         //user.setOssPassword(RsaUtils.encryptByPublicKey(RsaProperties.publicKey, "12345678"));
+//                        Set<Role> roles = new HashSet<Role>();
+//                        Role role = new Role();
+//                        for(RoleSmallDto roleSmallDto : userDto.getRoles()) {
+//                            role.setId(roleSmallDto.getId());//普通用户
+//                            roles.add(role);
+//                        }
+//                        user.setRoles(roles);
                         userService.updateSync(user);
                         dmUser.setOssPassword(userDto.getOssPassword());
                         dmUserService.update(dmUser);
                     } else {
-                        Set<Role> roles = new HashSet<Role>();
-                        Role role = new Role();
-                        role.setId(Long.valueOf(2));//普通用户
-                        roles.add(role);
-                        user.setRoles(roles);
+//                        Set<Role> roles = new HashSet<Role>();
+//                        Role role = new Role();
+//                        role.setId(Long.valueOf(2));//普通用户
+//                        roles.add(role);
+//                        user.setRoles(roles);
                         user.setPassword(passwordEncoder.encode("12345678"));
                         String ossPassword = RsaUtils.encryptByPublicKey(RsaProperties.publicKey, "12345678");
                         user.setOssPassword(ossPassword);