修改用户同步接口

device-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntityExt.java

-package com.mortals.xhx.base.system.user.model;
-
-import com.mortals.framework.model.BaseEntityLong;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * Description:User
- * date: 2021-9-26 16:11:48
- */
-@Data
-public class UserEntityExt extends BaseEntityLong {
-    /**
-     * 站点名称
-     */
-    private String siteName;
-
-    private String roleIds;
-    /**
-     * 唯一标识
-     */
-    private String token;
-    /**
-     * 菜单栏
-     */
-    private String menuUrl;
-
-    /**
-     * 登录时间
-     */
-    private Long loginTime;
-
-    /**
-     * 过期时间
-     */
-    private Long expireTime;
-
-
-
-
-}
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/base/system/user/service/UserService.java

@@ -116,9 +116,6 @@ public interface UserService extends ICRUDCacheService<UserEntity,Long> {
      boolean updateUserPwd(String loginName, String oldPwd, String newPwd) throws AppException;
 
 
-
-
-
      Rest<Void> refreshUser();
 
       UserDao getUserDao();

device-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -25,7 +25,6 @@ import com.mortals.xhx.base.system.resource.model.ResourceEntity;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
 import com.mortals.xhx.base.system.role.model.RoleUserEntity;
 import com.mortals.xhx.base.system.role.model.RoleUserQuery;
-import com.mortals.xhx.base.system.role.service.RoleService;
 import com.mortals.xhx.base.system.role.service.RoleUserService;
 import com.mortals.xhx.base.system.user.dao.UserDao;
 import com.mortals.xhx.base.system.user.model.UserEntity;
@@ -63,8 +62,6 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
     @Autowired
     private ResourceService resourceService;
     @Autowired
-    private RoleService roleService;
-    @Autowired
     private RoleUserService roleUserService;
 
     @Autowired
@@ -117,7 +114,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
 
     @Override
     protected void saveAfter(UserEntity entity, Context context) throws AppException {
-        //更新角色
+        //新增角色
         if (!ObjectUtils.isEmpty(entity.getId()) && entity.getId().longValue() != SysConstains.ADMIN_ID && !ObjectUtils.isEmpty(entity.getRoleIds())) {
             RoleUserQuery roleUserQuery = new RoleUserQuery();
             roleUserQuery.setUserId(entity.getId());
@@ -139,21 +136,6 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
         super.findAfter(params, pageInfo, context, list);
     }
 
-    @Override
-    protected UserEntity findBefore(UserEntity params, Context context) throws AppException {
-//        if (StringUtils.isNotEmpty(params.getDeptIds())) {
-//            params.setDeptIds(StringUtils.fillWithMark(params.getDeptIds(), ","));
-//        }
-        return super.findBefore(params, context);
-    }
-
-    @Override
-    protected UserEntity findBefore(UserEntity params, PageInfo pageInfo, Context context) throws AppException {
-//        if (StringUtils.isNotEmpty(params.getDeptIds())) {
-//            params.setDeptIds(StringUtils.fillWithMark(params.getDeptIds(), ","));
-//        }
-        return super.findBefore(params, pageInfo, context);
-    }
 
     public UserEntity findByLoginName(String loginName) {
         UserQuery params = new UserQuery();
@@ -347,16 +329,6 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
                     return userEntity;
                 }).collect(Collectors.toList());
 
-/*
-                List<UserEntity> oldUserList = this.find(new UserQuery());
-                log.info(" oldUserList size：{}", oldUserList.size());
-                //用户map 登录名做唯一标识
-                Map<String, UserEntity> newUserMap = newUserList.stream().collect(Collectors.toMap(x -> x.getLoginName(), y -> y, (o, n) -> n));
-
-                Map<String, UserEntity> oldUserMap = oldUserList.stream().collect(Collectors.toMap(x -> x.getLoginName(), y -> y, (o, n) -> n));
-*/
-
-
                 List<UserEntity> saveUpdateUserList = newUserList.parallelStream().map(item -> {
                     UserEntity extCache = this.getExtCache(item.getLoginName());
                     if (ObjectUtils.isEmpty(extCache)) {
@@ -387,6 +359,11 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
                     log.info("需要更新用户数量：{}", saveUpdateCollect.get(false).size());
                     saveUpdateCollect.get(false).stream().forEach(item -> {
                         this.getUserDao().update(item);
+                        //更新默认用户角色
+                        RoleUserQuery roleUserQuery = new RoleUserQuery();
+                        roleUserQuery.setUserId(item.getId());
+                        roleUserQuery.setRoleIdList( Arrays.asList(1L));
+                        roleUserService.doDistributionRole(roleUserQuery);
                     });
                 }
 
@@ -403,13 +380,10 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
 
     @Override
     protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
-        Arrays.asList(ids).stream().peek(userId -> {
-            RoleUserQuery roleUserQuery = new RoleUserQuery();
-            roleUserQuery.setUserId(userId);
-            Long[] userIds = roleUserService.find(roleUserQuery).stream().map(RoleUserEntity::getId).toArray(Long[]::new);
-            roleUserService.remove(userIds, context);
-        }).count();
-
         super.removeAfter(ids, context, result);
+        RoleUserQuery roleUserQuery = new RoleUserQuery();
+        roleUserQuery.setUserIdList(Arrays.asList(ids));
+        Long[] userIds = roleUserService.find(roleUserQuery).stream().map(RoleUserEntity::getId).toArray(Long[]::new);
+        roleUserService.remove(userIds, context);
     }
 }
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java

@@ -44,7 +44,6 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
     private RoleUserService roleUserService;
 
     public UserController() {
-        super.setFormClass(UserForm.class);
         super.setModuleDesc("用户信息");
     }
 
@@ -78,10 +77,6 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
 
     @Override
     protected int saveAfter(UserEntity entity, Map<String, Object> model, Context context) throws AppException {
-        if (entity.getId() == getCurUser().getId()) {
-            // TODO: 2022/8/15 更新redis session信息
-            //saveCurrUserForSession(request, response, userService.get(form.getEntity().getId(), false));
-        }
         return super.saveAfter(entity, model, context);
     }
 

device-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserForm.java

-/**
-* 文件：UserForm.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
-package com.mortals.xhx.base.system.user.web;
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.base.system.user.model.UserEntity;
-import com.mortals.xhx.base.system.user.model.UserQuery;
-
-/**
- * <p>Title: 用户信息</p>
- * <p>Description: UserForm  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author 
- * @version 1.0.0
- */
-public class UserForm extends BaseCRUDFormLong<UserEntity> {
-	private UserEntity entity = new UserEntity();
-	private UserQuery query = new UserQuery();
-	public UserForm(){
-		
-	}
-	
-    @Override
-	public UserEntity getEntity() {
-		return entity;
-	}
-
-	public void setEntity(UserEntity entity) {
-		this.entity = entity;
-	}
-
-	@Override
-	public UserQuery getQuery() {
-		return query;
-	}
-
-	public void setQuery(UserQuery query) {
-		this.query = query;
-	}
-}
\ No newline at end of file