修改定时任务

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

@@ -230,7 +230,6 @@ public class ZkDataSyncTask {
                 role.setId("2");//普通用户
                 roles.add(role);
                 user.setRoles(roles);
-                user.setUserType("00");
                 dmUser = new DmUser();
                 dmUser.setDept(dept);
                 dmUser.setId(user.getId());

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java

@@ -144,9 +144,6 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "根用户组名称", hidden = true)
     private String userRootGroupName;
 
-    @Column(name = "user_type")
-    @ApiModelProperty(value = "人员种类(00-正式人员、01-外协单位、02-租户)", hidden = true)
-    private String userType;
 
     @Override
     public boolean equals(Object o) {

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java

@@ -22,6 +22,7 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import javax.transaction.Transactional;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -114,6 +115,26 @@ public interface UserRepository extends JpaRepository<User, String>, JpaSpecific
      */
     void deleteAllByIdIn(Set<String> ids);
 
+    /**
+     * 根据userId删除用户岗位
+     * @param "userId" /
+     */
+    @Transactional
+    @Modifying
+    @Query(value = "delete from sys_users_jobs where user_id = :userId", nativeQuery = true)
+    void deleteUserJobs(@Param("userId") String userId);
+
+
+    /**
+     * 根据userId删除用户角色
+     * @param userId /
+     */
+    @Transactional
+    @Modifying
+    @Query(value = "delete from sys_users_roles where user_id = :userId", nativeQuery = true)
+    void deleteUserRoles(@Param("userId") String userId);
+
+
     /**
      * 根据岗位查询
      * @param ids /

eladmin-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java

@@ -85,6 +85,4 @@ public class UserDto extends BaseDTO implements Serializable {
     private String userRootGroupId;
 
     private String userRootGroupName;
-
-    private String userType;
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -134,63 +134,43 @@ public class UserServiceImpl implements UserService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(User resources) throws Exception {
-        //设置用户信息
-        resources = setDmUserInfoToSysUser(resources);
-        if(resources.getDept() != null && resources.getDept().getId() == null){
-            resources.setDept(null);
-        }
-        if(resources.getDmUser() != null && resources.getDmUser().getId() == null){
-            resources.setDmUser(null);
-        }
-        if(resources.getDmCompany() != null && resources.getDmCompany().getCompanyId() == null){
-            resources.setDmCompany(null);
-        }
         User user = userRepository.findById(resources.getId()).orElseGet(User::new);
-        ValidationUtil.isNull(user.getId(), "User", "id", resources.getId());
         User user1 = userRepository.findByUsername(resources.getUsername());
-        /*User user2 = userRepository.findByEmail(resources.getEmail());*/
-        User user3 = userRepository.findByPhone(resources.getPhone());
         if (user1 != null && !user.getId().equals(user1.getId())) {
             throw new EntityExistException(User.class, "username", resources.getUsername());
         }
-        /*if (user2 != null && !user.getId().equals(user2.getId())) {
-            throw new EntityExistException(User.class, "email", resources.getEmail());
-        }*/
-        if (user3 != null && !user.getId().equals(user3.getId())) {
-            throw new EntityExistException(User.class, "phone", resources.getPhone());
-        }
         // 如果用户的角色改变
         if (!resources.getRoles().equals(user.getRoles())) {
             redisUtils.del(CacheKey.DATA_USER + resources.getId());
             redisUtils.del(CacheKey.MENU_USER + resources.getId());
             redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
         }
+
         // 如果用户被禁用，则清除用户登录信息
         if(!resources.getEnabled()){
             onlineUserService.kickOutForUsername(resources.getUsername());
         }
-        user.setUsername(resources.getUsername());
-        user.setEmail(resources.getEmail());
-        user.setEnabled(resources.getEnabled());
-        user.setRoles(resources.getRoles());
-        user.setDept(resources.getDept());
-        user.setJobs(resources.getJobs());
-        user.setPhone(resources.getPhone());
-        user.setNickName(resources.getNickName());
-        user.setGender(resources.getGender());
-        user.setRemark(resources.getRemark());
-        user.setErrLimit(resources.getErrLimit());
-        user.setDmUser(resources.getDmUser());
-        user.setDmCompany(resources.getDmCompany());
-        user.setUserRootGroupId(resources.getUserRootGroupId());
-        user.setUserRootGroupName(resources.getUserRootGroupName());
-        user.setUserCode(resources.getUserCode());
-        if(StringUtils.isBlank(user.getOrgPassword())){
-            user.setOrgPassword(resources.getOrgPassword());
-        }
-        userRepository.save(user);
+
+        DmUser dmUser = new DmUser();
+        dmUser.setId(resources.getId());
+        dmUser.setName(resources.getNickName());
+        dmUser.setSex(resources.getGender());
+        dmUser.setContacts(resources.getPhone());
+        dmUser.setEmail(resources.getEmail());
+        dmUser.setDept(resources.getDept());
+        dmUser.setUserNumber(resources.getUserCode());
+        dmUser.setUserCode(resources.getUserCode());
+        dmUser.setStatus(resources.getEnabled());
+        dmUser.setType("01");
+        DmCardDto dmCardDto = dmCardService.create(new DmCard());
+        dmUser.setCardid(String.valueOf(dmCardDto.getId()));
+        DmUser dmUser1 = dmUserRepository.save(dmUser);
+
+        resources.setDmCompany(null);
+        resources.setDmUser(dmUser1);
+        userRepository.save(resources);
         // 清除缓存
-        delCaches(user.getId(), user.getUsername());
+        delCaches(resources.getId(), resources.getUsername());
     }
 
     @Override
@@ -222,8 +202,11 @@ public class UserServiceImpl implements UserService {
             // 清理缓存
             UserDto user = findById(id);
             delCaches(user.getId(), user.getUsername());
+            userRepository.deleteUserJobs(id);
+            userRepository.deleteUserRoles(id);
+            dmUserRepository.deleteById(id);
+            userRepository.deleteById(id);
         }
-        userRepository.deleteAllByIdIn(ids);
     }
 
     @Override