更新用户同步逻辑

sample-form-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java

@@ -6,13 +6,14 @@ import java.util.Objects;
 import com.mortals.framework.ap.SysConstains;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.framework.service.IUser;
+import com.mortals.xhx.base.system.user.model.vo.UserVo;
 
 /**
 *
 * Description:User
 * date: 2021-9-26 16:11:48
 */
-public class UserEntity extends UserEntityExt implements IUser {
+public class UserEntity extends UserVo implements IUser {
     private static final long serialVersionUID = 1632643908537L;
 
 
@@ -126,6 +127,8 @@ public class UserEntity extends UserEntityExt implements IUser {
     */
     private String lastModPwdAddr;
 
+    private String siteIds;
+
     public UserEntity(){
 
     }
@@ -330,7 +333,7 @@ public class UserEntity extends UserEntityExt implements IUser {
 
     @Override
     public String getSiteIds() {
-        return super.getSiteIds();
+        return this.siteIds;
     }
 
     @Override
@@ -338,6 +341,10 @@ public class UserEntity extends UserEntityExt implements IUser {
         return null;
     }
 
+    public void setSiteIds(String siteIds) {
+        this.siteIds = siteIds;
+    }
+
     /**
     * 设置 站点id
     * @param siteId

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

@@ -30,7 +30,6 @@ public class UserEntityExt extends BaseEntityLong {
    private Long expireTime;
 
    private String siteName;
-   private List<Long> roleIds;
    private String siteCode;
 
    private String oldPassword;

sample-form-manager/src/main/java/com/mortals/xhx/base/system/user/model/vo/UserVo.java

+package com.mortals.xhx.base.system.user.model.vo;
+
+
+import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
+
+/**
+ * 用户信息业务视图对象
+ *
+ * @author zxfei
+ * @date 2022-07-05
+ */
+@Data
+public class UserVo extends BaseEntityLong {
+
+    /**
+     * 站点名称
+     */
+    private String siteName;
+
+    private String roleIds;
+    /**
+     * 唯一标识
+     */
+    private String token;
+    /**
+     * 菜单栏
+     */
+    private String menuUrl;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+    /**
+     * 过期时间
+     */
+    private Long expireTime;
+
+    private String oldPassword;
+    private String newPassword;
+    private String siteIds;
+}
\ No newline at end of file

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

@@ -31,35 +31,7 @@ import java.util.Set;
  */
 
 public interface UserService extends ICRUDCacheService<UserEntity,Long> {
-    /**
-     * 用户登录
-     *
-     * @param loginName 登录用户名
-     * @param password  登录密码
-     * @param loginIp   登录IP
-     * @return
-     * @throws AppException
-     */
-    public UserEntity doLogin(String loginName, String password, String loginIp) throws AppException;
 
-    /**
-     * 校验用户名与密码是否正确
-     *
-     * @param loginName
-     * @param password
-     * @return
-     * @throws AppException
-     */
-    public UserEntity doCheckUser(String loginName, String password) throws AppException;
-
-    /**
-     * 检查用户是否存在
-     *
-     * @param loginName 登录用户名
-     * @param userId    密码
-     * @return
-     */
-    public boolean existUser(String loginName, Long userId) throws AppException;
 
     /**
      * 通过登录用户获取菜单功能权限
@@ -67,7 +39,7 @@ public interface UserService extends ICRUDCacheService<UserEntity,Long> {
      * @param user
      * @return
      */
-    public List<MenuEntity> findOutlookBarList(IUser user);
+     List<MenuEntity> findOutlookBarList(IUser user);
 
     /**
      * 查询用户所有有权限的菜单ID
@@ -75,47 +47,7 @@ public interface UserService extends ICRUDCacheService<UserEntity,Long> {
      * @param userEntity
      * @return
      */
-    public Set<Long> findAllAuthIds(UserEntity userEntity) throws AppException;
-
-    /**
-     * 查询用户记录
-     *
-     * @param platformId
-     * @param params
-     * @param currPage
-     * @param prePageResult
-     * @return
-     * @throws AppException
-     */
-    public Result<UserEntity> find(Long platformId, UserEntity params, int currPage, int prePageResult) throws AppException;
-
-    /**
-     * 为客户创建用户
-     *
-     * @param currUser     当前用户
-     * @param customerId   客户ID
-     * @param customerName 客户名称
-     * @param loginName
-     * @param password
-     * @param userName
-     * @param mobile
-     * @return
-     * @throws AppException
-     */
-    public UserEntity createUser(IUser currUser, Long customerId, String customerName, String loginName, String password,
-                                 String userName, String mobile) throws AppException;
-
-    /**
-     * 用户修改密码
-     *
-     * @param loginName
-     * @param oldPwd
-     * @param newPwd
-     * @return
-     * @throws AppException
-     */
-    public boolean updateUserPwd(String loginName, String oldPwd, String newPwd) throws AppException;
-
+    Set<Long> findAllAuthIds(UserEntity userEntity) throws AppException;
 
     Rest<Void> refreshUser();
 

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

@@ -21,7 +21,10 @@ import com.mortals.framework.common.Rest;
 import com.mortals.framework.service.IUser;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.role.model.RoleEntity;
+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.common.code.UserStatus;
 import com.mortals.framework.common.IBaseEnum;
 import com.mortals.framework.common.code.UserType;
@@ -55,6 +58,9 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
     @Autowired
     private RoleService roleService;
 
+    @Autowired
+    private RoleUserService roleUserService;
+
     public UserController() {
         super.setModuleDesc("用户信息");
     }
@@ -69,34 +75,6 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
         super.init(model, context);
     }
 
-    @Override
-    protected int editAfter(Long id, Map<String, Object> model, UserEntity entity, Context context) throws AppException {
-        entity.setLoginPwd(null);
-        entity.setLoginPwd1(null);
-        entity.setLoginPwd2(null);
-        entity.setLoginPwd3(null);
-        return 1;
-    }
-
-    @RequestMapping(value = "change/password", method = RequestMethod.POST)
-    public String changePassword(@RequestBody UserEntity entity) {
-
-        IUser user = this.getCurUser();
-        if(user == null){
-            return this.createFailJsonResp("请先登录");
-        }
-        JSONObject ret = new JSONObject();
-        try {
-            service.updateUserPwd(super.getCurUser().getLoginName(), entity.getOldPassword(), entity.getNewPassword());
-            ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
-            ret.put(KEY_RESULT_MSG, "密码修改成功！");
-        } catch (Exception e) {
-            ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-            ret.put(KEY_RESULT_MSG, super.convertException(e));
-        }
-        return ret.toJSONString();
-    }
-
 
     @PostMapping({"refreshUser"})
     @UnAuth