feature(人员机构关系改造): 人员机构关系改造

人员机构关系改造

dcuc-auth-api/src/main/java/com/dragoninfo/dcuc/auth/admin/facade/IMgeMtAuthFacade.java

@@ -1,39 +0,0 @@
-
-
-package com.dragoninfo.dcuc.auth.admin.facade;
-
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(name = "dcuc-auth", path = "/dcuc/auth/mgeMtAuthFacade")
-public interface IMgeMtAuthFacade {
-
-//    /**
-//     * 通过组织id和相应管理员id保存管理员-管理员管理信息
-//     *
-//     * @param orgIds
-//     * @param userId
-//     * @return
-//     */
-//    @RequestMapping(value = "save")
-//    ResponseStatus save(@RequestParam("orgIds") String orgIds, @RequestParam("userId") String userId);
-
-    /**
-     * 查询用户拥有的管理员管理范围
-     *
-     * @param userId
-     * @return
-     */
-    @RequestMapping(value = "mgeMgeRightRangeStr")
-    String mgeMgeRightRangeStr(@RequestParam("userId") String userId);
-
-//    /**
-//     * 获取所有管理员管理范围的信息，除adminId
-//     *
-//     * @return
-//     */
-//    @RequestMapping(value = "getAllList")
-//    List<MgeMtAuth> getAllList();
-}

dcuc-auth-api/src/main/java/com/dragoninfo/dcuc/auth/admin/facade/IOrgMtAuthFacade.java

@@ -1,78 +0,0 @@
-
-
-package com.dragoninfo.dcuc.auth.admin.facade;
-
-import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(name = "dcuc-auth", path = "/dcuc/auth/orgMtAuthFacade")
-public interface IOrgMtAuthFacade {
-
-//    /**
-//     * 保存管理员机构
-//     *
-//     * @param orgMtAuth
-//     * @return
-//     */
-//    @PostMapping(value = "save1")
-//    ResponseStatus save(@RequestBody OrgMtAuth orgMtAuth);
-
-    /**
-     * 通过组织id和相应管理员id保存管理员-机构管理信息
-     *
-     * @param orgIds
-     * @param userId
-     * @return
-     */
-    @RequestMapping(value = "save2")
-    ResponseStatus save(@RequestParam("orgIds") String orgIds,
-                        @RequestParam("userId") String userId);
-
-//    /**
-//     * 查询用户拥有的机构管理范围
-//     *
-//     * @param userId
-//     * @return
-//     */
-//    @RequestMapping(value = "mgeOrgRightRangeList")
-//    List<String> mgeOrgRightRangeList(@RequestParam("userId") String userId);
-
-
-    /**
-     * 查询用户拥有的机构管理范围
-     *
-     * @param userId
-     * @return
-     */
-    @RequestMapping(value = "mgeOrgRightRangeStr")
-    String mgeOrgRightRangeStr(@RequestParam("userId") String userId);
-
-//    /**
-//     * 根据管理员userid获取管理机构列表
-//     *
-//     * @param id
-//     * @return
-//     */
-//    @RequestMapping(value = "getOrgMtAuthById")
-//    List<OrgMtAuth> getOrgMtAuthById(@RequestParam("id") String id);
-
-//    /**
-//     * 根据当前登录用户过滤管理机构权限
-//     *
-//     * @param userId
-//     * @param orgList
-//     */
-//    @RequestMapping(value = "orgFilter")
-//    List<TreeNodeVo> orgFilter(@RequestParam("orgList") List<TreeNodeVo> orgList,
-//                               @RequestParam("userId") String userId);
-
-//    /**
-//     * 获取所有机构管理范围的信息，除adminId
-//     *
-//     * @return
-//     */
-//    @RequestMapping(value = "getAllList")
-//    List<OrgMtAuth> getAllList();
-}

dcuc-auth-api/src/main/java/com/dragoninfo/dcuc/auth/admin/facade/IUserMtAuthFacade.java

@@ -1,75 +0,0 @@
-
-
-package com.dragoninfo.dcuc.auth.admin.facade;
-
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(name = "dcuc-auth", path = "/dcuc/auth/userMtAuthFacade")
-public interface IUserMtAuthFacade {
-
-//    /**
-//     * 通过组织id和相应管理员id保存管理员-机构管理信息
-//     *
-//     * @param orgIds
-//     * @param userId
-//     * @return
-//     */
-//    @RequestMapping(value = "save")
-//    ResponseStatus save(@RequestParam("orgIds") String orgIds, @RequestParam("userId") String userId);
-
-//    /**
-//     * 查询用户拥有的人员管理范围
-//     *
-//     * @param userId
-//     * @return
-//     */
-//    @RequestMapping(value = "mgeUserRightRangeList")
-//    List<String> mgeUserRightRangeList(@RequestParam("userId") String userId);
-
-    /**
-     * 查询用户拥有的人员管理范围
-     *
-     * @param userId
-     * @return
-     */
-    @RequestMapping(value = "mgeUserRightRangeStr")
-    String mgeUserRightRangeStr(@RequestParam("userId") String userId);
-
-//    /**
-//     * 根据当前登录用户过滤用户管理范围机构权限
-//     *
-//     * @param userId
-//     * @param orgList
-//     */
-//    @RequestMapping(value = "orgFilter")
-//    List<TreeNodeVo> orgFilter(@RequestParam("orgList") List<TreeNodeVo> orgList, @RequestParam("userId") String userId);
-
-//    /**
-//     * 根据管理员userid获取人员管理范围机构列表
-//     *
-//     * @param userId
-//     * @return
-//     */
-//    @RequestMapping(value = "userMtList")
-//    List<UserMtAuth> userMtList(@RequestParam("userId") String userId);
-//
-//    /**
-//     * 获取所有用户管理范围的信息，除adminId
-//     *
-//     * @return
-//     */
-//    @RequestMapping(value = "getAllList")
-//    List<UserMtAuth> getAllList();
-//
-//    /**
-//     * 搜索用户管理员
-//     *
-//     * @param searchDTO
-//     * @return
-//     */
-//    @PostMapping(value = "userMtSearch")
-//    List<UserMtAuth> userMtSearch(@RequestBody SearchDTO searchDTO);
-}

dcuc-auth-api/src/main/java/com/dragoninfo/dcuc/auth/sub/facade/IUserCenterApiFacade.java

@@ -21,6 +21,7 @@ public interface IUserCenterApiFacade {
 
     /**
      * 用户数据同步
+     * 建立在机构数据已同步的基础上
      * @return
      */
     @GetMapping("userSync")

dcuc-auth-model/src/main/java/com/dragoninfo/dcuc/auth/sub/enumresource/JobTypeEnum.java

@@ -0,0 +1,36 @@
+package com.dragoninfo.dcuc.auth.sub.enumresource;
+
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * Created by yica on 2018/5/24.
+ */
+public enum JobTypeEnum implements ICodeEnum {
+    ZZ("11", "在职"),
+    JD("12", "借调"),
+    GZ("13", "挂职"),
+    FP("14", "返聘"),
+    TX("15", "退休"),
+    LZ("16", "离职"),
+    SW("17", "死亡");
+
+
+    private String value;
+    private String label;
+
+    JobTypeEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String getLabel() {
+        return label;
+    }
+}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/bpo/MgeMtAuthBPO.java

@@ -1,26 +0,0 @@
-
-
-package com.dragoninfo.dcuc.auth.admin.bpo;
-
-import com.dragoninfo.dcuc.auth.admin.entity.MgeMtAuth;
-import com.dragoninfo.duceap.core.persistent.BaseBPO;
-import com.dragonsoft.duceap.core.persistent.factory.PersistentFactory;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public class MgeMtAuthBPO extends BaseBPO<MgeMtAuth, String> {
-
-    public void saveAll(List<MgeMtAuth> mgeMtAuthList) {
-        PersistentFactory.getHibernateDao().saveOrUpdateAll(mgeMtAuthList);
-    }
-
-//    public MgeMtAuth getByUserId(String mgeId, String userId) {
-//        String hql = "from MgeMtAuth t where mgeId=? and userId=?";
-//        List<MgeMtAuth> list = PersistentFactory.getHibernateDao().find(hql, new Object[]{mgeId, userId});
-//        if (list.size() > 0)
-//            return list.get(0);
-//        return null;
-//    }
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/bpo/OrgMtAuthBPO.java

@@ -1,32 +0,0 @@
-
-
-package com.dragoninfo.dcuc.auth.admin.bpo;
-
-import com.dragoninfo.dcuc.auth.admin.entity.OrgMtAuth;
-import com.dragoninfo.duceap.core.persistent.BaseBPO;
-import com.dragonsoft.duceap.core.persistent.factory.PersistentFactory;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public class OrgMtAuthBPO extends BaseBPO<OrgMtAuth, String> {
-
-    public List<OrgMtAuth> getOrgMtAuthById(String userId) {
-        String hql = "from OrgMtAuth t where userId = ?";
-        List<OrgMtAuth> list = PersistentFactory.getHibernateDao().find(hql, new Object[]{userId});
-        return list;
-    }
-
-    public void saveAll(List<OrgMtAuth> orgMtAuthList) {
-        PersistentFactory.getHibernateDao().saveOrUpdateAll(orgMtAuthList);
-    }
-
-//    public OrgMtAuth getByUserId(String mgeId, String userId) {
-//        String hql = "from OrgMtAuth t where mgeId=? and userId=?";
-//        List<OrgMtAuth> list = PersistentFactory.getHibernateDao().find(hql, new Object[]{mgeId, userId});
-//        if (list.size() > 0)
-//            return list.get(0);
-//        return null;
-//    }
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/bpo/UserMtAuthBPO.java

@@ -1,35 +0,0 @@
-
-
-package com.dragoninfo.dcuc.auth.admin.bpo;
-
-import com.dragoninfo.dcuc.auth.admin.entity.UserMtAuth;
-import com.dragoninfo.duceap.core.persistent.BaseBPO;
-import com.dragonsoft.duceap.core.persistent.factory.PersistentFactory;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public class UserMtAuthBPO extends BaseBPO<UserMtAuth, String> {
-
-
-//    public List<UserMtAuth> userMtList(String userId) {
-//        String hql = "from UserMtAuth t where userId = ? " +
-//                "and userId in (select userId from ManageInfo " +
-//                "where userId = ? and deleted = 0)";
-//        List<UserMtAuth> list = PersistentFactory.getHibernateDao().find(hql, new Object[]{userId, userId});
-//        return list;
-//    }
-
-    public void saveAll(List<UserMtAuth> userMtAuthList) {
-        PersistentFactory.getHibernateDao().saveOrUpdateAll(userMtAuthList);
-    }
-
-//    public UserMtAuth getByUserId(String mgeId, String userId) {
-//        String hql = "from UserMtAuth t where mgeId=? and userId=?";
-//        List<UserMtAuth> list = PersistentFactory.getHibernateDao().find(hql, new Object[]{mgeId, userId});
-//        if (list.size() > 0)
-//            return list.get(0);
-//        return null;
-//    }
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/cons/SysConstants.java

@@ -1,35 +0,0 @@
-package com.dragoninfo.dcuc.auth.admin.cons;
-
-/**
- * Created by Administrator on 2018/11/1.
- */
-public class SysConstants {
-
-    /**
-     * 机构管理范围
-     **/
-    public final static String MT_ORG = "ORG";
-    /**
-     * 用户管理范围
-     **/
-    public final static String MT_USER = "USER";
-    /**
-     * 授权管理范围
-     **/
-    public final static String MT_APP = "APP";
-    /**
-     * 管理员管理范围
-     **/
-    public final static String MT_MGE = "MGE";
-    /**
-     * 临时管理范围
-     **/
-    public final static String MT_TEMP = "TEMP";
-
-    //列表导出的最大数量
-    public final static int EXPORT_NUMBER_MAX = 1000;
-
-    public final static String MT_USER_TABLE = "T_ADMIN_USER_MT_AUTH";
-
-    public final static String MT_ORG_TABLE = "T_ADMIN_ORG_MT_AUTH";
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/facade/MgeMtAuthFacade.java

@@ -1,38 +0,0 @@
-
-
-
-package com.dragoninfo.dcuc.auth.admin.facade;
-
-
-import com.dragoninfo.dcuc.auth.admin.entity.MgeMtAuth;
-import com.dragoninfo.dcuc.auth.admin.service.IMgeMtAuthService;
-import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RestController
-@RequestMapping(value = "/dcuc/auth/mgeMtAuthFacade")
-public class MgeMtAuthFacade implements IMgeMtAuthFacade {
-
-    @Autowired
-    private IMgeMtAuthService iMgeMtAuthService;
-
-
-//    @Override
-//    public ResponseStatus save(String idNameObj, String userId) {
-//        return iMgeMtAuthService.save(idNameObj, userId);
-//    }
-
-    @Override
-    public String mgeMgeRightRangeStr(String userId) {
-        return iMgeMtAuthService.mgeMgeRightRangeStr(userId);
-    }
-
-//    @Override
-//    public List<MgeMtAuth> getAllList() {
-//        return iMgeMtAuthService.getAllList();
-//    }
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/facade/OrgMtAuthFacade.java

@@ -1,57 +0,0 @@
-
-
-
-package com.dragoninfo.dcuc.auth.admin.facade;
-
-
-import com.dragoninfo.dcuc.auth.admin.service.IOrgMtAuthService;
-import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping(value = "/dcuc/auth/orgMtAuthFacade")
-public class OrgMtAuthFacade implements IOrgMtAuthFacade {
-
-    @Autowired
-    private IOrgMtAuthService iOrgMtAuthService;
-
-
-//    @Override
-//    public ResponseStatus save(OrgMtAuth orgMtAuth) {
-//        iOrgMtAuthService.save(orgMtAuth);
-//        return ResponseStatus.success("保存成功");
-//    }
-
-    @Override
-    public ResponseStatus save(String orgIds, String userId) {
-        return iOrgMtAuthService.save(orgIds, userId);
-    }
-
-//    @Override
-//    public List<String> mgeOrgRightRangeList(String userId) {
-//        return iOrgMtAuthService.mgeOrgRightRangeList(userId);
-//    }
-
-    @Override
-    public String mgeOrgRightRangeStr(String userId) {
-        return iOrgMtAuthService.mgeOrgRightRangeStr(userId);
-    }
-
-//    @Override
-//    public List<OrgMtAuth> getOrgMtAuthById(String id) {
-//        return iOrgMtAuthService.getOrgMtAuthById(id);
-//    }
-//
-//    @Override
-//    public List<TreeNodeVo> orgFilter(List<TreeNodeVo> orgList, String userId) {
-//        return iOrgMtAuthService.orgFilter(orgList, userId);
-//    }
-//
-//    @Override
-//    public List<OrgMtAuth> getAllList() {
-//        return iOrgMtAuthService.getAllList();
-//    }
-
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/facade/UserMtAuthFacade.java

@@ -1,62 +0,0 @@
-
-
-
-package com.dragoninfo.dcuc.auth.admin.facade;
-
-
-import com.dragoninfo.dcuc.auth.admin.entity.UserMtAuth;
-import com.dragoninfo.dcuc.auth.admin.service.IUserMtAuthService;
-import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import com.dragonsoft.duceap.base.entity.search.SearchDTO;
-import com.dragonsoft.duceap.base.entity.tree.TreeNodeVo;
-import com.dragonsoft.duceap.core.search.Searchable;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RestController
-@RequestMapping(value = "/dcuc/auth/userMtAuthFacade")
-public class UserMtAuthFacade implements IUserMtAuthFacade {
-
-    @Autowired
-    private IUserMtAuthService iUserMtAuthService;
-
-
-//    @Override
-//    public ResponseStatus save(String idNameObj, String userId) {
-//        return iUserMtAuthService.save(idNameObj, userId);
-//    }
-//
-//    @Override
-//    public List<String> mgeUserRightRangeList(String userId) {
-//        return iUserMtAuthService.mgeUserRightRangeList(userId);
-//    }
-
-    @Override
-    public String mgeUserRightRangeStr(String userId) {
-        return iUserMtAuthService.mgeUserRightRangeStr(userId);
-    }
-
-//    @Override
-//    public List<UserMtAuth> userMtList(String userId) {
-//        return iUserMtAuthService.userMtList(userId);
-//    }
-//
-//    @Override
-//    public List<UserMtAuth> getAllList() {
-//        return iUserMtAuthService.getAllList();
-//    }
-//
-//    @Override
-//    public List<UserMtAuth> userMtSearch(SearchDTO searchDTO) {
-//        Searchable searchable = Searchable.toSearchable(searchDTO);
-//        return iUserMtAuthService.find(UserMtAuth.class, searchable);
-//    }
-//
-//    @Override
-//    public List<TreeNodeVo> orgFilter(List<TreeNodeVo> orgList, String userId) {
-//        return iUserMtAuthService.orgFilter(orgList, userId);
-//    }
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/service/IMgeMtAuthService.java

@@ -1,39 +0,0 @@
-
-
-package com.dragoninfo.dcuc.auth.admin.service;
-
-
-import com.dragoninfo.dcuc.auth.admin.entity.MgeMtAuth;
-import com.dragoninfo.duceap.core.service.IOldBaseService;
-
-public interface IMgeMtAuthService extends IOldBaseService<MgeMtAuth, String> {
-
-//    /**
-//     * 通过组织id和相应管理员id保存管理员-机构管理信息
-//     *
-//     * @param orgIds
-//     * @param userId
-//     * @return
-//     */
-//
-//    ResponseStatus save(String orgIds, String userId);
-
-    /**
-     * 查询用户拥有的机构管理范围
-     *
-     * @param userId
-     * @return
-     */
-
-    String mgeMgeRightRangeStr(String userId);
-
-//    ResponseStatus impManger(List<Map<String, String>> list, Map<String, String> userMgeIdmMap);
-
-//    /**
-//     * 获取所有管理员管理范围的信息，除adminId
-//     *
-//     * @return
-//     */
-//
-//    List<MgeMtAuth> getAllList();
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/service/IOrgMtAuthService.java

@@ -1,65 +0,0 @@
-
-
-package com.dragoninfo.dcuc.auth.admin.service;
-
-import com.dragoninfo.dcuc.auth.admin.entity.OrgMtAuth;
-import com.dragoninfo.duceap.core.service.IOldBaseService;
-import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import com.dragonsoft.duceap.base.entity.tree.TreeNodeVo;
-
-import java.util.List;
-import java.util.Map;
-
-public interface IOrgMtAuthService extends IOldBaseService<OrgMtAuth, String> {
-
-    /**
-     * 通过组织id和相应管理员id保存管理员-机构管理信息
-     *
-     * @param orgIds
-     * @param userId
-     * @return
-     */
-
-    ResponseStatus save(String orgIds, String userId);
-
-    /**
-     * 查询用户拥有的机构管理范围
-     *
-     * @param userId
-     * @return
-     */
-
-    String mgeOrgRightRangeStr(String userId);
-
-
-//    List<OrgMtAuth> getOrgMtAuthById(String id);
-
-//    ResponseStatus impManger(List<Map<String, String>> list, Map<String, String> userMgeIdmMap);
-
-
-//    /**
-//     * 根据当前登录用户过滤管理机构权限
-//     *
-//     * @param orgList
-//     * @param userId
-//     */
-//
-//    List<TreeNodeVo> orgFilter(List<TreeNodeVo> orgList, String userId);
-//
-    //    /**
-//     * 查询用户拥有的机构管理范围
-//     *
-//     * @param userId
-//     * @return
-//     */
-//
-//    List<String> mgeOrgRightRangeList(String userId);
-//
-//    /**
-//     * 获取所有机构管理范围的信息，除adminId
-//     *
-//     * @return
-//     */
-//
-//    List<OrgMtAuth> getAllList();
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/service/IUserMtAuthService.java

@@ -1,81 +0,0 @@
-
-
-package com.dragoninfo.dcuc.auth.admin.service;
-
-
-import com.dragoninfo.dcuc.auth.admin.entity.UserMtAuth;
-import com.dragoninfo.duceap.core.service.IOldBaseService;
-import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import com.dragonsoft.duceap.base.entity.tree.TreeNodeVo;
-
-import java.util.List;
-import java.util.Map;
-
-public interface IUserMtAuthService extends IOldBaseService<UserMtAuth, String> {
-
-//    /**
-//     * 通过组织id和相应管理员id保存管理员-机构管理信息
-//     *
-//     * @param orgIds
-//     * @param userId
-//     * @return
-//     */
-//
-//    ResponseStatus save(String orgIds, String userId);
-
-    /**
-     * 查询用户拥有的人员管理范围
-     *
-     * @param userId
-     * @return
-     */
-
-    String mgeUserRightRangeStr(String userId);
-
-//    ResponseStatus impManger(List<Map<String, String>> list, Map<String, String> userMgeIdmMap);
-
-//    /**
-//     * 查询用户拥有的人员管理范围
-//     *
-//     * @param userId
-//     * @return
-//     */
-//
-//    List<String> mgeUserRightRangeList(String userId);
-//
-//    /**
-//     * 根据当前登录用户过滤用户管理范围机构权限
-//     *
-//     * @param userId
-//     * @param orgList
-//     */
-//
-//    List<TreeNodeVo> orgFilter(List<TreeNodeVo> orgList, String userId);
-//
-//    /**
-//     * 根据管理员userid获取人员管理范围机构列表
-//     *
-//     * @param userId
-//     * @return
-//     */
-//
-//    List<UserMtAuth> userMtList(String userId);
-//
-//    /**
-//     * 获取全局搜索时根据用户管理范围过滤的sql
-//     *
-//     * @param userId
-//     * @return
-//     */
-//
-//    String getUserMtForSql(String userId, String fieldId,
-//                           String fieldCode);
-//
-//    /**
-//     * 获取所有用户管理范围的信息，除adminId
-//     *
-//     * @return
-//     */
-//
-//    List<UserMtAuth> getAllList();
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/service/impl/ManageInfoService.java

@@ -5,7 +5,9 @@ import com.dragoninfo.dcuc.auth.admin.entity.*;
 import com.dragoninfo.dcuc.auth.admin.enumresource.AdminObjectTypeEnum;
 import com.dragoninfo.dcuc.auth.admin.enumresource.AdminOperateTypeEnum;
 import com.dragoninfo.dcuc.auth.admin.enumresource.InitMenuEnum;
-import com.dragoninfo.dcuc.auth.admin.service.*;
+import com.dragoninfo.dcuc.auth.admin.service.IAppMtAuthService;
+import com.dragoninfo.dcuc.auth.admin.service.IManageInfoService;
+import com.dragoninfo.dcuc.auth.admin.service.IMgeLogService;
 import com.dragoninfo.dcuc.auth.admin.vo.AdminAuditVO;
 import com.dragoninfo.dcuc.auth.admin.vo.ManageInfoMsg;
 import com.dragoninfo.dcuc.auth.config.DcucAuthConfig;
@@ -21,6 +23,7 @@ import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
+import com.dragonsoft.duceap.base.utils.UserContextUtils;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
 import com.dragonsoft.duceap.core.context.ContextUtils;
@@ -54,15 +57,7 @@ public class ManageInfoService extends BaseService<ManageInfo, String> implement
 
     @Autowired
     private IAuthUserInfoService authUserInfoService;
-    @Autowired
-    private IMgeMtAuthService iMgeMtAuthService;
-    @Autowired
-    private IOrgMtAuthService iOrgMtAuthService;
-//
-//    @Autowired
-//    private IOrgMtAuthService orgMtAuthService;
-    @Autowired
-    private IUserMtAuthService userMtAuthService;
+
     @Autowired
     private IAppMtAuthService appMtAuthService;
     @Autowired
@@ -74,14 +69,8 @@ public class ManageInfoService extends BaseService<ManageInfo, String> implement
     @Autowired
     private TempMtAuthBPO tempMtAuthBPO;
     @Autowired
-    private OrgMtAuthBPO orgMtAuthBPO;
-    @Autowired
     private AppMtAuthBPO appMtAuthBPO;
     @Autowired
-    private UserMtAuthBPO userMtAuthBPO;
-    @Autowired
-    private MgeMtAuthBPO mgeMtAuthBPO;
-    @Autowired
     private IMgeLogService iMgeLogService;
 //    @Autowired
 //    private ManageInfoBusCenter manageInfoBusCenter;
@@ -437,10 +426,7 @@ public class ManageInfoService extends BaseService<ManageInfo, String> implement
      * @param authAccessable 是否启用auth模块管理本系统菜单权限，webapp端配置参数
      */
     private void setMgeAuth(Collection<ManageInfo> list, Map<String, String> orgIdAuthMap, Boolean authAccessable) {
-        List<OrgMtAuth> orgMtAuthList = new ArrayList<OrgMtAuth>();
         List<AppMtAuth> appMtAuthList = new ArrayList<AppMtAuth>();
-        List<UserMtAuth> userMtAuthList = new ArrayList<UserMtAuth>();
-        List<MgeMtAuth> mgeMtAuthList = new ArrayList<MgeMtAuth>();
         List<MenuMtAuth> menuMtAuths = new ArrayList<MenuMtAuth>();
         List<MgeLog> mgeLogList = new ArrayList<MgeLog>();
         for (ManageInfo manageInfo : list) {
@@ -453,10 +439,7 @@ public class ManageInfoService extends BaseService<ManageInfo, String> implement
                 AppMtAuth appMtAuth = new AppMtAuth(manageInfo.getId(), userId, orgIdAuth);
                 UserMtAuth userMtAuth = new UserMtAuth(manageInfo.getId(), userId, orgIdAuth);
                 MgeMtAuth mgeMtAuth = new MgeMtAuth(manageInfo.getId(), userId, orgIdAuth);
-                orgMtAuthList.add(orgMtAuth);
                 appMtAuthList.add(appMtAuth);
-                userMtAuthList.add(userMtAuth);
-                mgeMtAuthList.add(mgeMtAuth);
                 //新增管理范围日志
                 mgeLogList.add(iMgeLogService.getMgeLog(AdminOperateTypeEnum.XZJGGL.getValue(), orgMtAuth.getUserId(), orgMtAuth.getOrgId(), AdminObjectTypeEnum.JGGL.getValue()));
                 mgeLogList.add(iMgeLogService.getMgeLog(AdminOperateTypeEnum.XZSQGL.getValue(), appMtAuth.getUserId(), appMtAuth.getOrgId(), AdminObjectTypeEnum.SQGL.getValue()));
@@ -509,15 +492,6 @@ public class ManageInfoService extends BaseService<ManageInfo, String> implement
                 iMgeLogService.saveAll(mgeLogList);
             }
         } else {
-            if (CollectionUtils.isNotEmpty(orgMtAuthList)) {
-                orgMtAuthBPO.saveAll(orgMtAuthList);
-            }
-            if (CollectionUtils.isNotEmpty(userMtAuthList)) {
-                userMtAuthBPO.saveAll(userMtAuthList);
-            }
-            if (CollectionUtils.isNotEmpty(mgeMtAuthList)) {
-                mgeMtAuthBPO.saveAll(mgeMtAuthList);
-            }
             if (CollectionUtils.isNotEmpty(menuMtAuths)) {
                 menuMtAuthBPO.saveAll(menuMtAuths);
             }
@@ -528,17 +502,17 @@ public class ManageInfoService extends BaseService<ManageInfo, String> implement
 
 
     }
-
-    private ManageInfo setManageInfo(AuthUserInfo userInfo) {
-        ManageInfo manageInfo = new ManageInfo();
-        manageInfo.setOrgId(userInfo.getOrgId());
-        manageInfo.setUserId(userInfo.getId());
-        manageInfo.setUserName(userInfo.getName());
-        manageInfo.setDeleted(BooleanEnum.FALSE.getValue());
-        manageInfo.setCreateTime(new Date());
-        manageInfo.setCreateUser(ContextUtils.getUserInfo().getId());
-        return manageInfo;
-    }
+//
+//    private ManageInfo setManageInfo(AuthUserInfo userInfo) {
+//        ManageInfo manageInfo = new ManageInfo();
+//        manageInfo.setOrgId(userInfo.getOrgId());
+//        manageInfo.setUserId(userInfo.getId());
+//        manageInfo.setUserName(userInfo.getName());
+//        manageInfo.setDeleted(BooleanEnum.FALSE.getValue());
+//        manageInfo.setCreateTime(new Date());
+//        manageInfo.setCreateUser(ContextUtils.getUserInfo().getId());
+//        return manageInfo;
+//    }
 
     /**
      * 保存管理员操作日志
@@ -590,16 +564,7 @@ public class ManageInfoService extends BaseService<ManageInfo, String> implement
      */
     private List<String> filterUsers(List<Map<String, String>> userList, String type) {
         long time = System.currentTimeMillis();
-        String userMt = "";
-        if ("UserMtAuth".equals(type)) {
-            userMt = userMtAuthService.mgeUserRightRangeStr(ContextUtils.getUserInfo().getId());
-        } else if ("OrgMtAuth".equals(type)) {
-            userMt = iOrgMtAuthService.mgeOrgRightRangeStr(ContextUtils.getUserInfo().getId());
-        } else if ("MgeMtAuth".equals(type)) {
-            userMt = iMgeMtAuthService.mgeMgeRightRangeStr(ContextUtils.getUserInfo().getId());
-        } else if ("AppMtAuth".equals(type)) {
-            userMt = appMtAuthService.mgeAppRightRangeStr(ContextUtils.getUserInfo().getId());
-        }
+        String userMt = appMtAuthService.mgeAppRightRangeStr(ContextUtils.getUserInfo().getId());
         long time2 = System.currentTimeMillis();
         logger.info("获取用户管理范围，耗时=========" + (time2 - time) + "=========");
 
@@ -626,11 +591,11 @@ public class ManageInfoService extends BaseService<ManageInfo, String> implement
 //
     @Override
     public boolean haveAuthWithManage(String userId) {
-        SecurityUser curUser = (SecurityUser) ContextUtils.getUserInfo();
+        SecurityUser curUser = UserContextUtils.getCurrentUser();
         if (authUserInfoService.isRootUser(curUser.getId())) {
             return true;
         }
-        String mgeMt = iMgeMtAuthService.mgeMgeRightRangeStr(curUser.getId());
+        String mgeMt = appMtAuthService.mgeAppRightRangeStr(curUser.getId());
         AuthUserInfo userInfo = authUserInfoService.findById(userId);
         String orgId = userInfo.getOrgId();
         OrgTreeNode orgTreeNode = orgInfoFacade.getOrgTreeNode(orgId);

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/service/impl/MgeMtAuthService.java

@@ -1,125 +0,0 @@
-
-package com.dragoninfo.dcuc.auth.admin.service.impl;
-
-
-import com.dragoninfo.dcuc.auth.admin.entity.MgeMtAuth;
-import com.dragoninfo.dcuc.auth.admin.service.IMgeMtAuthService;
-import com.dragoninfo.dcuc.auth.sub.service.IAuthUserInfoService;
-import com.dragoninfo.dcuc.org.facade.IOrgInfoFacade;
-import com.dragoninfo.duceap.core.service.impl.BaseService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-@Service
-@Transactional
-public class MgeMtAuthService extends BaseService<MgeMtAuth, String> implements IMgeMtAuthService {
-
-    private final String OBJECT_TYPE = "60";//管理员管理范围日志
-    private final String ADD_AUTH_LOG_TYPE = "60";
-    private final String DEL_AUTH_LOG_TYPE = "61";
-
-//    @Resource(name = "redisTemplate")
-//    private RedisTemplate<String, Object> redisTemplate;
-//    @Autowired
-//    private MgeMtAuthBPO mgeMtAuthBPO;
-//    @Autowired
-//    private IManageInfoService manageInfoService;
-//    @Autowired
-//    private IMgeLogService mgeLogService;
-    @Autowired
-    private IAuthUserInfoService authUserInfoService;
-
-    @Autowired
-    private IOrgInfoFacade orgInfoFacade;
-
-//    @Override
-//    public ResponseStatus save(String orgIds, String userId) {
-//
-//        List<MgeMtAuth> mgeMtAuthList = findByPropertyValue("userId", userId);
-//        Map<String, Object> paramsMap = new HashMap<String, Object>();
-//        paramsMap.put("deleted", "0");
-//        paramsMap.put("userId", userId);
-//
-//        MgeLog mgeLog = new MgeLog();
-//        if (mgeMtAuthList.size() >= 1) {
-//            if (mgeMtAuthList.get(0).getOrgId().equals(orgIds)) {
-//                return ResponseStatus.fail("当前操作没有对管理员管理范围进行任何更改");
-//            }
-//            for (MgeMtAuth mgeMtAuth : mgeMtAuthList) {
-//                delete(mgeMtAuth.getId());
-//            }
-//            mgeLog = mgeLogService.getMgeLog(DEL_AUTH_LOG_TYPE, userId, orgIds, OBJECT_TYPE);
-//        } else {
-//            mgeLog = mgeLogService.getMgeLog(ADD_AUTH_LOG_TYPE, userId, orgIds, OBJECT_TYPE);
-//        }
-//        mgeLogService.save(mgeLog);
-//
-//
-//        //保存
-//        List<ManageInfo> manageInfo = manageInfoService.andsearch(ManageInfo.class, paramsMap);
-//        MgeMtAuth mgeMtAuth = new MgeMtAuth();
-//        mgeMtAuth.setMgeId(manageInfo.get(0).getId());
-//        mgeMtAuth.setOrgId(orgIds);
-//        mgeMtAuth.setUserId(userId);
-//
-//        if (StringUtils.isNotEmpty(orgIds)) {
-//            saveOrUpdate(mgeMtAuth);
-//            //清除缓存
-//            String[] orgs = orgIds.split(",");
-//            for (String orgId : orgs) {
-//                String[] orgSplit = orgId.split(":");
-//                redisTemplate.delete(orgSplit[0] + "_manage");
-//            }
-//            //释放redis连接
-//            RedisConnectionUtils.unbindConnection(this.redisTemplate.getConnectionFactory());
-//        }
-//
-//        return ResponseStatus.success("保存成功");
-//    }
-
-    @Override
-    public String mgeMgeRightRangeStr(String userId) {
-        if (authUserInfoService.isRootUser(userId)) {
-            String rootOrgId = orgInfoFacade.getRootOrgId();
-            return rootOrgId + ":2";
-        }
-        List<MgeMtAuth> mgeMtAuthList = findByPropertyValue("userId", userId);
-        String mgeMtAuthStr = "";
-
-        if (mgeMtAuthList.size() > 0) {
-            mgeMtAuthStr = mgeMtAuthList.get(0).getOrgId();
-        }
-
-        return mgeMtAuthStr;
-    }
-
-//    @Override
-//    public ResponseStatus impManger(List<Map<String, String>> list, Map<String, String> userMgeIdmMap) {
-//        List<MgeMtAuth> mgeMtAuthList = new ArrayList<MgeMtAuth>();
-//        List<MgeLog> mgeLogList = new ArrayList<MgeLog>();
-//        for (Map<String, String> map : list) {
-//
-//            MgeMtAuth mgeMtAuth = new MgeMtAuth();
-//            AuthUserInfo userInfo = authUserInfoService.findByIdcard(map.get("idCard"));
-//            if(null == userInfo) {
-//                continue;
-//            }
-//            mgeMtAuth.setMgeId(userMgeIdmMap.get(userInfo.getId()));
-//            mgeMtAuth.setUserId(userInfo.getId());
-//            mgeMtAuth.setOrgId(map.get("authOrgId") + ":" + map.get("auth"));
-//            mgeMtAuthList.add(mgeMtAuth);
-//            mgeLogList.add(mgeLogService.getMgeLog(ADD_AUTH_LOG_TYPE, mgeMtAuth.getUserId(), mgeMtAuth.getOrgId(), OBJECT_TYPE));
-//        }
-//        mgeMtAuthBPO.saveAll(mgeMtAuthList);
-//        mgeLogService.saveAll(mgeLogList);
-//        return ResponseStatus.success();
-//    }
-
-//    @Override
-//    public List<MgeMtAuth> getAllList() {
-//        return mgeMtAuthBPO.findAll();
-//    }
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/service/impl/OrgMtAuthService.java

@@ -1,199 +0,0 @@
-package com.dragoninfo.dcuc.auth.admin.service.impl;
-
-import com.dragoninfo.dcuc.auth.admin.bpo.OrgMtAuthBPO;
-import com.dragoninfo.dcuc.auth.admin.entity.ManageInfo;
-import com.dragoninfo.dcuc.auth.admin.entity.MgeLog;
-import com.dragoninfo.dcuc.auth.admin.entity.OrgMtAuth;
-import com.dragoninfo.dcuc.auth.admin.service.IManageInfoService;
-import com.dragoninfo.dcuc.auth.admin.service.IMgeLogService;
-import com.dragoninfo.dcuc.auth.admin.service.IMgeMtAuthService;
-import com.dragoninfo.dcuc.auth.admin.service.IOrgMtAuthService;
-import com.dragoninfo.dcuc.auth.sub.entity.AuthUserInfo;
-import com.dragoninfo.dcuc.auth.sub.service.IAuthUserInfoService;
-import com.dragoninfo.dcuc.org.facade.IOrgInfoFacade;
-import com.dragoninfo.duceap.core.service.impl.BaseService;
-import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import com.dragonsoft.duceap.commons.util.string.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisConnectionUtils;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-@Transactional
-public class OrgMtAuthService extends BaseService<OrgMtAuth, String> implements IOrgMtAuthService {
-
-    private final String OBJECT_TYPE = "30";//机构管理范围日志
-    private final String ADD_AUTH_LOG_TYPE = "30";
-    private final String DEL_AUTH_LOG_TYPE = "31";
-    /*机构权限BPO**/
-    @Autowired
-    private OrgMtAuthBPO orgMtAuthBPO;
-    /*管理员信息服务**/
-    @Autowired
-    private IManageInfoService manageInfoService;
-    /*用户管理范围服务**/
-//    @Autowired
-//    private IUserMtAuthService iUserMtAuthService;
-    /*用户服务**/
-    @Autowired
-    private IAuthUserInfoService authUserInfoService;
-    /*日志服务**/
-    @Autowired
-    private IMgeLogService mgeLogService;
-    @Autowired
-    private IMgeMtAuthService iMgeMtAuthService;
-    @Resource(name = "redisTemplate")
-    private RedisTemplate<String, Object> redisTemplate;
-//    @Autowired
-//    private OrgAdminNumBPO orgAdminNumBPO;
-
-    @Autowired
-    private IOrgInfoFacade orgInfoFacade;
-
-    @Override
-    public ResponseStatus save(String orgIds, String userId) {
-        List<OrgMtAuth> orgMtAuthList = findByPropertyValue("userId", userId);//被分配者范围
-        Map<String, Object> paramsMap = new HashMap<String, Object>();
-        paramsMap.put("deleted", "0");
-        paramsMap.put("userId", userId);
-        MgeLog mgeLog = null;
-        //删除旧的权限范围
-        if (orgMtAuthList != null && orgMtAuthList.size() >= 1) {
-            if (orgMtAuthList.get(0).getOrgId().equals(orgIds)) {
-                return ResponseStatus.fail("当前操作没有对机构管理范围进行任何更改");
-            }
-          /*  if (UserAreaEnum.GD_AREA.getValue().equals(dcucUserConfig.getUserArea())) {
-                orgAdminNumBPO.cutAdminNum2Org(orgMtAuthList.get(0).getOrgId());
-            }*/
-            for (OrgMtAuth orgMtAuth : orgMtAuthList) {
-                delete(orgMtAuth.getId());
-            }
-            mgeLog = mgeLogService.getMgeLog(DEL_AUTH_LOG_TYPE, userId, orgIds, OBJECT_TYPE);
-        } else {
-            mgeLog = mgeLogService.getMgeLog(ADD_AUTH_LOG_TYPE, userId, orgIds, OBJECT_TYPE);
-        }
-        mgeLogService.save(mgeLog);
-        //保存
-        List<ManageInfo> manageInfo = manageInfoService.andsearch(ManageInfo.class, paramsMap);
-        OrgMtAuth orgMtAuth = new OrgMtAuth();
-        orgMtAuth.setMgeId(manageInfo.get(0).getId());
-        orgMtAuth.setOrgId(orgIds);
-        orgMtAuth.setUserId(userId);
-        if (StringUtils.isNotEmpty(orgIds)) {
-            saveOrUpdate(orgMtAuth);
-        }
-        //清除缓存
-        String[] orgs = orgIds.split(",");
-        for (String orgId : orgs) {
-            String[] orgSplit = orgId.split(":");
-            redisTemplate.delete(orgSplit[0] + "_manage");
-        }
-        //释放redis连接
-        RedisConnectionUtils.unbindConnection(this.redisTemplate.getConnectionFactory());
-        /** 广东地区，机构管理范围与管理员管理范围，用户管理范围合并 **/
-//        if (UserAreaEnum.GD_AREA.getValue().equals(dcucUserProperties.getUserArea())) {
-//            iMgeMtAuthService.save(orgIds, userId);
-//            ResponseStatus responseStatus = iUserMtAuthService.save(orgIds, userId);
-//            //重新计算管理员数量
-//            orgAdminNumBPO.countAdminNum();
-//        }
-        return ResponseStatus.success("保存成功");
-    }
-
-    @Override
-    public String mgeOrgRightRangeStr(String userId) {
-        if (authUserInfoService.isRootUser(userId)) {
-            String rootOrgId = orgInfoFacade.getRootOrgId();
-            return rootOrgId + ":2";
-        }
-        List<OrgMtAuth> orgMtAuthList = orgMtAuthBPO.getOrgMtAuthById(userId);
-        String orgMtAuthStr = "";
-        if (orgMtAuthList.size() > 0) {
-            orgMtAuthStr = orgMtAuthList.get(0).getOrgId();
-        }
-        return orgMtAuthStr;
-    }
-
-//    @Override
-//    public List<OrgMtAuth> getOrgMtAuthById(String userId) {
-//        return orgMtAuthBPO.getOrgMtAuthById(userId);
-//    }
-
-//    @Override
-//    public ResponseStatus impManger(List<Map<String, String>> list, Map<String, String> userMgeIdmMap) {
-//
-//        List<OrgMtAuth> orgMtAuthList = new ArrayList<OrgMtAuth>();
-//        List<MgeLog> mgeLogList = new ArrayList<MgeLog>();
-//        for (Map<String, String> map : list) {
-//
-//            OrgMtAuth orgMtAuth = new OrgMtAuth();
-//            AuthUserInfo userInfo = authUserInfoService.findByIdcard(map.get("idCard"));
-//            if(null == userInfo) {
-//                continue;
-//            }
-//            orgMtAuth.setMgeId(userMgeIdmMap.get(userInfo.getId()));
-//            orgMtAuth.setUserId(userInfo.getId());
-//            orgMtAuth.setOrgId(map.get("authOrgId") + ":" + map.get("auth"));
-//            orgMtAuthList.add(orgMtAuth);
-//            mgeLogList.add(mgeLogService.getMgeLog("30", orgMtAuth.getUserId(), orgMtAuth.getOrgId(), OBJECT_TYPE));
-//        }
-//        orgMtAuthBPO.saveAll(orgMtAuthList);
-//        mgeLogService.saveAll(mgeLogList);
-//        return ResponseStatus.success();
-//    }
-//
-//    @Override
-//    public List<String> mgeOrgRightRangeList(String userId) {
-//        List<OrgMtAuth> orgMtAuthList = findByPropertyValue("userId", userId);
-//        List<String> orgMtAuthStrList = new ArrayList<String>();
-//
-//        if (orgMtAuthList.size() > 0) {
-//            if (StringUtils.isNotEmpty(orgMtAuthList.get(0).getOrgId())) {
-//                for (String orgId : orgMtAuthList.get(0).getOrgId().split(",")) {
-//                    orgMtAuthStrList.add(orgId);
-//                }
-//            }
-//        }
-//
-//        return orgMtAuthStrList;
-//    }
-//
-//    @Override
-//    public List<TreeNodeVo> orgFilter(List<TreeNodeVo> orgList, String userId) {
-//        String targetUserId = userId;
-//
-//        if (StringUtils.isEmpty(targetUserId)) {
-//            targetUserId = ContextUtils.getUserInfo().getId();
-//        }
-//
-//        List<OrgMtAuth> orgMtAuthList = findByPropertyValue("userId", targetUserId);
-//        StringBuffer orgIds = new StringBuffer();
-//        List<TreeNodeVo> newTreeNodeList = new ArrayList<TreeNodeVo>();
-//
-//        for (OrgMtAuth orgMtAuth : orgMtAuthList) {
-//            orgIds.append(orgMtAuth.getOrgId());
-//        }
-//
-//        for (TreeNodeVo treeNodeVo : orgList) {
-//            if (orgIds.toString().contains(treeNodeVo.getValue())) {
-//                newTreeNodeList.add(treeNodeVo);
-//            }
-//        }
-//
-//        return newTreeNodeList;
-//    }
-//
-//    @Override
-//    public List<OrgMtAuth> getAllList() {
-//        return orgMtAuthBPO.findAll();
-//    }
-
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/admin/service/impl/UserMtAuthService.java

@@ -1,246 +0,0 @@
-
-
-
-package com.dragoninfo.dcuc.auth.admin.service.impl;
-
-
-import com.dragoninfo.dcuc.auth.admin.entity.UserMtAuth;
-import com.dragoninfo.dcuc.auth.admin.service.IUserMtAuthService;
-import com.dragoninfo.dcuc.auth.sub.service.IAuthUserInfoService;
-import com.dragoninfo.dcuc.org.facade.IOrgInfoFacade;
-import com.dragoninfo.duceap.core.service.impl.BaseService;
-import com.dragonsoft.duceap.commons.util.string.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-@Service
-@Transactional
-public class UserMtAuthService extends BaseService<UserMtAuth, String> implements IUserMtAuthService {
-
-
-    private final String OBJECT_TYPE = "40";
-    private final String ADD_AUTH_LOG_TYPE = "40";
-    private final String DEL_AUTH_LOG_TYPE = "41";
-
-//    @Resource(name = "redisTemplate")
-//    private RedisTemplate<String, Object> redisTemplate;
-//    @Autowired
-//    private UserMtAuthBPO userMtAuthBPO;
-//    @Autowired
-//    private IMgeMonitorMsgService mgeMonitorMsgService;
-//    @Autowired
-//    private IManageInfoService manageInfoService;
-//    @Autowired
-//    private IMgeLogService mgeLogService;
-    @Autowired
-    private IAuthUserInfoService authUserInfoService;
-
-    @Autowired
-    private IOrgInfoFacade orgInfoFacade;
-
-//    @Override
-//    public ResponseStatus save(String orgIds, String userId) {
-//        List<UserMtAuth> userMtAuthList = findByPropertyValue("userId", userId);//被分配者范围
-//        Map<String, Object> paramsMap = new HashMap<String, Object>();
-//        paramsMap.put("deleted", "0");
-//        paramsMap.put("userId", userId);
-//
-//        MgeLog mgeLog = new MgeLog();
-//        //删除旧的权限范围
-//        if (userMtAuthList != null && userMtAuthList.size() >= 1) {
-//            if (userMtAuthList.get(0).getOrgId().equals(orgIds)) {
-//                return ResponseStatus.fail("当前操作没有对用户管理范围进行任何更改");
-//            }
-//            for (UserMtAuth userMtAuth : userMtAuthList) {
-//                delete(userMtAuth.getId());
-//            }
-//            mgeLog = mgeLogService.getMgeLog(DEL_AUTH_LOG_TYPE, userId, orgIds, OBJECT_TYPE);
-//        } else {
-//            mgeLog = mgeLogService.getMgeLog(ADD_AUTH_LOG_TYPE, userId, orgIds, OBJECT_TYPE);
-//        }
-//        mgeLogService.save(mgeLog);
-//
-//        //保存
-//        UserMtAuth userMtAuth = new UserMtAuth();
-//        List<ManageInfo> manageInfo = manageInfoService.andsearch(ManageInfo.class, paramsMap);
-//        userMtAuth.setMgeId(manageInfo.get(0).getId());
-//        userMtAuth.setOrgId(orgIds);
-//        userMtAuth.setUserId(userId);
-//        if (StringUtils.isNotEmpty(orgIds)) {
-//            saveOrUpdate(userMtAuth);
-//        }
-//        mgeMonitorMsgService.mgeListCheck(userMtAuth);//删除不在该用户范围内的登录消息提醒
-//
-//        //清除缓存
-//        String[] orgs = orgIds.split(",");
-//        for (String orgId : orgs) {
-//            String[] orgSplit = orgId.split(":");
-//            redisTemplate.delete(orgSplit[0] + "_manage");
-//        }
-//        //释放redis连接
-//        RedisConnectionUtils.unbindConnection(this.redisTemplate.getConnectionFactory());
-//        return ResponseStatus.success("保存成功");
-//    }
-
-    @Override
-    public String mgeUserRightRangeStr(String userId) {
-        if (authUserInfoService.isRootUser(userId)) {
-            String rootOrgId = orgInfoFacade.getRootOrgId();
-            if (StringUtils.isNotEmpty(rootOrgId)) {
-                return rootOrgId + ":2";
-            }
-            return "";
-        }
-        List<UserMtAuth> userMtAuthList = findByPropertyValue("userId", userId);
-        String userMtAuthStr = "";
-
-        if (userMtAuthList.size() > 0) {
-            userMtAuthStr = userMtAuthList.get(0).getOrgId();
-        }
-
-        return userMtAuthStr;
-    }
-
-//    @Override
-//    public ResponseStatus impManger(List<Map<String, String>> list, Map<String, String> userMgeIdmMap) {
-//
-//        List<UserMtAuth> userMtAuthList = new ArrayList<UserMtAuth>();
-//        List<MgeLog> mgeLogList = new ArrayList<MgeLog>();
-//        for (Map<String, String> map : list) {
-//
-//            UserMtAuth userMtAuth = new UserMtAuth();
-//            AuthUserInfo userInfo = authUserInfoService.findByIdcard(map.get("idCard"));
-//            if(null == userInfo) {
-//                continue;
-//            }
-//            userMtAuth.setMgeId(userMgeIdmMap.get(userInfo.getId()));
-//            userMtAuth.setUserId(userInfo.getId());
-//            userMtAuth.setOrgId(map.get("authOrgId") + ":" + map.get("auth"));
-//            userMtAuthList.add(userMtAuth);
-//            mgeLogList.add(mgeLogService.getMgeLog("40", userMtAuth.getUserId(), userMtAuth.getOrgId(), OBJECT_TYPE));
-//        }
-//        userMtAuthBPO.saveAll(userMtAuthList);
-//        mgeLogService.saveAll(mgeLogList);
-//        return ResponseStatus.success();
-//    }
-//
-//    @Override
-//    public List<String> mgeUserRightRangeList(String userId) {
-//        List<UserMtAuth> userMtAuthList = findByPropertyValue("userId", userId);
-//        List<String> userMtAuthStrList = new ArrayList<String>();
-//
-//        if (userMtAuthList.size() == 1) {
-//            for (String orgId : userMtAuthList.get(0).getOrgId().split(",")) {
-//                userMtAuthStrList.add(orgId);
-//            }
-//        }
-//
-//        return userMtAuthStrList;
-//    }
-//
-//    @Override
-//    public List<UserMtAuth> userMtList(String userId) {
-//        return userMtAuthBPO.userMtList(userId);
-//    }
-//
-//    @Override
-//    public List<TreeNodeVo> orgFilter(List<TreeNodeVo> orgList, String userId) {
-//        String targetUserId = userId;
-//        if (StringUtils.isEmpty(targetUserId)) {
-//            targetUserId = ContextUtils.getUserInfo().getId();
-//        }
-//
-//        List<UserMtAuth> userMtAuthList = findByPropertyValue("userId", targetUserId);
-//        StringBuffer orgIds = new StringBuffer();
-//        List<TreeNodeVo> newTreeNodeList = new ArrayList<TreeNodeVo>();
-//
-//        for (UserMtAuth userMtAuth : userMtAuthList) {
-//            orgIds.append(userMtAuth.getOrgId());
-//        }
-//
-//        for (TreeNodeVo treeNodeVo : orgList) {
-//            if (orgIds.toString().contains(treeNodeVo.getValue())) {
-//                newTreeNodeList.add(treeNodeVo);
-//            }
-//        }
-//        return newTreeNodeList;
-//    }
-//
-//    @Override
-//    public String getUserMtForSql(String userId, String fieldId, String fieldCode) {
-//        if (StringUtils.isEmpty(userId)) {
-//            return "";
-//        }
-//        String orgIds = this.mgeUserRightRangeStr(userId);
-//        Set<String> inIdSet = new HashSet<String>();
-//        StringBuffer buffer = new StringBuffer();
-//        String[] idStrs = orgIds.split(",");
-//        String result = "";
-//        for (String idStr : idStrs) {
-//            int index = idStr.indexOf(":");
-//            if (index != -1) {
-//                int rang = Integer.valueOf(idStr.substring(index + 1));
-//                if (rang == 2 || rang == -1) {
-//                    String orgId = idStr.substring(0, index);
-//                    OrgInfo orgInfo = orgInfoFacade.detail(orgId);
-//                    String orgInfoCode = orgInfo.getCode();
-//                    if (DeptTreeUtils.CODE_DEPT.equals(orgInfoCode)) {
-//                        return "";
-//                    }
-//                    String code = DeptTreeUtils.getShortDeptId(orgInfoCode);
-//                    buffer.append(" or " + fieldCode + " like '" + code + "%'");
-//                } else {
-//                    inIdSet.add(idStr.substring(0, index));
-//                }
-//            } else {
-//                inIdSet.add(idStr);
-//            }
-//        }
-//        if (inIdSet.size() > 0) {
-//            result = getHQLIn(new ArrayList<Object>(inIdSet), 1000, fieldId);
-//        }
-//        if (StringUtils.isNotEmpty(result)) {
-//            result = "(" + result + ")" + buffer.toString();
-//        } else {
-//            result = buffer.length() > 3 ? buffer.substring(3) : "";
-//        }
-//        return result;
-//    }
-//
-//    @Override
-//    public List<UserMtAuth> getAllList() {
-//        return userMtAuthBPO.findAll();
-//    }
-//    /**
-//     * in参数超过1000处理，转为 field in（……）or field in（……）……
-//     *
-//     * @param ids
-//     * @param count
-//     * @param field
-//     * @return
-//     */
-//    private String getHQLIn(List<?> ids, int count, String field) {
-//        count = Math.min(count, 1000);
-//        int len = ids.size();
-//        int size = len % count;
-//        if (size == 0) {
-//            size = len / count;
-//        } else {
-//            size = (len / count) + 1;
-//        }
-//        StringBuilder builder = new StringBuilder();
-//        for (int i = 0; i < size; i++) {
-//            int fromIndex = i * count;
-//            int toIndex = Math.min(fromIndex + count, len);
-//            String productId = StringUtils.defaultIfEmpty(StringUtils.join(ids.subList(fromIndex, toIndex), "','"), "");
-//            if (i != 0) {
-//                builder.append(" or ");
-//            }
-//            builder.append(field).append(" in ('").append(productId).append("')");
-//        }
-//        return StringUtils.defaultIfEmpty(builder.toString(), field + " in ('')");
-//    }
-}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/config/SubSyncConfig.java

@@ -18,4 +18,9 @@ public class SubSyncConfig {
      */
     private Integer pageSize;
 
+    /**
+     * 用户和机构是否存在 one-many 的关系
+     */
+    private Boolean userOrgRel;
+
 }

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/constance/UserApiConstance.java

@@ -11,6 +11,11 @@ public class UserApiConstance {
      */
     public static final String USER_SYNC_API = "/api/user-service/v1/auth-sync/user-sync";
 
+    /**
+     * 人员机构关系同步API
+     */
+    public static final String USER_ORG_REL_API = "/api/user-service/v1/auth-sync/user-org-rel-sync";
+
     /**
      * 机构同步API
      */

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/business/impl/SubSyncBusiness.java

@@ -11,17 +11,12 @@ import com.dragoninfo.dcuc.auth.config.SubSyncConfig;
 import com.dragoninfo.dcuc.auth.constance.UserApiConstance;
 import com.dragoninfo.dcuc.auth.sub.business.ISubSyncBusiness;
 import com.dragoninfo.dcuc.auth.sub.dto.SyncAcceptDTO;
-import com.dragoninfo.dcuc.auth.sub.entity.AuthOrgInfo;
-import com.dragoninfo.dcuc.auth.sub.entity.AuthOrgOriginalData;
-import com.dragoninfo.dcuc.auth.sub.entity.AuthUserInfo;
-import com.dragoninfo.dcuc.auth.sub.entity.AuthUserOriginalData;
-import com.dragoninfo.dcuc.auth.sub.service.IAuthOrgInfoService;
-import com.dragoninfo.dcuc.auth.sub.service.IAuthOrgOriginalDataService;
-import com.dragoninfo.dcuc.auth.sub.service.IAuthUserInfoService;
-import com.dragoninfo.dcuc.auth.sub.service.IAuthUserOriginalDataService;
+import com.dragoninfo.dcuc.auth.sub.entity.*;
+import com.dragoninfo.dcuc.auth.sub.service.*;
 import com.dragoninfo.dcuc.common.Constants;
 import com.dragoninfo.dcuc.common.http.HttpUtil;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
+import com.dragonsoft.duceap.base.entity.security.BaseSecurityUser;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
 import com.dragonsoft.duceap.base.utils.UserContextUtils;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
@@ -61,6 +56,9 @@ public class SubSyncBusiness implements ISubSyncBusiness {
     @Autowired
     private IAuthUserInfoService userInfoService;
 
+    @Autowired
+    private IAuthUserOrgRelService userOrgRelService;
+
     @Autowired
     private IAuthUserOriginalDataService userOriginalDataService;
 
@@ -86,8 +84,11 @@ public class SubSyncBusiness implements ISubSyncBusiness {
         Runnable r = ()->{
             RequestContextHolder.setRequestAttributes(requestAttributes);
             try {
+                //同步用户信息
                 getUserInfoFromRemote(1, subSyncConfig.getPageSize());
                 userInfoSync();
+                //同步用户和机构的关联关系信息
+                saveUserOrgRel();
             } finally {
                 RequestContextHolder.resetRequestAttributes();
             }
@@ -97,6 +98,90 @@ public class SubSyncBusiness implements ISubSyncBusiness {
         return ResponseStatus.success();
     }
 
+    private void saveUserOrgRel() {
+        Boolean rel = subSyncConfig.getUserOrgRel();
+        if(null != rel && rel) {
+            saveUserOrgRelFromRemote(1, subSyncConfig.getPageSize());
+        }else {
+            saveUserOrgRelFromUserInFo(1);
+        }
+    }
+
+    private void saveUserOrgRelFromRemote(Integer currentPage, Integer pageSize) {
+        Date now = new Date();
+        Integer totalPage = null;
+        List<Header> headers = getHeads();
+        Map<String, Object> pageMap = new HashMap<>();
+        pageMap.put("size", pageSize);
+        Map<String, Object> param = new HashMap<>();
+        param.put("page", pageMap);
+        String url = Joiner.on("").join(authConfig.getUserCenterUrl(), UserApiConstance.USER_ORG_REL_API);
+        logger.info("-------------saveUserOrgRelFromRemote START-----------");
+        do {
+            logger.info("saveUserOrgRelFromRemote currentPage:{}", currentPage);
+            pageMap.put("from", currentPage);
+            String result = HttpUtil.postJSON(url, JSON.toJSONString(param), headers,null);
+            if (StringUtils.isBlank(result)) {
+                logger.info("result is null");
+                break;
+            }
+            //从结果解析用户数据保存到原始数据表
+            SyncAcceptDTO syncAcceptDTO = JSON.parseObject(result, SyncAcceptDTO.class);
+            if(!ResponseStatus.SUCCESS_CODE.equals(syncAcceptDTO.getStatusCode())) {
+                logger.info("saveUserOrgRelFromRemote ERROR:{}, PAGE NO:{}",syncAcceptDTO.getMessage(), currentPage);
+                break;
+            }
+            SyncAcceptDTO.SyncResult syncResult = syncAcceptDTO.getResult();
+            //解析请求结果
+            List<AuthUserOrgRel> relations = convertToRel(now, syncResult);
+            if(CollectionUtils.isNotEmpty(relations)) {
+                userOrgRelService.saveByUserId(relations);
+            }
+            //从结果解析总页数
+            totalPage = getTotalPage(pageSize, totalPage, syncResult);
+        } while (++currentPage <= totalPage);
+        logger.info("-------------getUserInfoFromRemote END-----------");
+    }
+
+    private List<AuthUserOrgRel> convertToRel(Date now, SyncAcceptDTO.SyncResult syncResult) {
+        BaseSecurityUser currentUser = UserContextUtils.getCurrentUser();
+        JSONArray content = syncResult.getContent();
+        List<AuthUserOrgRel> relList = new ArrayList<>();
+        List<String> orgCodes = new ArrayList<>();
+        List<String> idcards = new ArrayList<>();
+        for (int i = 0; i < content.size(); i++) {
+            JSONObject jsonObject = content.getJSONObject(i);
+            AuthUserOrgRel userOrgRel = new AuthUserOrgRel();
+            AuthUserOrgRel authUserOrgRel = JSON.parseObject(jsonObject.toJSONString(), AuthUserOrgRel.class);
+            userOrgRel.setDeleted(BooleanEnum.FALSE.value);
+            userOrgRel.setCreateTime(now);
+            if(null != currentUser) {
+                userOrgRel.setCreateUser(currentUser.getId());
+            }
+            orgCodes.add(authUserOrgRel.getOrgCode());
+            idcards.add(authUserOrgRel.getIdcard());
+            relList.add(authUserOrgRel);
+        }
+        List<AuthOrgInfo> orgInfos = orgInfoService.getOrgByCodes(orgCodes);
+        List<AuthUserInfo> userInfos = userInfoService.getByIdcards(idcards);
+        Map<String, AuthUserInfo> userInfoMap = userInfos.stream().collect(Collectors.toMap(AuthUserInfo::getIdcard, e -> e));
+        Map<String, AuthOrgInfo> orgInfoMap = orgInfos.stream().collect(Collectors.toMap(AuthOrgInfo::getCode, e -> e));
+        relList.stream().forEach(e->{
+            String orgCode = e.getOrgCode();
+            String idcard = e.getIdcard();
+            AuthUserInfo userInfo = userInfoMap.get(idcard);
+            AuthOrgInfo authOrgInfo = orgInfoMap.get(orgCode);
+            if(null != authOrgInfo) {
+                e.setOrgId(authOrgInfo.getId());
+            }
+            if(null != userInfo) {
+                e.setUserId(userInfo.getId());
+            }
+        });
+        return relList;
+    }
+
+
     /**
      * 从用户中心获取用户信息并保存到用户原始数据表
      * @param pageSize

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/entity/AuthUserInfo.java

@@ -10,6 +10,7 @@ import com.dragonsoft.duceap.base.enums.BooleanEnum;
 import com.dragonsoft.duceap.core.persistent.audit.JpaAuditingEntityListener;
 import lombok.Data;
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Where;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;
@@ -28,6 +29,7 @@ import java.util.Date;
 @EntityListeners({JpaAuditingEntityListener.class, GmJpaEntityListener.class})
 @Entity
 @Table(name = "T_AUTH_USER_INFO")
+@Where(clause = "deleted = '0'")
 @Data
 public class AuthUserInfo implements LogicDeleteable, IdEntity<String> {
     @Id

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/entity/AuthUserOrgRel.java

@@ -0,0 +1,76 @@
+package com.dragoninfo.dcuc.auth.sub.entity;
+
+import com.dragoninfo.dcuc.auth.gm.listener.GmJpaEntityListener;
+import com.dragonsoft.duceap.base.entity.persistent.IdEntity;
+import com.dragonsoft.duceap.core.persistent.audit.JpaAuditingEntityListener;
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 人员机构关系实体类
+ * @author mazq
+ * @date 2021/8/27
+ */
+@EntityListeners({JpaAuditingEntityListener.class, GmJpaEntityListener.class})
+@Entity
+@Table(name = "T_AUTH_USER_INFO")
+@Data
+public class AuthUserOrgRel implements IdEntity<String> {
+
+    /** 主键ID */
+    @Id
+    @GeneratedValue(generator = "idGenerator")
+    @GenericGenerator(name = "idGenerator", strategy = "uuid")
+    @Column(name = "ID")
+    private String id ;
+
+    /** 人员id */
+    @Column(name = "ID")
+    private String userId ;
+
+    /** 人员类型 */
+    @Column(name = "USER_TYPE")
+    private String userType ;
+
+    /** 人员身份证号 */
+    @Column(name = "IDCARD")
+    private String idcard ;
+
+    /** 机构id */
+    private String orgId ;
+
+    /** 机构CODE */
+    @Column(name = "ORG_CODE")
+    private String orgCode ;
+
+    /** 关联关系名称 */
+    @Column(name = "REL_NAME")
+    private String relName ;
+
+    /** 关系状态 */
+    @Column(name = "STATUS")
+    private String relStatus ;
+
+    /** 是否删除 */
+    @Column(name = "DELETED")
+    private String deleted ;
+
+    /** 创建人 */
+    @Column(name = "CREATE_USER")
+    private String createUser ;
+
+    /** 创建时间 */
+    @Column(name = "CREATE_TIME")
+    private Date createTime ;
+
+    /** 更新人 */
+    @Column(name = "UPDATE_USER")
+    private String updateUser ;
+
+    /** 更新时间 */
+    @Column(name = "UPDATE_TIME")
+    private Date updateTime ;
+}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/bpo/AttrInfoRepository.java → dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/repo/AttrInfoRepository.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.auth.sub.bpo;
+package com.dragoninfo.dcuc.auth.sub.repo;
 
 import com.dragoninfo.dcuc.auth.sub.entity.AttrInfo;
 import com.dragonsoft.duceap.core.persistent.repository.BaseRepository;

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/bpo/AttrRelInfoRepository.java → dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/repo/AttrRelInfoRepository.java

@@ -1,7 +1,6 @@
-package com.dragoninfo.dcuc.auth.sub.bpo;
+package com.dragoninfo.dcuc.auth.sub.repo;
 
 import com.dragoninfo.dcuc.auth.sub.entity.AttrRelInfo;
-import com.dragoninfo.duceap.core.persistent.BaseBPO;
 import com.dragonsoft.duceap.core.persistent.repository.BaseRepository;
 import org.springframework.stereotype.Repository;
 

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/bpo/AuthOrgInfoRepository.java → dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/repo/AuthOrgInfoRepository.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.auth.sub.bpo;
+package com.dragoninfo.dcuc.auth.sub.repo;
 
 import com.dragoninfo.dcuc.auth.sub.entity.AuthOrgInfo;
 import com.dragonsoft.duceap.core.persistent.repository.BaseRepository;
@@ -54,7 +54,7 @@ public interface AuthOrgInfoRepository extends BaseRepository<AuthOrgInfo, Strin
       * @param ids
      * @return
      */
-    @Query(value = "select new com.dragoninfo.dcuc.auth.sub.bpo.ChildCountDO(upGovId, count(1) as num ) from AuthOrgInfo where upGovId in :ids and deleted = '0' group by upGovId")
+    @Query(value = "select new com.dragoninfo.dcuc.auth.sub.repo.ChildCountDO(upGovId, count(1) as num ) from AuthOrgInfo where upGovId in :ids and deleted = '0' group by upGovId")
     List<ChildCountDO> selectChildCount(@Param("ids") List<String> ids);
 
     /**

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/bpo/AuthOrgOriginalRepository.java → dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/repo/AuthOrgOriginalRepository.java

@@ -1,7 +1,6 @@
-package com.dragoninfo.dcuc.auth.sub.bpo;
+package com.dragoninfo.dcuc.auth.sub.repo;
 
 import com.dragoninfo.dcuc.auth.sub.entity.AuthOrgOriginalData;
-import com.dragoninfo.duceap.core.persistent.BaseBPO;
 import com.dragonsoft.duceap.core.persistent.repository.BaseRepository;
 import org.springframework.stereotype.Repository;
 

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/bpo/AuthUserInfoRepository.java → dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/repo/AuthUserInfoRepository.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.auth.sub.bpo;
+package com.dragoninfo.dcuc.auth.sub.repo;
 
 import com.dragoninfo.dcuc.auth.sub.entity.AuthUserInfo;
 import com.dragonsoft.duceap.core.persistent.repository.BaseRepository;

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/repo/AuthUserOrgRelRepository.java

@@ -0,0 +1,15 @@
+package com.dragoninfo.dcuc.auth.sub.repo;
+
+import com.dragoninfo.dcuc.auth.sub.entity.AuthUserOrgRel;
+import com.dragonsoft.duceap.core.persistent.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 人员机构关系持久类
+ * @author mazq
+ * @date 2021/8/27
+ */
+@Repository
+public interface AuthUserOrgRelRepository extends BaseRepository<AuthUserOrgRel, String> {
+
+}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/bpo/AuthUserOriginalDataRepository.java → dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/repo/AuthUserOriginalDataRepository.java

@@ -1,7 +1,6 @@
-package com.dragoninfo.dcuc.auth.sub.bpo;
+package com.dragoninfo.dcuc.auth.sub.repo;
 
 import com.dragoninfo.dcuc.auth.sub.entity.AuthUserOriginalData;
-import com.dragoninfo.duceap.core.persistent.BaseBPO;
 import com.dragonsoft.duceap.core.persistent.repository.BaseRepository;
 import org.springframework.stereotype.Repository;
 

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/bpo/ChildCountDO.java → dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/repo/ChildCountDO.java

@@ -1,4 +1,4 @@
-package com.dragoninfo.dcuc.auth.sub.bpo;
+package com.dragoninfo.dcuc.auth.sub.repo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/service/IAuthUserInfoService.java

@@ -116,4 +116,11 @@ public interface IAuthUserInfoService {
      * @return
      */
     String getRootUserId();
+
+    /**
+     * 根据身份证号批量获取用户信息
+     * @param idcards
+     * @return
+     */
+    List<AuthUserInfo> getByIdcards(List<String> idcards);
 }

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/service/IAuthUserOrgRelService.java

@@ -0,0 +1,29 @@
+package com.dragoninfo.dcuc.auth.sub.service;
+
+import com.dragoninfo.dcuc.auth.sub.entity.AuthUserOrgRel;
+
+import java.util.List;
+
+/**
+ * 人员机构关系业务类
+ * @author mazq
+ * @date 2021/8/27
+ */
+public interface IAuthUserOrgRelService {
+
+    /**
+     * 保存
+     * @param entity
+     * @return
+     */
+    AuthUserOrgRel save(AuthUserOrgRel entity);
+
+    /**
+     * 批量保存
+     * @param collect
+     */
+    void saveAll(List<AuthUserOrgRel> collect);
+
+
+    void saveByUserId(List<AuthUserOrgRel> relations);
+}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/service/impl/AttrServiceImpl.java

@@ -1,6 +1,6 @@
 package com.dragoninfo.dcuc.auth.sub.service.impl;
 
-import com.dragoninfo.dcuc.auth.sub.bpo.AttrInfoRepository;
+import com.dragoninfo.dcuc.auth.sub.repo.AttrInfoRepository;
 import com.dragoninfo.dcuc.auth.sub.entity.AttrInfo;
 import com.dragoninfo.dcuc.auth.sub.service.IAttrService;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/service/impl/AuthOrgInfoService.java

@@ -1,8 +1,8 @@
 package com.dragoninfo.dcuc.auth.sub.service.impl;
 
 import com.dragoninfo.dcuc.auth.auth.constance.CommonCons;
-import com.dragoninfo.dcuc.auth.sub.bpo.AuthOrgInfoRepository;
-import com.dragoninfo.dcuc.auth.sub.bpo.ChildCountDO;
+import com.dragoninfo.dcuc.auth.sub.repo.AuthOrgInfoRepository;
+import com.dragoninfo.dcuc.auth.sub.repo.ChildCountDO;
 import com.dragoninfo.dcuc.auth.sub.dto.AuthOrgDTO;
 import com.dragoninfo.dcuc.auth.sub.dto.ExcelImpOrgInfo;
 import com.dragoninfo.dcuc.auth.sub.dto.OrgTreeNodeDTO;
@@ -34,7 +34,6 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.PostConstruct;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/service/impl/AuthOrgOriginalDataService.java

@@ -1,6 +1,6 @@
 package com.dragoninfo.dcuc.auth.sub.service.impl;
 
-import com.dragoninfo.dcuc.auth.sub.bpo.AuthOrgOriginalRepository;
+import com.dragoninfo.dcuc.auth.sub.repo.AuthOrgOriginalRepository;
 import com.dragoninfo.dcuc.auth.sub.entity.AuthOrgOriginalData;
 import com.dragoninfo.dcuc.auth.sub.service.IAuthOrgOriginalDataService;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/service/impl/AuthUserInfoService.java

@@ -1,14 +1,16 @@
 package com.dragoninfo.dcuc.auth.sub.service.impl;
 
-import com.dragoninfo.dcuc.auth.DcucAuthApplication;
 import com.dragoninfo.dcuc.auth.config.DcucAuthConfig;
-import com.dragoninfo.dcuc.auth.sub.bpo.AuthUserInfoRepository;
+import com.dragoninfo.dcuc.auth.sub.entity.AuthUserOrgRel;
+import com.dragoninfo.dcuc.auth.sub.enumresource.JobTypeEnum;
+import com.dragoninfo.dcuc.auth.sub.repo.AuthUserInfoRepository;
 import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
 import com.dragoninfo.dcuc.auth.sub.dto.ExcelImpUserInfo;
 import com.dragoninfo.dcuc.auth.sub.entity.AuthOrgInfo;
 import com.dragoninfo.dcuc.auth.sub.entity.AuthUserInfo;
 import com.dragoninfo.dcuc.auth.sub.service.IAuthOrgInfoService;
 import com.dragoninfo.dcuc.auth.sub.service.IAuthUserInfoService;
+import com.dragoninfo.dcuc.auth.sub.service.IAuthUserOrgRelService;
 import com.dragoninfo.dcuc.auth.util.ImportUtil;
 import com.dragoninfo.dcuc.duceap.enums.UserTypeEnum;
 import com.dragoninfo.dcuc.duceap.facade.ICodeListResourceFacade;
@@ -18,7 +20,9 @@ import com.dragoninfo.dcuc.list.facade.IWhiteListFacade;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.metadata.CodeRecord;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
+import com.dragonsoft.duceap.base.entity.security.BaseSecurityUser;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
+import com.dragonsoft.duceap.base.utils.UserContextUtils;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
 import com.dragonsoft.duceap.core.search.Searchable;
@@ -34,9 +38,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -97,6 +105,9 @@ public class AuthUserInfoService implements IAuthUserInfoService {
     @Autowired
     private IWhiteListFacade whiteListFacade;
 
+    @Autowired
+    private IAuthUserOrgRelService userOrgRelService;
+
     @Autowired
     private DcucAuthConfig authConfig;
 
@@ -107,7 +118,6 @@ public class AuthUserInfoService implements IAuthUserInfoService {
         }
         AuthUserInfo userInfo = new AuthUserInfo();
         userInfo.setIdcard(idcard);
-        userInfo.setDeleted(BooleanEnum.FALSE.value);
         Example<AuthUserInfo> example = Example.of(userInfo);
         return userInfoRepository.findOne(example).orElse(null);
     }
@@ -120,7 +130,6 @@ public class AuthUserInfoService implements IAuthUserInfoService {
 
     @Override
     public Page<AuthUserDTO> page(Searchable searchable) {
-        searchable.addSearchFilter("deleted", SearchOperator.eq, BooleanEnum.FALSE.value);
         Page<AuthUserInfo> page = userInfoRepository.paging(searchable);
         List<AuthUserDTO> userDTOS = page.getContent().stream().map(item -> {
             AuthUserDTO userDTO = new AuthUserDTO();
@@ -169,7 +178,9 @@ public class AuthUserInfoService implements IAuthUserInfoService {
             //对数据进行校验
             verifyUserInfo(list);
             //保存数据
-            saveImport(list);
+            List<AuthUserInfo> authUserInfos = saveImport(list);
+            //保存人员机构关联关系
+            saveUserOrgRel(authUserInfos);
         } catch (IOException e) {
             return ResponseStatus.fail("文件格式不对");
         } catch (NumberFormatException e){
@@ -178,6 +189,35 @@ public class AuthUserInfoService implements IAuthUserInfoService {
         return ResponseStatus.success("导入成功");
     }
 
+    /**
+     * 保存人员和机构关系
+     * @param authUserInfos
+     */
+    private void saveUserOrgRel(List<AuthUserInfo> authUserInfos) {
+        if(CollectionUtils.isEmpty(authUserInfos)) {
+            return;
+        }
+        Date date = new Date();
+        BaseSecurityUser currentUser = UserContextUtils.getCurrentUser();
+        List<AuthUserOrgRel> collect = authUserInfos.stream().filter(e->{
+            String userType = e.getUserType();
+            return  UserTypeEnum.HELPER.getValue().equals(userType)
+                    || UserTypeEnum.POLICE.getValue().equals(userType);
+        }).map(e -> {
+            AuthUserOrgRel rel = new AuthUserOrgRel();
+            rel.setIdcard(e.getIdcard());
+            rel.setOrgCode(e.getOrgCode());
+            rel.setRelStatus(JobTypeEnum.ZZ.getValue());
+            rel.setCreateTime(date);
+            rel.setDeleted(BooleanEnum.FALSE.value);
+            if(null != currentUser) {
+                rel.setCreateUser(currentUser.getId());
+            }
+            return rel;
+        }).collect(Collectors.toList());
+        userOrgRelService.saveAll(collect);
+    }
+
     @Override
     public void delete(String id) {
         userInfoRepository.deleteById(id);
@@ -191,14 +231,12 @@ public class AuthUserInfoService implements IAuthUserInfoService {
     @Override
     public List<AuthUserInfo> findList(SearchDTO searchDTO) {
         Searchable searchable = Searchable.toSearchable(searchDTO);
-        searchable.addSearchFilter("deleted", SearchOperator.eq, BooleanEnum.FALSE.getValue());
         return userInfoRepository.findAll(searchable);
     }
 
     @Override
     public Page<AuthUserDTO> notInWhiteListUserPage(SearchDTO searchDTO) {
         Searchable searchable = Searchable.toSearchable(searchDTO);
-        searchable.addSearchFilter("deleted", SearchOperator.eq, BooleanEnum.FALSE.value);
         List<String> userIds = whiteListFacade.getAllUser();
         searchable.addSearchFilter("id", SearchOperator.notIn, userIds);
         Page<AuthUserInfo> userPage = userInfoRepository.paging(searchable);
@@ -246,13 +284,33 @@ public class AuthUserInfoService implements IAuthUserInfoService {
         return rootUserId;
     }
 
-    private void saveImport(List<ExcelImpUserInfo> list) {
+    @Override
+    public List<AuthUserInfo> getByIdcards(List<String> idcards) {
+        Specification<AuthUserInfo> spec = (root, query, cb) -> root.get("idcard").in(idcards);
+        return userInfoRepository.findAll(spec);
+    }
+
+    private List<AuthUserInfo> saveImport(List<ExcelImpUserInfo> list) {
+        List<AuthUserInfo> authUserInfos = new ArrayList<>();
+        if(CollectionUtils.isEmpty(list)) {
+            return authUserInfos;
+        }
+        Date date = new Date();
+        BaseSecurityUser currentUser = UserContextUtils.getCurrentUser();
         list.forEach(item->{
             AuthUserInfo authUserInfo = new AuthUserInfo();
             BeanUtils.copyProperties(item, authUserInfo);
             authUserInfo.setDeleted(BooleanEnum.FALSE.value);
-            userInfoRepository.save(authUserInfo);
+            authUserInfo.setCreateTime(date);
+            if(null != currentUser) {
+                authUserInfo.setCreateUser(currentUser.getId());
+            }
+            authUserInfos.add(authUserInfo);
         });
+        if(CollectionUtils.isNotEmpty(authUserInfos)) {
+            userInfoRepository.saveAll(authUserInfos);
+        }
+        return authUserInfos;
     }
 
     /**
@@ -393,7 +451,6 @@ public class AuthUserInfoService implements IAuthUserInfoService {
     private List<String> getExistIdcards(List<String> idcards) {
         Searchable searchable = Searchable.newSearchable();
         searchable.addSearchFilter("idcard", SearchOperator.in, idcards);
-        searchable.addSearchFilter("deleted", SearchOperator.eq, BooleanEnum.FALSE.value);
         List<AuthUserInfo> authUserInfos = userInfoRepository.findAll(searchable);
         List<String> collect = authUserInfos.stream().map(AuthUserInfo::getIdcard).distinct().collect(Collectors.toList());
         return collect;

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/service/impl/AuthUserOrgRelServiceImpl.java

@@ -0,0 +1,12 @@
+package com.dragoninfo.dcuc.auth.sub.service.impl;
+
+import com.dragoninfo.dcuc.auth.sub.service.IAuthUserOrgRelService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author mazq
+ * @date 2021/8/27
+ */
+@Service
+public class AuthUserOrgRelServiceImpl implements IAuthUserOrgRelService {
+}

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/service/impl/AuthUserOriginalDataService.java

@@ -1,7 +1,7 @@
 package com.dragoninfo.dcuc.auth.sub.service.impl;
 
 import com.dragoninfo.dcuc.auth.sub.entity.AuthUserOriginalData;
-import com.dragoninfo.dcuc.auth.sub.bpo.AuthUserOriginalDataRepository;
+import com.dragoninfo.dcuc.auth.sub.repo.AuthUserOriginalDataRepository;
 import com.dragoninfo.dcuc.auth.sub.service.IAuthUserOriginalDataService;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/service/impl/IAttrRelServiceImpl.java

@@ -1,7 +1,7 @@
 package com.dragoninfo.dcuc.auth.sub.service.impl;
 
 
-import com.dragoninfo.dcuc.auth.sub.bpo.AttrRelInfoRepository;
+import com.dragoninfo.dcuc.auth.sub.repo.AttrRelInfoRepository;
 import com.dragoninfo.dcuc.auth.sub.entity.AttrRelInfo;
 import com.dragoninfo.dcuc.auth.sub.service.IAttrRelService;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;

dcuc-auth-service/src/main/resources/application-auth.yml

@@ -42,7 +42,8 @@ dcuc:
     bim-login-id: app1
     bim-secret-key: app1@123
     sub:
-      page-size: 10
+      page-size: 500
+      user-org-rel: true
     gm-enable: false
     gm-select-enable: false
     approval-center-url: http://10.254.11.185:8866/approve-gateway

dcuc-auth-service/src/test/java/com/dragoninfo/dcuc/auth/auth/service/IAuthSyncTest.java

@@ -1,12 +1,11 @@
 package com.dragoninfo.dcuc.auth.auth.service;
 
 import com.dragoninfo.dcuc.auth.DcucAuthApplication;
-import com.dragoninfo.dcuc.auth.sub.bpo.AttrInfoRepository;
-import com.dragoninfo.dcuc.auth.sub.bpo.AuthOrgInfoRepository;
-import com.dragoninfo.dcuc.auth.sub.bpo.AuthUserInfoRepository;
-import com.dragoninfo.dcuc.auth.sub.bpo.ChildCountDO;
+import com.dragoninfo.dcuc.auth.sub.repo.AttrInfoRepository;
+import com.dragoninfo.dcuc.auth.sub.repo.AuthOrgInfoRepository;
+import com.dragoninfo.dcuc.auth.sub.repo.AuthUserInfoRepository;
+import com.dragoninfo.dcuc.auth.sub.repo.ChildCountDO;
 import com.dragoninfo.dcuc.auth.sub.business.impl.SubSyncBusiness;
-import com.dragoninfo.dcuc.auth.sub.entity.AuthUserInfo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;