Skip to content

G
gic-platform-auth
Commit 4a55ce9b by guojuxing
Options

删除协作人

parent b7a785e5
Showing with 63 additions and 2602 deletions
gic-platform-auth-api/src/main/java/com/gic/auth/constant/AccountGroupMemberTypeEnum.java
...@@ -10,11 +10,7 @@ public enum AccountGroupMemberTypeEnum { ...@@ -10,11 +10,7 @@ public enum AccountGroupMemberTypeEnum {
/** /**
* 管理员 * 管理员
*/ */
ADMIN(1, "管理员"), ADMIN(1, "管理员");
/**
* 协作人
*/
COLLABORATOR(2, "协作人");
private int code; private int code;
private String message; private String message;
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/CollaboratorDTO.java deleted 100644 → 0
package com.gic.auth.dto;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 协作人
* @ClassName: CollaboratorDTO

* @Description: 

* @author guojuxing

* @date 2019/11/1 4:12 PM

*/
public class CollaboratorDTO implements Serializable{
private static final long serialVersionUID = 2462517418806290625L;
/**
* 新增参数校验分组
*/
public interface SaveValid {
}
/**
* ID
*/
private Integer collaboratorId;
/**
* 名称
*/
@NotBlank(message = "协作人名称不能为空", groups = {SaveValid.class})
private String collaboratorName;
/**
* 商户
*/
@NotNull(message = "主体商户ID不能为空", groups = {SaveValid.class})
private Integer enterpriseId;
/**
* 协作商户
*/
@NotNull(message = "协作商户ID不能为空", groups = {SaveValid.class})
private Integer collaborationEnterpriseId;
private String collaborationEnterpriseName;
/**
* 手机号码
*/
@NotBlank(message = "手机号码不能为空", groups = {SaveValid.class})
private String phone;
/**
* 应用ID
*/
@NotNull(message = "协作应用ID不能为空", groups = {SaveValid.class})
private String appId;
/**
* 应用名称
*/
@NotBlank(message = "协作应用名称不能为空", groups = {SaveValid.class})
private String appName;
/**
* 添加人名称
*/
@NotBlank(message = "添加人名称不能为空", groups = {SaveValid.class})
private String creator;
/**
* 资源组ids，可以多选，_隔开，类似_1_2_'
*/
private String resourceIds;
/**
* 子应用ids，可以多选，用_隔开_2_3_
*/
private String subAppIds;
/**
* 状态: 1:无效 0:youxiao
*/
private Integer deleteFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
private List<String> subAppIdList;
private List<Integer> menuIdList;
private List<Integer> resourceIdList;
public Integer getCollaboratorId() {
return collaboratorId;
}
public void setCollaboratorId(Integer collaboratorId) {
this.collaboratorId = collaboratorId;
}
public String getCollaboratorName() {
return collaboratorName;
}
public void setCollaboratorName(String collaboratorName) {
this.collaboratorName = collaboratorName;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
public String getCreator() {
return creator;
}
public void setCreator(String creator) {
this.creator = creator;
}
public String getSubAppIds() {
return subAppIds;
}
public void setSubAppIds(String subAppIds) {
this.subAppIds = subAppIds;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public CollaboratorDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getCollaborationEnterpriseId() {
return collaborationEnterpriseId;
}
public void setCollaborationEnterpriseId(Integer collaborationEnterpriseId) {
this.collaborationEnterpriseId = collaborationEnterpriseId;
}
public List<String> getSubAppIdList() {
return subAppIdList;
}
public void setSubAppIdList(List<String> subAppIdList) {
this.subAppIdList = subAppIdList;
}
public List<Integer> getMenuIdList() {
return menuIdList;
}
public void setMenuIdList(List<Integer> menuIdList) {
this.menuIdList = menuIdList;
}
public String getCollaborationEnterpriseName() {
return collaborationEnterpriseName;
}
public void setCollaborationEnterpriseName(String collaborationEnterpriseName) {
this.collaborationEnterpriseName = collaborationEnterpriseName;
}
public String getResourceIds() {
return resourceIds;
}
public void setResourceIds(String resourceIds) {
this.resourceIds = resourceIds;
}
public List<Integer> getResourceIdList() {
return resourceIdList;
}
public void setResourceIdList(List<Integer> resourceIdList) {
this.resourceIdList = resourceIdList;
}
@Override
public String toString() {
return "CollaboratorDTO{" +
"collaboratorId=" + collaboratorId +
", collaboratorName='" + collaboratorName + '\'' +
", enterpriseId=" + enterpriseId +
", collaborationEnterpriseId=" + collaborationEnterpriseId +
", collaborationEnterpriseName='" + collaborationEnterpriseName + '\'' +
", phone='" + phone + '\'' +
", appId='" + appId + '\'' +
", appName='" + appName + '\'' +
", creator='" + creator + '\'' +
", resourceIds='" + resourceIds + '\'' +
", subAppIds='" + subAppIds + '\'' +
", deleteFlag=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
", subAppIdList=" + subAppIdList +
", menuIdList=" + menuIdList +
", resourceIdList=" + resourceIdList +
'}';
}
}
gic-platform-auth-api/src/main/java/com/gic/auth/dto/CollaboratorListDTO.java deleted 100644 → 0
package com.gic.auth.dto;
import java.io.Serializable;
import java.util.Date;
/**
* 协作人列表
* @ClassName: CollaboratorListDTO

* @Description: 

* @author guojuxing

* @date 2019/11/4 10:16 AM

*/
public class CollaboratorListDTO implements Serializable{
private static final long serialVersionUID = 1004985676652598819L;
/**
* ID
*/
private Integer collaboratorId;
/**
* 名称
*/
private String collaboratorName;
/**
* 商户
*/
private Integer enterpriseId;
/**
* 协作商户
*/
private Integer collaborationEnterpriseId;
private String collaborationEnterpriseName;
/**
* 手机号码
*/
private String phone;
/**
* 应用ID
*/
private String appId;
/**
* 应用名称
*/
private String appName;
/**
* 添加人名称
*/
private String creator;
/**
* 状态: 0:无效 1:youxiao
*/
private Integer status;
private Integer deleteFlag;
/**
* 创建时间
*/
private Date createTime;
public Integer getCollaboratorId() {
return collaboratorId;
}
public void setCollaboratorId(Integer collaboratorId) {
this.collaboratorId = collaboratorId;
}
public String getCollaboratorName() {
return collaboratorName;
}
public void setCollaboratorName(String collaboratorName) {
this.collaboratorName = collaboratorName;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Integer getCollaborationEnterpriseId() {
return collaborationEnterpriseId;
}
public void setCollaborationEnterpriseId(Integer collaborationEnterpriseId) {
this.collaborationEnterpriseId = collaborationEnterpriseId;
}
public String getCollaborationEnterpriseName() {
return collaborationEnterpriseName;
}
public void setCollaborationEnterpriseName(String collaborationEnterpriseName) {
this.collaborationEnterpriseName = collaborationEnterpriseName;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
public String getCreator() {
return creator;
}
public void setCreator(String creator) {
this.creator = creator;
}
public Integer getStatus() {
if (deleteFlag == null) {
return 0;
}
if (deleteFlag == 1) {
return 0;
}
if (deleteFlag == 0) {
return 1;
}
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public CollaboratorListDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
@Override
public String toString() {
return "CollaboratorListDTO{" +
"collaboratorId=" + collaboratorId +
", collaboratorName='" + collaboratorName + '\'' +
", enterpriseId=" + enterpriseId +
", collaborationEnterpriseId=" + collaborationEnterpriseId +
", collaborationEnterpriseName='" + collaborationEnterpriseName + '\'' +
", phone='" + phone + '\'' +
", appId='" + appId + '\'' +
", appName='" + appName + '\'' +
", creator='" + creator + '\'' +
", status=" + status +
", deleteFlag=" + deleteFlag +
", createTime=" + createTime +
'}';
}
}
gic-platform-auth-api/src/main/java/com/gic/auth/qo/CollaboratorListQO.java deleted 100644 → 0
package com.gic.auth.qo;
import java.util.List;
/**
* 协作人列表查询参数
* @ClassName: CollaboratorListQO

* @Description: 

* @author guojuxing

* @date 2019/11/4 10:21 AM

*/
public class CollaboratorListQO extends PageQO{
private static final long serialVersionUID = -4366009449691269184L;
/**
* 协作人名称/手机号码/商户名称
*/
private String search;
/**
* 应用Id，多选，英文逗号隔开
*/
private String appId;
private Integer status;
private Integer deleteFlag;
private Integer enterpriseId;
private Integer accountGroupId;
private List<Integer> collaboratorIdList;
public String getSearch() {
return search;
}
public void setSearch(String search) {
this.search = search;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Integer getAccountGroupId() {
return accountGroupId;
}
public void setAccountGroupId(Integer accountGroupId) {
this.accountGroupId = accountGroupId;
}
public List<Integer> getCollaboratorIdList() {
return collaboratorIdList;
}
public void setCollaboratorIdList(List<Integer> collaboratorIdList) {
this.collaboratorIdList = collaboratorIdList;
}
public Integer getDeleteFlag() {
if (status != null) {
if (status == 1) {
return 0;
}
return 1;
}
return deleteFlag;
}
public CollaboratorListQO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
}
gic-platform-auth-api/src/main/java/com/gic/auth/service/AccountGroupApiService.java
package com.gic.auth.service; package com.gic.auth.service;
import java.util.List;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.AccountGroupDTO; import com.gic.auth.dto.AccountGroupDTO;
import com.gic.auth.dto.AccountGroupListDTO;
import com.gic.auth.dto.AccountGroupMemberDTO; import com.gic.auth.dto.AccountGroupMemberDTO;
import java.util.List;
/** /**
* 账号分组 * 账号分组
* @ClassName: AccountGroupApiService
 * @ClassName: AccountGroupApiService

...@@ -144,16 +143,4 @@ public interface AccountGroupApiService { ...@@ -144,16 +143,4 @@ public interface AccountGroupApiService {

 */ 
 */
ServiceResponse<String> groupingOfUser(List<Integer> userIdList, List<Integer> accountGroupId, Integer enterpriseId); ServiceResponse<String> groupingOfUser(List<Integer> userIdList, List<Integer> accountGroupId, Integer enterpriseId);
/**
* 协作人批量分组
* @Title: groupingOfCollaborator

* @Description:

 * @author guojuxing
* @param collaboratorIdList
* @param accountGroupId

* @param enterpriseId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>


 */
ServiceResponse<String> groupingOfCollaborator(List<Integer> collaboratorIdList, List<Integer> accountGroupId,
Integer enterpriseId);
} }
gic-platform-auth-api/src/main/java/com/gic/auth/service/CollaboratorApiService.java deleted 100644 → 0
package com.gic.auth.service;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.AppDTO;
import com.gic.auth.dto.CollaboratorDTO;
import com.gic.auth.dto.CollaboratorListDTO;
import com.gic.auth.dto.MenuDTO;
import com.gic.auth.qo.CollaboratorListQO;
import java.util.List;
/**
* 协作人接口
* @ClassName: CollaboratorApiService

* @Description: 

* @author guojuxing

* @date 2019/11/1 4:15 PM

*/
public interface CollaboratorApiService {
/**
* 新增协作人
* @Title: save

* @Description:

 * @author guojuxing
* @param dto

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>


 */
ServiceResponse<Integer> save(CollaboratorDTO dto);
/**
* 分页查询协作人泪奔
* @Title: page

* @Description:

 * @author guojuxing
* @param params

* @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.auth.dto.CollaboratorListDTO>>


 */
ServiceResponse<Page<CollaboratorListDTO>> page(CollaboratorListQO params);
/**
* 查询已购买的一级应用
* @Title: listApp

* @Description:

 * @author guojuxing
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.AppDTO>


 */
ServiceResponse<List<AppDTO>> listApp(Integer enterpriseId);
/**
* 查询详情
* @Title: getDetail

* @Description:

 * @author guojuxing
* @param collaboratorId

* @return com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.CollaboratorDTO>


 */
ServiceResponse<CollaboratorDTO> getDetail(Integer collaboratorId);
/**
* 授权
* @Title: auth

* @Description:

 * @author guojuxing
* @param subAppIds 子应用ID，英文逗号隔开
* @param menuIds
 操作权限ID，英文逗号隔开
* @param resourcesIds 资源组ID，英文逗号隔开
* @param collaboratorId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
 返回日志操作对象

 */
ServiceResponse<String> auth(String subAppIds, String menuIds, String resourcesIds, Integer collaboratorId);
/**
* 取消
* @Title: cancel

* @Description:

 * @author guojuxing
* @param collaboratorId

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


 */
ServiceResponse<Void> cancel(Integer collaboratorId);
/**
* 获取协作应用的应用菜单权限页面
* @Title: getCollaboratorMenuPage

* @Description:

* @author guojuxing
* @param enterpriseId
* @param phone
* @param appId

* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>


*/
ServiceResponse<List<MenuDTO>> getCollaboratorMenuPage(Integer enterpriseId, String phone, String appId);
/**
* 获取协作应用的没有权限的操作项列表
* @Title: getCollaboratorOperationItem

* @Description:

* @author guojuxing
* @param enterpriseId
* @param phone
* @param appId

* @param userId 登录用户ID
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>


*/
ServiceResponse<List<MenuDTO>> getCollaboratorOperationItem(Integer enterpriseId, String phone, String appId, Integer userId);
/**
* 查询主键ID，协作人那边授权跳转，需要主键ID
* @param enterpriseId 协作商户ID
* @param phone
* @param appId
* @return
*/
ServiceResponse<Integer> getIdByPhoneAndAppId(Integer enterpriseId, String phone, String appId);
/**
* 删除
* @param enterpriseId 写作商户ID
* @param phone
* @param appId
* @return
*/
ServiceResponse<Void> deleteByPhoneAndAppId(Integer enterpriseId, String phone, String appId);
}
gic-platform-auth-api/src/main/java/com/gic/auth/service/MenuApiService.java
package com.gic.auth.service; package com.gic.auth.service;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.AuthItemListDTO; import com.gic.auth.dto.AuthItemListDTO;
...@@ -11,10 +15,6 @@ import com.gic.auth.qo.MenuListQO; ...@@ -11,10 +15,6 @@ import com.gic.auth.qo.MenuListQO;
import com.gic.auth.qo.MenuOperationItemListQO; import com.gic.auth.qo.MenuOperationItemListQO;
import com.gic.auth.qo.UserMenuQO; import com.gic.auth.qo.UserMenuQO;
import java.util.List;
import java.util.Map;
import java.util.Set;
/** /**
* 权限树 * 权限树
* @ClassName: MenuApiService
 * @ClassName: MenuApiService

...@@ -101,30 +101,6 @@ public interface MenuApiService { ...@@ -101,30 +101,6 @@ public interface MenuApiService {
ServiceResponse<List<MenuDTO>> getUserMenuOfGicNotTree(Integer enterpriseId, Integer userId, Integer currentMenu, ServiceResponse<List<MenuDTO>> getUserMenuOfGicNotTree(Integer enterpriseId, Integer userId, Integer currentMenu,
String versionCode); String versionCode);
/**
* 获取协作应用的权限页面
* @Title: getCollaboratorAppMenuPage

* @Description:

* @author guojuxing
* @param enterpriseId
* @param menuIdList
* @param appId

* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>


*/
ServiceResponse<List<MenuDTO>> getCollaboratorAppMenuPage(Integer enterpriseId, List<Integer> menuIdList, String appId);
/**
* 获取协作应用的没有权限的操作项列表数据
* @Title: getCollaboratorAppOperationItem
* @Description:
* @author zhiwj
* @param menuIdList 协作应用权限
* @param appId 应用ID
* @param userId 管理员
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>
* @throws
*/
ServiceResponse<List<MenuDTO>> getCollaboratorAppOperationItem(List<Integer> menuIdList, String appId, Integer userId);
/** /**
* 获取登陆用户的应用菜单（页面类型）已构建成树结构 * 获取登陆用户的应用菜单（页面类型）已构建成树结构
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysCollaboratorMapper.java deleted 100644 → 0
package com.gic.auth.dao.mapper;
import com.gic.auth.dto.CollaboratorListDTO;
import com.gic.auth.entity.TabSysCollaborator;
import com.gic.auth.qo.CollaboratorListQO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
* @ClassName: TabSysCollaboratorMapper
* @Description:
* @author zhiwj
* @date 2020-09-10 9:39
*/
public interface TabSysCollaboratorMapper {
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabSysCollaborator record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabSysCollaborator record);
/**
* 根据主键查询
*
* @param collaboratorId 主键
* @return 实体对象
*/
TabSysCollaborator selectByPrimaryKey(Integer collaboratorId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabSysCollaborator record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabSysCollaborator record);
/**
* 查询列表数据
* @Title: list

* @Description:

 * @author guojuxing
* @param params

* @return java.util.List<com.gic.auth.dto.CollaboratorListDTO>


 */
List<CollaboratorListDTO> list(CollaboratorListQO params);
/**
* 查询列表数据
* @Title: listByCollaboratorIdList

* @Description:

 * @author guojuxing
* @param collaboratorIdList

* @return java.util.List<com.gic.auth.entity.TabSysCollaborator>


 */
List<TabSysCollaborator> listByCollaboratorIdList(@Param("list") List<Integer> collaboratorIdList);
/**
* 查询不在范围内的列表
* @Title: listNotInCollaboratorIdList

* @Description:

 * @author guojuxing
* @param collaboratorIdList
* @param search
* @param enterpriseId

* @return java.util.List<com.gic.auth.entity.TabSysCollaborator>


 */
List<TabSysCollaborator> listNotInCollaboratorIdList(@Param("list") List<Integer> collaboratorIdList,
@Param("search") String search, @Param("enterpriseId") Integer enterpriseId);
/**
* getByPhoneAndAppId
* @Title: getByPhoneAndAppId
* @Description:
* @author zhiwj
* @param enterpriseId
* @param phone
* @param appId
* @return com.gic.auth.entity.TabSysCollaborator
* @throws
*/
TabSysCollaborator getByPhoneAndAppId(@Param("enterpriseId") Integer enterpriseId, @Param("phone") String phone,
@Param("appId") String appId);
/**
* deleteByPhoneAndAppId
* @Title: deleteByPhoneAndAppId
* @Description:
* @author zhiwj
* @param enterpriseId
* @param phone
* @param appId
* @return void
* @throws
*/
void deleteByPhoneAndAppId(@Param("enterpriseId") Integer enterpriseId, @Param("phone") String phone,
@Param("appId") String appId);
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysCollaboratorRoleRelMapper.java deleted 100644 → 0
package com.gic.auth.dao.mapper;
import com.gic.auth.entity.TabSysCollaboratorRoleRel;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
* @ClassName: TabSysCollaboratorRoleRelMapper
* @Description:
* @author zhiwj
* @date 2020-09-10 9:40
*/
public interface TabSysCollaboratorRoleRelMapper {
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabSysCollaboratorRoleRel record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabSysCollaboratorRoleRel record);
/**
* 根据主键查询
*
* @param collaboratorRoleRelId 主键
* @return 实体对象
*/
TabSysCollaboratorRoleRel selectByPrimaryKey(Integer collaboratorRoleRelId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabSysCollaboratorRoleRel record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabSysCollaboratorRoleRel record);
/**
* saveFetch
* @Title: saveFetch
* @Description:
* @author zhiwj
* @param list
* @return void
* @throws
*/
void saveFetch(@Param("list") List<TabSysCollaboratorRoleRel> list);
/**
* deleteByCollaboratorId
* @Title: deleteByCollaboratorId
* @Description:
* @author zhiwj
* @param collaboratorId
* @return void
* @throws
*/
void deleteByCollaboratorId(@Param("collaboratorId") Integer collaboratorId);
/**
* listByCollaboratorId
* @Title: listByCollaboratorId
* @Description:
* @author zhiwj
* @param collaboratorId
* @return java.util.List<com.gic.auth.entity.TabSysCollaboratorRoleRel>
* @throws
*/
List<TabSysCollaboratorRoleRel> listByCollaboratorId(@Param("collaboratorId") Integer collaboratorId);
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysCollaborator.java deleted 100644 → 0
package com.gic.auth.entity;
import java.util.Date;
/**
* tab_sys_collaborator
*/
/**
*
* @ClassName: TabSysCollaborator
* @Description:
* @author zhiwj
* @date 2020-09-10 9:39
*/
public class TabSysCollaborator {
/**
* ID
*/
private Integer collaboratorId;
/**
* 名称
*/
private String collaboratorName;
/**
* 主体商户
*/
private Integer enterpriseId;
/**
* 协作商户
*/
private Integer collaborationEnterpriseId;
/**
* 手机号码
*/
private String phone;
/**
* 应用ID
*/
private String appId;
/**
* 应用名称
*/
private String appName;
/**
* 添加人名称
*/
private String creator;
/**
* 资源组ids，可以多选，_隔开，类似_1_2_'
*/
private String resourceIds;
/**
* 子应用ids，可以多选，用_隔开_2_3_
*/
private String subAppIds;
/**
* 状态: 1:无效 0:youxiao
*/
private Integer deleteFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
public Integer getCollaboratorId() {
return collaboratorId;
}
public void setCollaboratorId(Integer collaboratorId) {
this.collaboratorId = collaboratorId;
}
public String getCollaboratorName() {
return collaboratorName;
}
public void setCollaboratorName(String collaboratorName) {
this.collaboratorName = collaboratorName;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Integer getCollaborationEnterpriseId() {
return collaborationEnterpriseId;
}
public void setCollaborationEnterpriseId(Integer collaborationEnterpriseId) {
this.collaborationEnterpriseId = collaborationEnterpriseId;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
public String getCreator() {
return creator;
}
public void setCreator(String creator) {
this.creator = creator;
}
public String getSubAppIds() {
return subAppIds;
}
public void setSubAppIds(String subAppIds) {
this.subAppIds = subAppIds;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public TabSysCollaborator setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getResourceIds() {
return resourceIds;
}
public void setResourceIds(String resourceIds) {
this.resourceIds = resourceIds;
}
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysCollaboratorRoleRel.java deleted 100644 → 0
package com.gic.auth.entity;
import java.util.Date;
/**
* tab_sys_collaborator_role_rel
*/
/**
*
* @ClassName: TabSysCollaboratorRoleRel
* @Description:
* @author zhiwj
* @date 2020-09-10 9:40
*/
public class TabSysCollaboratorRoleRel {
/**
* ID
*/
private Integer collaboratorRoleRelId;
/**
*
*/
private Integer collaboratorId;
/**
* 权限菜单
*/
private Integer menuId;
/**
* 1:无效0:有效
*/
private Integer deleteFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
public Integer getCollaboratorRoleRelId() {
return collaboratorRoleRelId;
}
public void setCollaboratorRoleRelId(Integer collaboratorRoleRelId) {
this.collaboratorRoleRelId = collaboratorRoleRelId;
}
public Integer getCollaboratorId() {
return collaboratorId;
}
public void setCollaboratorId(Integer collaboratorId) {
this.collaboratorId = collaboratorId;
}
public Integer getMenuId() {
return menuId;
}
public void setMenuId(Integer menuId) {
this.menuId = menuId;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public TabSysCollaboratorRoleRel setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/service/CollaboratorRoleRelService.java deleted 100644 → 0
package com.gic.auth.service;
import com.gic.auth.entity.TabSysCollaboratorRoleRel;
import java.util.List;
/**
* 协作人操作权限
* @ClassName: CollaboratorRoleRelService

* @Description: 

* @author guojuxing

* @date 2019/11/4 2:55 PM

*/
public interface CollaboratorRoleRelService {
/**
* 批量新增
* @Title: saveFetch

* @Description:

 * @author guojuxing
* @param list

* @return void


 */
void saveFetch(List<TabSysCollaboratorRoleRel> list);
/**
* 删除协作人的操作权限
* @Title: deleteByCollaboratorId

* @Description:

 * @author guojuxing
* @param collaboratorId

* @return void


 */
void deleteByCollaboratorId(Integer collaboratorId);
/**
* listByCollaboratorId
* @Title: listByCollaboratorId
* @Description:
* @author zhiwj
* @param collaboratorId
* @return java.util.List<com.gic.auth.entity.TabSysCollaboratorRoleRel>
* @throws
*/
List<TabSysCollaboratorRoleRel> listByCollaboratorId(Integer collaboratorId);
}
gic-platform-auth-service/src/main/java/com/gic/auth/service/CollaboratorService.java deleted 100644 → 0
package com.gic.auth.service;
import com.gic.auth.dto.CollaboratorDTO;
import com.gic.auth.dto.CollaboratorListDTO;
import com.gic.auth.entity.TabSysCollaborator;
import com.gic.auth.qo.CollaboratorListQO;
import com.github.pagehelper.Page;
import java.util.List;
/**
* 协作人接口
* @ClassName: CollaboratorService

* @Description: 

* @author guojuxing

* @date 2019/11/1 4:20 PM

*/
public interface CollaboratorService {
/**
* 新增协作人
* @Title: save

* @Description:

 * @author guojuxing
* @param dto

* @return java.lang.Integer


 */
Integer save(CollaboratorDTO dto);
/**
* 分页查询协作人列表
* @Title: page

* @Description:

 * @author guojuxing
* @param params

* @return com.github.pagehelper.Page<com.gic.auth.dto.CollaboratorListDTO>


 */
Page<CollaboratorListDTO> page(CollaboratorListQO params);
/**
* 列表查询
* @Title: listByEnterpriseId

* @Description:

 * @author guojuxing
* @param collaboratorIdList

* @return java.util.List<com.gic.auth.entity.TabSysCollaborator>


 */
List<TabSysCollaborator> listByCollaboratorIdList(List<Integer> collaboratorIdList);
/**
* 查询不在范围内的数据
* @Title: listNotInCollaboratorIdList

* @Description:

 * @author guojuxing
* @param collaboratorIdList

* @param search
* @param enterpriseId
* @return java.util.List<com.gic.auth.entity.TabSysCollaborator>


 */
List<TabSysCollaborator> listNotInCollaboratorIdList(List<Integer> collaboratorIdList, String search,
Integer enterpriseId);
/**
* getById
* @Title: getById
* @Description:
* @author zhiwj
* @param id
* @return com.gic.auth.entity.TabSysCollaborator
* @throws
*/
TabSysCollaborator getById(Integer id);
/**
* update
* @Title: update
* @Description:
* @author zhiwj
* @param dto
* @return void
* @throws
*/
void update(CollaboratorDTO dto);
/**
* getByPhoneAndAppId
* @Title: getByPhoneAndAppId
* @Description:
* @author zhiwj
* @param enterpriseId
* @param phone
* @param appId
* @return com.gic.auth.entity.TabSysCollaborator
* @throws
*/
TabSysCollaborator getByPhoneAndAppId(Integer enterpriseId, String phone, String appId);
/**
* deleteByPhoneAndAppId
* @Title: deleteByPhoneAndAppId
* @Description:
* @author zhiwj
* @param enterpriseId
* @param phone
* @param appId
* @return void
* @throws
*/
void deleteByPhoneAndAppId(Integer enterpriseId, String phone, String appId);
}
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/CollaboratorRoleRelServiceImpl.java deleted 100644 → 0
package com.gic.auth.service.impl;
import com.gic.auth.dao.mapper.TabSysCollaboratorRoleRelMapper;
import com.gic.auth.entity.TabSysCollaboratorRoleRel;
import com.gic.auth.service.CollaboratorRoleRelService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
*
* @ClassName: CollaboratorRoleRelServiceImpl
* @Description:
* @author zhiwj
* @date 2020-09-10 9:37
*/
@Service("collaboratorRoleRelService")
public class CollaboratorRoleRelServiceImpl implements CollaboratorRoleRelService{
@Autowired
private TabSysCollaboratorRoleRelMapper tabSysCollaboratorRoleRelMapper;
@Override
public void saveFetch(List<TabSysCollaboratorRoleRel> list) {
tabSysCollaboratorRoleRelMapper.saveFetch(list);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void deleteByCollaboratorId(Integer collaboratorId) {
tabSysCollaboratorRoleRelMapper.deleteByCollaboratorId(collaboratorId);
}
@Override
public List<TabSysCollaboratorRoleRel> listByCollaboratorId(Integer collaboratorId) {
return tabSysCollaboratorRoleRelMapper.listByCollaboratorId(collaboratorId);
}
}
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/CollaboratorServiceImpl.java deleted 100644 → 0
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabSysCollaboratorMapper;
import com.gic.auth.dto.CollaboratorDTO;
import com.gic.auth.dto.CollaboratorListDTO;
import com.gic.auth.entity.TabSysCollaborator;
import com.gic.auth.qo.CollaboratorListQO;
import com.gic.auth.service.CollaboratorService;
import com.gic.commons.util.EntityUtil;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
*
* @ClassName: CollaboratorServiceImpl
* @Description:
* @author zhiwj
* @date 2020-09-10 9:37
*/
@Service("collaboratorService")
public class CollaboratorServiceImpl implements CollaboratorService {
@Autowired
private TabSysCollaboratorMapper tabSysCollaboratorMapper;
@Override
public Integer save(CollaboratorDTO dto) {
dto.setCreateTime(new Date());
dto.setUpdateTime(new Date());
dto.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
TabSysCollaborator record = EntityUtil.changeEntityNew(TabSysCollaborator.class, dto);
tabSysCollaboratorMapper.insertSelective(record);
return record.getCollaboratorId();
}
@Override
public Page<CollaboratorListDTO> page(CollaboratorListQO params) {
PageHelper.startPage(params.getCurrentPage(), params.getPageSize());
return (Page<CollaboratorListDTO>) tabSysCollaboratorMapper.list(params);
}
@Override
public List<TabSysCollaborator> listByCollaboratorIdList(List<Integer> collaboratorIdList) {
return tabSysCollaboratorMapper.listByCollaboratorIdList(collaboratorIdList);
}
@Override
public List<TabSysCollaborator> listNotInCollaboratorIdList(List<Integer> collaboratorIdList, String search,
Integer enterpriseId) {
return tabSysCollaboratorMapper.listNotInCollaboratorIdList(collaboratorIdList, search, enterpriseId);
}
@Override
public TabSysCollaborator getById(Integer id) {
return tabSysCollaboratorMapper.selectByPrimaryKey(id);
}
@Override
public void update(CollaboratorDTO dto) {
dto.setUpdateTime(new Date());
TabSysCollaborator record = EntityUtil.changeEntityNew(TabSysCollaborator.class, dto);
tabSysCollaboratorMapper.updateByPrimaryKeySelective(record);
}
@Override
public TabSysCollaborator getByPhoneAndAppId(Integer enterpriseId, String phone, String appId) {
TabSysCollaborator record = tabSysCollaboratorMapper.getByPhoneAndAppId(enterpriseId, phone, appId);
return record;
}
@Override
public void deleteByPhoneAndAppId(Integer enterpriseId, String phone, String appId) {
tabSysCollaboratorMapper.deleteByPhoneAndAppId(enterpriseId, phone, appId);
}
}
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/AccountGroupApiServiceImpl.java
package com.gic.auth.service.outer.impl; package com.gic.auth.service.outer.impl;
import java.util.*;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.AccountGroupMemberTypeEnum; import com.gic.auth.constant.AccountGroupMemberTypeEnum;
import com.gic.auth.constant.DeleteFlagConstants; import com.gic.auth.constant.DeleteFlagConstants;
...@@ -10,18 +17,14 @@ import com.gic.auth.dto.AccountGroupMemberDTO; ...@@ -10,18 +17,14 @@ import com.gic.auth.dto.AccountGroupMemberDTO;
import com.gic.auth.dto.AccountGroupRelDTO; import com.gic.auth.dto.AccountGroupRelDTO;
import com.gic.auth.entity.TabSysAccountGroup; import com.gic.auth.entity.TabSysAccountGroup;
import com.gic.auth.entity.TabSysAccountGroupRel; import com.gic.auth.entity.TabSysAccountGroupRel;
import com.gic.auth.entity.TabSysCollaborator;
import com.gic.auth.entity.TabSysUser; import com.gic.auth.entity.TabSysUser;
import com.gic.auth.service.*; import com.gic.auth.service.AccountGroupApiService;
import com.gic.auth.service.AccountGroupRelService;
import com.gic.auth.service.AccountGroupService;
import com.gic.auth.service.UserService;
import com.gic.commons.util.EntityUtil; import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.error.ErrorCode; import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.utils.valid.ValidParamsUtils; import com.gic.enterprise.utils.valid.ValidParamsUtils;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
/** /**
* *
* @ClassName: AccountGroupApiServiceImpl * @ClassName: AccountGroupApiServiceImpl
...@@ -37,8 +40,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService { ...@@ -37,8 +40,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService {
private AccountGroupRelService accountGroupRelService; private AccountGroupRelService accountGroupRelService;
@Autowired @Autowired
private UserService userService; private UserService userService;
@Autowired
private CollaboratorService collaboratorService;
@Override @Override
public ServiceResponse<Integer> save(AccountGroupDTO dto) { public ServiceResponse<Integer> save(AccountGroupDTO dto) {
...@@ -145,8 +146,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService { ...@@ -145,8 +146,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService {
List<TabSysAccountGroupRel> list = accountGroupRelService.listByAccountGroupId(accountGroupIdList, null); List<TabSysAccountGroupRel> list = accountGroupRelService.listByAccountGroupId(accountGroupIdList, null);
//查询管理员列表 //查询管理员列表
result.addAll(getMemberOfUser(list, true, null, null)); result.addAll(getMemberOfUser(list, true, null, null));
// 查询协作人列表
result.addAll(getMemberOfCollaborator(list, true, null, null));
return ServiceResponse.success(result); return ServiceResponse.success(result);
} }
...@@ -161,8 +160,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService { ...@@ -161,8 +160,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService {
List<TabSysAccountGroupRel> list = listByAccountGroupId(accountGroupId); List<TabSysAccountGroupRel> list = listByAccountGroupId(accountGroupId);
//查询管理员列表 //查询管理员列表
result.addAll(getMemberOfUser(list, false, search, record.getEnterpriseId())); result.addAll(getMemberOfUser(list, false, search, record.getEnterpriseId()));
// 查询协作人列表
result.addAll(getMemberOfCollaborator(list, false, search, record.getEnterpriseId()));
return ServiceResponse.success(result); return ServiceResponse.success(result);
} }
...@@ -171,8 +168,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService { ...@@ -171,8 +168,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService {
List<AccountGroupMemberDTO> result = new ArrayList<>(); List<AccountGroupMemberDTO> result = new ArrayList<>();
//查询管理员列表 //查询管理员列表
result.addAll(getMemberOfUser(null, false, search, enterpriseId)); result.addAll(getMemberOfUser(null, false, search, enterpriseId));
// 查询协作人列表
result.addAll(getMemberOfCollaborator(null, false, search, enterpriseId));
return ServiceResponse.success(result); return ServiceResponse.success(result);
} }
...@@ -187,8 +182,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService { ...@@ -187,8 +182,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService {
List<TabSysAccountGroupRel> list = listByAccountGroupId(accountGroupId); List<TabSysAccountGroupRel> list = listByAccountGroupId(accountGroupId);
//查询管理员列表 //查询管理员列表
result.addAll(getMemberOfUser(list, true, search, record.getEnterpriseId())); result.addAll(getMemberOfUser(list, true, search, record.getEnterpriseId()));
// 查询协作人列表
result.addAll(getMemberOfCollaborator(list, true, search, record.getEnterpriseId()));
return ServiceResponse.success(result); return ServiceResponse.success(result);
} }
...@@ -242,14 +235,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService { ...@@ -242,14 +235,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService {
return grouping(userIdList, accountGroupId, enterpriseId, AccountGroupMemberTypeEnum.ADMIN.getCode()); return grouping(userIdList, accountGroupId, enterpriseId, AccountGroupMemberTypeEnum.ADMIN.getCode());
} }
@Transactional(rollbackFor = Exception.class)
@Override
public ServiceResponse<String> groupingOfCollaborator(List<Integer> collaboratorIdList, List<Integer> accountGroupId,
Integer enterpriseId) {
return grouping(collaboratorIdList, accountGroupId, enterpriseId,
AccountGroupMemberTypeEnum.COLLABORATOR.getCode());
}
/** /**
* 查询分组下的组员列表数据 * 查询分组下的组员列表数据
* @param accountGroupId * @param accountGroupId
...@@ -307,34 +292,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService { ...@@ -307,34 +292,6 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService {
return result; return result;
} }
private List<AccountGroupMemberDTO> getMemberOfCollaborator(List<TabSysAccountGroupRel> accountGroupRelList,
boolean isIn, String search, Integer enterpriseId) {
List<Integer> collaboratorIdList = getUserIdList(AccountGroupMemberTypeEnum.COLLABORATOR.getCode(),
accountGroupRelList);
List<TabSysCollaborator> collaboratorList;
if (isIn) {
collaboratorList = collaboratorService.listByCollaboratorIdList(collaboratorIdList);
} else {
collaboratorList = collaboratorService.listNotInCollaboratorIdList(collaboratorIdList, search, enterpriseId);
}
return collaboratorToMember(collaboratorList);
}
private List<AccountGroupMemberDTO> collaboratorToMember(List<TabSysCollaborator> userList) {
List<AccountGroupMemberDTO> result = new ArrayList<>();
if (CollectionUtils.isNotEmpty(userList)) {
for (TabSysCollaborator user : userList) {
AccountGroupMemberDTO dto = new AccountGroupMemberDTO();
dto.setMemberName(user.getCollaboratorName());
dto.setUserId(user.getCollaboratorId());
dto.setPhone(user.getPhone());
dto.setType(AccountGroupMemberTypeEnum.COLLABORATOR.getCode());
result.add(dto);
}
}
return result;
}
private ServiceResponse<String> grouping(List<Integer> userIdList, List<Integer> accountGroupId, Integer enterpriseId, private ServiceResponse<String> grouping(List<Integer> userIdList, List<Integer> accountGroupId, Integer enterpriseId,
int type) { int type) {
//先删除 //先删除
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/CollaboratorApiServiceImpl.java deleted 100644 → 0
package com.gic.auth.service.outer.impl;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.AccountGroupMemberTypeEnum;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.constant.SignConstants;
import com.gic.auth.dto.AppDTO;
import com.gic.auth.dto.CollaboratorDTO;
import com.gic.auth.dto.CollaboratorListDTO;
import com.gic.auth.dto.MenuDTO;
import com.gic.auth.entity.TabSysAccountGroupRel;
import com.gic.auth.entity.TabSysCollaborator;
import com.gic.auth.entity.TabSysCollaboratorRoleRel;
import com.gic.auth.qo.CollaboratorListQO;
import com.gic.auth.service.*;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.dto.EnterpriseDTO;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.EnterpriseApiService;
import com.gic.enterprise.utils.valid.ValidParamsUtils;
import com.gic.open.api.dto.ApplicationDTO;
import com.gic.open.api.service.AppTokenApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
*
* @ClassName: CollaboratorApiServiceImpl
* @Description:
* @author zhiwj
* @date 2020-09-10 9:37
*/
@Service("collaboratorApiService")
public class CollaboratorApiServiceImpl implements CollaboratorApiService {
private static final Logger LOGGER = LogManager.getLogger(CollaboratorApiServiceImpl.class);
@Autowired
private CollaboratorService collaboratorService;
@Autowired
private AppTokenApiService appTokenApiService;
@Autowired
private CollaboratorRoleRelService collaboratorRoleRelService;
@Autowired
private EnterpriseApiService enterpriseApiService;
@Autowired
private AccountGroupRelService accountGroupRelService;
@Autowired
private MenuApiService menuApiService;
@Override
public ServiceResponse<Integer> save(CollaboratorDTO dto) {
//新增参数校验
ServiceResponse paramValid = ValidParamsUtils.allCheckValidate(dto, CollaboratorDTO.SaveValid.class);
if (!paramValid.isSuccess()) {
return paramValid;
}
collaboratorService.save(dto);
return ServiceResponse.success();
}
@Override
public ServiceResponse<Page<CollaboratorListDTO>> page(CollaboratorListQO params) {
if (params.getAccountGroupId() != null) {
//查询分组下的管理员列表
List<TabSysAccountGroupRel> list = accountGroupRelService.listByAccountGroupId(params.getAccountGroupId(),
AccountGroupMemberTypeEnum.COLLABORATOR.getCode());
if (CollectionUtils.isNotEmpty(list)) {
List<Integer> userIdList = new ArrayList<>(list.size());
for (TabSysAccountGroupRel temp : list) {
userIdList.add(temp.getUserId());
}
params.setCollaboratorIdList(userIdList);
}
//如果是空的，则返回空
if (CollectionUtils.isEmpty(params.getCollaboratorIdList())) {
return ServiceResponse.success(new Page<>());
}
}
com.github.pagehelper.Page<CollaboratorListDTO> page = collaboratorService.page(params);
Page<CollaboratorListDTO> resultPage = PageHelperUtils.changePageHelperToCurrentPage(page);
return ServiceResponse.success(resultPage);
}
@Override
public ServiceResponse<List<AppDTO>> listApp(Integer enterpriseId) {
ServiceResponse<List<ApplicationDTO>> appResult = appTokenApiService
.listApplicationByEnterpriseId(Long.valueOf(enterpriseId), null);
if (appResult.isSuccess()) {
List<ApplicationDTO> appList = appResult.getResult();
if (CollectionUtils.isNotEmpty(appList)) {
List<AppDTO> result = new ArrayList<>(appList.size());
for (ApplicationDTO app : appList) {
AppDTO temp = new AppDTO();
temp.setAppId(app.getApplicationId().toString());
temp.setAppName(app.getName());
result.add(temp);
}
return ServiceResponse.success(result);
}
}
return ServiceResponse.success(new ArrayList<>());
}
@Override
public ServiceResponse<CollaboratorDTO> getDetail(Integer collaboratorId) {
TabSysCollaborator record = collaboratorService.getById(collaboratorId);
if (record == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "协作人ID有误，查无数据");
}
CollaboratorDTO result = EntityUtil.changeEntityNew(CollaboratorDTO.class, record);
List<TabSysCollaboratorRoleRel> menuList = collaboratorRoleRelService.listByCollaboratorId(collaboratorId);
if (CollectionUtils.isNotEmpty(menuList)) {
List<Integer> menuIdList = new ArrayList<>(menuList.size());
for (TabSysCollaboratorRoleRel menu : menuList) {
menuIdList.add(menu.getMenuId());
}
result.setMenuIdList(menuIdList);
}
if (StringUtils.isNotBlank(result.getSubAppIds())) {
result.setSubAppIdList(strToList(result.getSubAppIds()));
}
if (StringUtils.isNotBlank(result.getResourceIds())) {
result.setResourceIdList(strToListOfInteger(result.getResourceIds()));
}
ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService
.getEnterpriseById(record.getCollaborationEnterpriseId());
if (enterpriseResult.isSuccess()) {
result.setCollaborationEnterpriseName(enterpriseResult.getResult().getEnterpriseName());
}
return ServiceResponse.success(result);
}
@Transactional(rollbackFor = Exception.class)
@Override
public ServiceResponse<String> auth(String subAppIds, String menuIds, String resourcesIds, Integer collaboratorId) {
TabSysCollaborator record = collaboratorService.getById(collaboratorId);
if (record == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "协作人ID有误，查无数据");
}
CollaboratorDTO dto = new CollaboratorDTO();
//更新资源权限
if (StringUtils.isNotBlank(subAppIds)) {
dto.setSubAppIds(commaToUnderline(subAppIds));
}
if (StringUtils.isNotBlank(resourcesIds)) {
dto.setResourceIds(commaToUnderline(resourcesIds));
}
dto.setCollaboratorId(collaboratorId);
collaboratorService.update(dto);
//更新操作权限
if (StringUtils.isNotBlank(menuIds)) {
String[] menuIdArr = menuIds.split(SignConstants.COMMA);
List<TabSysCollaboratorRoleRel> list = new ArrayList<>(menuIdArr.length);
Date now = new Date();
for (String str : menuIdArr) {
TabSysCollaboratorRoleRel temp = new TabSysCollaboratorRoleRel();
temp.setCollaboratorId(collaboratorId);
temp.setCreateTime(now);
temp.setUpdateTime(now);
temp.setMenuId(Integer.parseInt(str));
temp.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
list.add(temp);
}
collaboratorRoleRelService.deleteByCollaboratorId(collaboratorId);
collaboratorRoleRelService.saveFetch(list);
}
return ServiceResponse.success(record.getCollaboratorName());
}
@Override
public ServiceResponse<Void> cancel(Integer collaboratorId) {
TabSysCollaborator record = collaboratorService.getById(collaboratorId);
if (record == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "协作人ID有误，查无数据");
}
CollaboratorDTO dto = new CollaboratorDTO();
dto.setCollaboratorId(collaboratorId);
dto.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
collaboratorService.update(dto);
return ServiceResponse.success();
}
@Override
public ServiceResponse<List<MenuDTO>> getCollaboratorMenuPage(Integer enterpriseId, String phone, String appId) {
TabSysCollaborator record = collaboratorService.getByPhoneAndAppId(enterpriseId, phone, appId);
if (record == null) {
LOGGER.info("协作人接口getIdByPhoneAndAppId入参数据：{}, {}, {}", enterpriseId, phone, appId);
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数有误，查无数据");
}
List<Integer> menuIdList = null;
List<TabSysCollaboratorRoleRel> menuList = collaboratorRoleRelService.listByCollaboratorId(record.getCollaboratorId());
if (CollectionUtils.isNotEmpty(menuList)) {
menuIdList = new ArrayList<>(menuList.size());
for (TabSysCollaboratorRoleRel menu : menuList) {
menuIdList.add(menu.getMenuId());
}
}
return this.menuApiService.getCollaboratorAppMenuPage(enterpriseId, menuIdList, appId);
}
@Override
public ServiceResponse<List<MenuDTO>> getCollaboratorOperationItem(Integer enterpriseId, String phone, String appId, Integer userId) {
TabSysCollaborator record = collaboratorService.getByPhoneAndAppId(enterpriseId, phone, appId);
if (record == null) {
LOGGER.info("协作人接口getIdByPhoneAndAppId入参数据：{}, {}, {}", enterpriseId, phone, appId);
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数有误，查无数据");
}
List<Integer> menuIdList = null;
List<TabSysCollaboratorRoleRel> menuList = collaboratorRoleRelService.listByCollaboratorId(record.getCollaboratorId());
if (CollectionUtils.isNotEmpty(menuList)) {
menuIdList = new ArrayList<>(menuList.size());
for (TabSysCollaboratorRoleRel menu : menuList) {
menuIdList.add(menu.getMenuId());
}
}
return menuApiService.getCollaboratorAppOperationItem(menuIdList, appId, userId);
}
@Override
public ServiceResponse<Integer> getIdByPhoneAndAppId(Integer enterpriseId, String phone, String appId) {
TabSysCollaborator record = collaboratorService.getByPhoneAndAppId(enterpriseId, phone, appId);
if (record == null) {
LOGGER.info("协作人接口getIdByPhoneAndAppId入参数据：{}, {}, {}", enterpriseId, phone, appId);
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数有误，查无数据");
}
return ServiceResponse.success(record.getCollaboratorId());
}
@Override
public ServiceResponse<Void> deleteByPhoneAndAppId(Integer enterpriseId, String phone, String appId) {
LOGGER.info("协作人接口deleteByPhoneAndAppId入参数据：{}, {}, {}", enterpriseId, phone, appId);
TabSysCollaborator record = collaboratorService.getByPhoneAndAppId(enterpriseId, phone, appId);
if (record == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "参数有误，查无数据");
}
collaboratorService.deleteByPhoneAndAppId(enterpriseId, phone, appId);
return ServiceResponse.success();
}
/**
* 英文逗号隔开的字符串转为下划线隔开
* @param string
* @return
*/
private static String commaToUnderline(String string) {
String[] strArr = string.split(SignConstants.COMMA);
StringBuilder sb = new StringBuilder(SignConstants.UNDERLINE);
for (String str : strArr) {
sb.append(str).append(SignConstants.UNDERLINE);
}
return sb.toString();
}
private static List<String> strToList(String string) {
String[] strArr = string.split(SignConstants.UNDERLINE);
List<String> list = new ArrayList<>(strArr.length);
for (String str : strArr) {
list.add(str);
}
return list;
}
private static List<Integer> strToListOfInteger(String string) {
String[] strArr = string.split(SignConstants.UNDERLINE);
List<Integer> list = new ArrayList<>(strArr.length);
for (String str : strArr) {
if (StringUtils.isBlank(str)) {
continue;
}
list.add(Integer.parseInt(str));
}
return list;
}
}
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java
package com.gic.auth.service.outer.impl; package com.gic.auth.service.outer.impl;
import java.util.*;
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.*; import com.gic.auth.constant.*;
import com.gic.auth.dto.UserDTO;
import com.gic.auth.dto.*; import com.gic.auth.dto.*;
import com.gic.auth.dto.UserDTO;
import com.gic.auth.entity.*; import com.gic.auth.entity.*;
import com.gic.auth.qo.AuthItemSaveQO; import com.gic.auth.qo.AuthItemSaveQO;
import com.gic.auth.qo.MenuListQO; import com.gic.auth.qo.MenuListQO;
...@@ -30,18 +42,6 @@ import com.gic.open.api.dto.*; ...@@ -30,18 +42,6 @@ import com.gic.open.api.dto.*;
import com.gic.open.api.service.AppTokenApiService; import com.gic.open.api.service.AppTokenApiService;
import com.gic.open.api.service.ApplicationApiService; import com.gic.open.api.service.ApplicationApiService;
import com.gic.open.api.service.ServeApiService; import com.gic.open.api.service.ServeApiService;
import com.gic.redis.data.util.RedisUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* *
...@@ -166,16 +166,6 @@ public class MenuApiServiceImpl implements MenuApiService { ...@@ -166,16 +166,6 @@ public class MenuApiServiceImpl implements MenuApiService {
} }
@Override @Override
public ServiceResponse<List<MenuDTO>> getCollaboratorAppMenuPage(Integer enterpriseId, List<Integer> menuIdList, String appId) {
return getAppMenuPage(enterpriseId, menuIdList, appId);
}
@Override
public ServiceResponse<List<MenuDTO>> getCollaboratorAppOperationItem(List<Integer> menuIdList, String appId, Integer userId) {
return getAppNoAuthOperationItem(menuIdList, appId, userId);
}
@Override
public ServiceResponse<List<MenuDTO>> getUserMenuOfApp(Integer enterpriseId, Integer userId, Integer currentMenu, public ServiceResponse<List<MenuDTO>> getUserMenuOfApp(Integer enterpriseId, Integer userId, Integer currentMenu,
String versionCode) { String versionCode) {
return getUserLoginMenu(new UserMenuQO() return getUserLoginMenu(new UserMenuQO()
......
gic-platform-auth-service/src/main/resources/dubbo-gic-platform-auth-service.xml
...@@ -43,8 +43,6 @@ ...@@ -43,8 +43,6 @@
</dubbo:reference> </dubbo:reference>
<!--账号分组--> <!--账号分组-->
<dubbo:service interface="com.gic.auth.service.AccountGroupApiService" ref="accountGroupApiService" timeout="6000" /> <dubbo:service interface="com.gic.auth.service.AccountGroupApiService" ref="accountGroupApiService" timeout="6000" />
<!--协作人-->
<dubbo:service interface="com.gic.auth.service.CollaboratorApiService" ref="collaboratorApiService" timeout="6000" />
<!--运营个管理员--> <!--运营个管理员-->
<dubbo:service interface="com.gic.auth.service.OperationUserApiService" ref="operationUserApiService" timeout="6000" /> <dubbo:service interface="com.gic.auth.service.OperationUserApiService" ref="operationUserApiService" timeout="6000" />
<dubbo:service interface="com.gic.auth.service.ResourceOpenApiService" ref="resourceOpenApiService" timeout="6000" /> <dubbo:service interface="com.gic.auth.service.ResourceOpenApiService" ref="resourceOpenApiService" timeout="6000" />
......
gic-platform-auth-service/src/main/resources/mapper/TabSysCollaboratorMapper.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.auth.dao.mapper.TabSysCollaboratorMapper">
<resultMap id="BaseResultMap" type="com.gic.auth.entity.TabSysCollaborator">
<id column="collaborator_id" jdbcType="INTEGER" property="collaboratorId" />
<result column="collaborator_name" jdbcType="VARCHAR" property="collaboratorName" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="collaboration_enterprise_id" jdbcType="INTEGER" property="collaborationEnterpriseId" />
<result column="phone" jdbcType="VARCHAR" property="phone" />
<result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="app_name" jdbcType="VARCHAR" property="appName" />
<result column="creator" jdbcType="VARCHAR" property="creator" />
<result column="resource_ids" jdbcType="VARCHAR" property="resourceIds" />
<result column="sub_app_ids" jdbcType="VARCHAR" property="subAppIds" />
<result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
collaborator_id, collaborator_name, enterprise_id, collaboration_enterprise_id, phone,
app_id, app_name, creator, resource_ids, sub_app_ids, delete_flag, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_sys_collaborator
where collaborator_id = #{collaboratorId,jdbcType=INTEGER}
</select>
<insert id="insert" parameterType="com.gic.auth.entity.TabSysCollaborator">
insert into tab_sys_collaborator (collaborator_id, collaborator_name,
enterprise_id, collaboration_enterprise_id,
phone, app_id, app_name,
creator, resource_ids, sub_app_ids, delete_flag,
create_time, update_time)
values (#{collaboratorId,jdbcType=INTEGER}, #{collaboratorName,jdbcType=VARCHAR},
#{enterpriseId,jdbcType=INTEGER}, #{collaborationEnterpriseId,jdbcType=INTEGER},
#{phone,jdbcType=VARCHAR}, #{appId,jdbcType=VARCHAR}, #{appName,jdbcType=VARCHAR},
#{creator,jdbcType=VARCHAR}, #{resourceIds,jdbcType=VARCHAR}, #{subAppIds,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.auth.entity.TabSysCollaborator" useGeneratedKeys="true" keyProperty="collaboratorId">
insert into tab_sys_collaborator
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="collaboratorId != null">
collaborator_id,
</if>
<if test="collaboratorName != null">
collaborator_name,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="collaborationEnterpriseId != null">
collaboration_enterprise_id,
</if>
<if test="phone != null">
phone,
</if>
<if test="appId != null">
app_id,
</if>
<if test="appName != null">
app_name,
</if>
<if test="creator != null">
creator,
</if>
<if test="resourceIds != null">
resource_ids,
</if>
<if test="subAppIds != null">
sub_app_ids,
</if>
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="collaboratorId != null">
#{collaboratorId,jdbcType=INTEGER},
</if>
<if test="collaboratorName != null">
#{collaboratorName,jdbcType=VARCHAR},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="collaborationEnterpriseId != null">
#{collaborationEnterpriseId,jdbcType=INTEGER},
</if>
<if test="phone != null">
#{phone,jdbcType=VARCHAR},
</if>
<if test="appId != null">
#{appId,jdbcType=VARCHAR},
</if>
<if test="appName != null">
#{appName,jdbcType=VARCHAR},
</if>
<if test="creator != null">
#{creator,jdbcType=VARCHAR},
</if>
<if test="resourceIds != null">
#{resourceIds,jdbcType=VARCHAR},
</if>
<if test="subAppIds != null">
#{subAppIds,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.auth.entity.TabSysCollaborator">
update tab_sys_collaborator
<set>
<if test="collaboratorName != null">
collaborator_name = #{collaboratorName,jdbcType=VARCHAR},
</if>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="collaborationEnterpriseId != null">
collaboration_enterprise_id = #{collaborationEnterpriseId,jdbcType=INTEGER},
</if>
<if test="phone != null">
phone = #{phone,jdbcType=VARCHAR},
</if>
<if test="appId != null">
app_id = #{appId,jdbcType=VARCHAR},
</if>
<if test="appName != null">
app_name = #{appName,jdbcType=VARCHAR},
</if>
<if test="creator != null">
creator = #{creator,jdbcType=VARCHAR},
</if>
<if test="resourceIds != null">
resource_ids = #{resourceIds,jdbcType=VARCHAR},
</if>
<if test="subAppIds != null">
sub_app_ids = #{subAppIds,jdbcType=VARCHAR},
</if>
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where collaborator_id = #{collaboratorId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.auth.entity.TabSysCollaborator">
update tab_sys_collaborator
set collaborator_name = #{collaboratorName,jdbcType=VARCHAR},
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
collaboration_enterprise_id = #{collaborationEnterpriseId,jdbcType=INTEGER},
phone = #{phone,jdbcType=VARCHAR},
app_id = #{appId,jdbcType=VARCHAR},
app_name = #{appName,jdbcType=VARCHAR},
creator = #{creator,jdbcType=VARCHAR},
resource_ids = #{resourceIds,jdbcType=VARCHAR},
sub_app_ids = #{subAppIds,jdbcType=VARCHAR},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where collaborator_id = #{collaboratorId,jdbcType=INTEGER}
</update>
<select id="list" parameterType="com.gic.auth.qo.CollaboratorListQO" resultType="com.gic.auth.dto.CollaboratorListDTO">
select
a.collaborator_id collaboratorId,
a.collaborator_name collaboratorName,
a.enterprise_id enterpriseId,
a.collaboration_enterprise_id collaborationEnterpriseId,
b.enterprise_name collaborationEnterpriseName,
a.phone phone,
a.app_id appId,
a.app_name appName,
a.creator,
a.delete_flag deleteFlag,
a.create_time createTime
from tab_sys_collaborator a
left join tab_enterprise b on a.collaboration_enterprise_id = b.enterprise_id
where a.enterprise_id = #{enterpriseId}
<if test="search != null and search != '' ">
and (a.collaborator_name like concat('%', #{search}, '%') or a.phone like concat('%', #{search}, '%') or b.enterprise_name like concat('%', #{search}, '%') )
</if>
<if test="appId != null and appId != '' ">
and a.app_id in (${appId})
</if>
<if test="deleteFlag != null">
and a.delete_flag = #{deleteFlag}
</if>
<if test="collaboratorIdList != null and collaboratorIdList.size() > 0">
and a.collaborator_id in
<foreach collection="collaboratorIdList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="listByCollaboratorIdList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
from tab_sys_collaborator
where 1=1
<if test="list != null and list.size() &gt; 0">
and collaborator_id in
<foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
#{item}
</foreach>
</if>
</select>
<select id="listNotInCollaboratorIdList" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" />
from tab_sys_collaborator
where enterprise_id = #{enterpriseId}
<if test="list != null and list.size() &gt; 0">
and collaborator_id not in
<foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
#{item}
</foreach>
</if>
<if test="search != null and search != '' ">
and ( collaborator_name like concat('%', #{search}, '%') or phone like concat('%', #{search}, '%') )
</if>
</select>
<select id="getByPhoneAndAppId" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from
tab_sys_collaborator
where collaboration_enterprise_id = #{enterpriseId}
and phone = #{phone}
and app_id = #{appId}
and delete_flag != ${@com.gic.auth.constant.DeleteFlagConstants@DELETE_STATUS}
limit 1
</select>
<update id="deleteByPhoneAndAppId">
update tab_sys_collaborator set delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@DELETE_STATUS}, update_time = now()
where collaboration_enterprise_id = #{enterpriseId}
and phone = #{phone}
and app_id = #{appId}
and delete_flag != ${@com.gic.auth.constant.DeleteFlagConstants@DELETE_STATUS}
</update>
</mapper>
\ No newline at end of file
gic-platform-auth-service/src/main/resources/mapper/TabSysCollaboratorRoleRelMapper.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.auth.dao.mapper.TabSysCollaboratorRoleRelMapper">
<resultMap id="BaseResultMap" type="com.gic.auth.entity.TabSysCollaboratorRoleRel">
<id column="collaborator_role_rel_id" jdbcType="INTEGER" property="collaboratorRoleRelId" />
<result column="collaborator_id" jdbcType="INTEGER" property="collaboratorId" />
<result column="menu_id" jdbcType="INTEGER" property="menuId" />
<result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
collaborator_role_rel_id, collaborator_id, menu_id, delete_flag, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_sys_collaborator_role_rel
where collaborator_role_rel_id = #{collaboratorRoleRelId,jdbcType=INTEGER}
</select>
<insert id="insert" parameterType="com.gic.auth.entity.TabSysCollaboratorRoleRel">
insert into tab_sys_collaborator_role_rel (collaborator_role_rel_id, collaborator_id,
menu_id, delete_flag, create_time,
update_time)
values (#{collaboratorRoleRelId,jdbcType=INTEGER}, #{collaboratorId,jdbcType=INTEGER},
#{menuId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.auth.entity.TabSysCollaboratorRoleRel">
insert into tab_sys_collaborator_role_rel
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="collaboratorRoleRelId != null">
collaborator_role_rel_id,
</if>
<if test="collaboratorId != null">
collaborator_id,
</if>
<if test="menuId != null">
menu_id,
</if>
<if test="deleteFlag != null">
delete_flag,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="collaboratorRoleRelId != null">
#{collaboratorRoleRelId,jdbcType=INTEGER},
</if>
<if test="collaboratorId != null">
#{collaboratorId,jdbcType=INTEGER},
</if>
<if test="menuId != null">
#{menuId,jdbcType=INTEGER},
</if>
<if test="deleteFlag != null">
#{deleteFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.auth.entity.TabSysCollaboratorRoleRel">
update tab_sys_collaborator_role_rel
<set>
<if test="collaboratorId != null">
collaborator_id = #{collaboratorId,jdbcType=INTEGER},
</if>
<if test="menuId != null">
menu_id = #{menuId,jdbcType=INTEGER},
</if>
<if test="deleteFlag != null">
delete_flag = #{deleteFlag,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where collaborator_role_rel_id = #{collaboratorRoleRelId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.auth.entity.TabSysCollaboratorRoleRel">
update tab_sys_collaborator_role_rel
set collaborator_id = #{collaboratorId,jdbcType=INTEGER},
menu_id = #{menuId,jdbcType=INTEGER},
delete_flag = #{deleteFlag,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where collaborator_role_rel_id = #{collaboratorRoleRelId,jdbcType=INTEGER}
</update>
<insert id="saveFetch" parameterType="java.util.List">
insert into tab_sys_collaborator_role_rel (collaborator_role_rel_id, collaborator_id,
menu_id, delete_flag, create_time,
update_time)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(
#{item.collaboratorRoleRelId},
#{item.collaboratorId},
#{item.menuId},
#{item.deleteFlag},
#{item.createTime},
#{item.updateTime}
)
</foreach>
</insert>
<update id="deleteByCollaboratorId">
update tab_sys_collaborator_role_rel set delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@DELETE_STATUS}
where delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
and collaborator_id = #{collaboratorId}
</update>
<select id="listByCollaboratorId" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"></include>
from tab_sys_collaborator_role_rel
where delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
and collaborator_id = #{collaboratorId}
</select>
</mapper>
\ No newline at end of file
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/AccountGroupController.java
package com.gic.auth.web.controller; package com.gic.auth.web.controller;
import java.util.ArrayList;
import java.util.List;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.AccountGroupMemberTypeEnum; import com.gic.auth.constant.AccountGroupMemberTypeEnum;
import com.gic.auth.constant.SignConstants; import com.gic.auth.constant.SignConstants;
import com.gic.auth.dto.*; import com.gic.auth.dto.AccountGroupDTO;
import com.gic.auth.qo.CollaboratorListQO; import com.gic.auth.dto.AccountGroupMemberDTO;
import com.gic.auth.dto.UserDTO;
import com.gic.auth.dto.UserListDTO;
import com.gic.auth.qo.UserListQO; import com.gic.auth.qo.UserListQO;
import com.gic.auth.service.AccountGroupApiService; import com.gic.auth.service.AccountGroupApiService;
import com.gic.auth.service.CollaboratorApiService;
import com.gic.auth.service.UserApiService; import com.gic.auth.service.UserApiService;
import com.gic.auth.web.vo.AccountGroupListVO; import com.gic.auth.web.vo.AccountGroupListVO;
import com.gic.auth.web.vo.UnionEnterpriseAccountGroupListVO; import com.gic.auth.web.vo.UnionEnterpriseAccountGroupListVO;
...@@ -19,22 +35,8 @@ import com.gic.download.utils.OperationResultUtils; ...@@ -19,22 +35,8 @@ import com.gic.download.utils.OperationResultUtils;
import com.gic.enterprise.dto.EnterpriseDTO; import com.gic.enterprise.dto.EnterpriseDTO;
import com.gic.enterprise.error.ErrorCode; import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.EnterpriseApiService; import com.gic.enterprise.service.EnterpriseApiService;
import com.gic.enterprise.service.UnionEnterpriseAuthApiService;
import com.gic.enterprise.utils.ResultControllerUtils; import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils; import com.gic.enterprise.utils.UserDetailUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.List;
/** /**
* *
...@@ -51,12 +53,8 @@ public class AccountGroupController { ...@@ -51,12 +53,8 @@ public class AccountGroupController {
@Autowired @Autowired
private AccountGroupApiService accountGroupApiService; private AccountGroupApiService accountGroupApiService;
@Autowired @Autowired
private CollaboratorApiService collaboratorApiService;
@Autowired
private UserApiService userApiService; private UserApiService userApiService;
@Autowired @Autowired
private UnionEnterpriseAuthApiService unionEnterpriseAuthApiService;
@Autowired
private EnterpriseApiService enterpriseApiService; private EnterpriseApiService enterpriseApiService;
/** /**
...@@ -218,11 +216,6 @@ public class AccountGroupController { ...@@ -218,11 +216,6 @@ public class AccountGroupController {
enterpriseId); enterpriseId);
String operationObject = result.isSuccess() ? result.getResult() : null; String operationObject = result.isSuccess() ? result.getResult() : null;
return OperationResultUtils.operationResult(result, "账号分组批量分组组员", operationObject); return OperationResultUtils.operationResult(result, "账号分组批量分组组员", operationObject);
} else if (type.intValue() == AccountGroupMemberTypeEnum.COLLABORATOR.getCode()) {
ServiceResponse<String> result = accountGroupApiService.groupingOfCollaborator(userIdList,
accountGroupIdList, enterpriseId);
String operationObject = result.isSuccess() ? result.getResult() : null;
return OperationResultUtils.operationResult(result, "账号分组批量分组组员", operationObject);
} }
return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "组员类型错误"); return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "组员类型错误");
} }
......
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/CollaboratorController.java deleted 100644 → 0
package com.gic.auth.web.controller;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.MenuLevelConstants;
import com.gic.auth.constant.MenuProjectConstants;
import com.gic.auth.dto.CollaboratorListDTO;
import com.gic.auth.dto.MenuDTO;
import com.gic.auth.qo.CollaboratorListQO;
import com.gic.auth.qo.MenuListQO;
import com.gic.auth.service.CollaboratorApiService;
import com.gic.auth.service.MenuApiService;
import com.gic.auth.web.vo.CollaboratorDetailVO;
import com.gic.commons.util.DateUtil;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.download.utils.*;
import com.gic.download.utils.log.LogUtils;
import com.gic.enterprise.context.RequestContext;
import com.gic.enterprise.response.EnterpriseRestResponse;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetail;
import com.gic.enterprise.utils.UserDetailUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
/**
*
* @ClassName: CollaboratorController
* @Description:
* @author zhiwj
* @date 2020-09-10 10:01
*/
@RestController
@RequestMapping("/collaborator")
public class CollaboratorController extends DownloadUtils{
private static final Logger LOGGER = LogManager.getLogger(CollaboratorController.class);
@Autowired
private CollaboratorApiService collaboratorApiService;
@Autowired
private MenuApiService menuApiService;
private static final Integer PAGE_NUM_TEST = 2;
@RequestMapping("/list")
public RestResponse list(CollaboratorListQO params) {
params.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
return ResultControllerUtils.commonResult(collaboratorApiService.page(params));
}
@RequestMapping("/list-app")
public RestResponse listApp() {
return ResultControllerUtils
.commonResult(collaboratorApiService.listApp(UserDetailUtils.getUserDetail().getEnterpriseId()));
}
@RequestMapping("/download-test")
public RestResponse downloadTest(CollaboratorListQO params, HttpServletRequest request, Integer excelExtensionCode) throws Exception {
UserDetail userDetail = UserDetailUtils.getUserDetail();
params.setEnterpriseId(userDetail.getEnterpriseId());
//查询totalCount
ServiceResponse<Page<CollaboratorListDTO>> result = collaboratorApiService.page(params);
String fileName = "北丐测试";
//生成报表中心记录
DownloadReport report = new DownloadReport();
report.setApplyUserId(userDetail.getUserInfo().getUserId());
report.setDataContent("北丐-测试");
report.setDataCount(result.getResult().getTotalCount());
report.setDataType(2);
//只适用于对接gic的登录拦截模块
report.setDataUrl((String) request.getAttribute("moduleMenuUrl"));
LOGGER.info("下载测试：{}", JSON.toJSONString(RequestContext.getContext().getRequest().getAttributeNames()));
report.setEnterpriseId(userDetail.getEnterpriseId());
report.setFileName(fileName);
report.setReportEndTime(DateUtil.strToDate("2019-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss"));
report.setReportStartTime(DateUtil.strToDate("2018-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss"));
Integer reportId = DataDownloadUtils.createDownloadReport(report);
//临时路径
String path = request.getSession().getServletContext().getRealPath("/excel/csv/collaborator/file/");
return RestResponse.success(reportId);
}
@RequestMapping("/get-detail")
public RestResponse getDetail(Integer collaboratorId) {
LogUtils.createLog("获取协作人明细", "北丐测试");
return ResultControllerUtils.commonResultOne(
collaboratorApiService.getDetail(collaboratorId), CollaboratorDetailVO.class);
}
/**
* 授权：操作授权、资源授权
* @Title: auth

* @Description:

 * @author guojuxing
* @param collaboratorId

* @return com.gic.commons.webapi.reponse.RestResponse


 */
@RequestMapping("/auth")
public RestResponse auth(String subAppIds, String menuIds, String resourceIds, Integer collaboratorId) {
ServiceResponse<String> result = collaboratorApiService.auth(subAppIds, menuIds, resourceIds, collaboratorId);
String operationObject = result.isSuccess() ? result.getResult() : null;
return OperationResultUtils.operationResult(result, "协作人授权", operationObject);
}
@RequestMapping("/app-menu-tree")
public RestResponse appMenuTree(String appId) {
MenuListQO params = new MenuListQO();
params.setProject(appId);
params.setIsGIC(MenuProjectConstants.APP_PROJECT_CODE);
//普通管理员
params.setAuthTypeList(Arrays.asList(1));
ServiceResponse<List<MenuDTO>> appMenuList = menuApiService.listMenuTree(params);
if (appMenuList.isSuccess()) {
return RestResponse.success(changePageListToTree(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, appMenuList.getResult()));
}
return EnterpriseRestResponse.failure(appMenuList);
}
public static List<Map<String, Object>> changePageListToTree(int storeGroupId, List<MenuDTO> list) {
List<Map<String, Object>> result = new ArrayList<>();
if (list != null) {
for (int j = 0, length = list.size(); j < length; j++) {
MenuDTO menuDTO = list.get(j);
if (storeGroupId == menuDTO.getParentId()) {
Map<String, Object> data = new HashMap<>(16);
data.put("menuId", menuDTO.getMenuId());
data.put("menuName", menuDTO.getMenuName());
data.put("menuCode", menuDTO.getMenuCode());
data.put("parentCode", menuDTO.getParentCode());
data.put("parentId", menuDTO.getParentId());
List<Map<String, Object>> children = changePageListToTree(menuDTO.getMenuId(), list);
if (children == null || children.size() < 1) {
data.put("children", null);
} else {
data.put("children", children);
}
result.add(data);
}
}
}
return result;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/MenuController.java
package com.gic.auth.web.controller; package com.gic.auth.web.controller;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.MenuLevelConstants; import com.gic.auth.constant.MenuLevelConstants;
import com.gic.auth.dto.MenuDTO; import com.gic.auth.dto.MenuDTO;
import com.gic.auth.service.CollaboratorApiService;
import com.gic.auth.service.MenuApiService; import com.gic.auth.service.MenuApiService;
import com.gic.auth.service.MenuItemApiService; import com.gic.auth.service.MenuItemApiService;
import com.gic.auth.service.UserApiService; import com.gic.auth.service.UserApiService;
...@@ -23,18 +35,6 @@ import com.gic.enterprise.utils.UserDetailUtils; ...@@ -23,18 +35,6 @@ import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.log.api.dto.LogSearchDTO; import com.gic.log.api.dto.LogSearchDTO;
import com.gic.log.api.dto.SystemSetLogDTO; import com.gic.log.api.dto.SystemSetLogDTO;
import com.gic.log.api.service.LogApiService; import com.gic.log.api.service.LogApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* *
* @ClassName: MenuController * @ClassName: MenuController
...@@ -51,8 +51,6 @@ public class MenuController { ...@@ -51,8 +51,6 @@ public class MenuController {
@Autowired @Autowired
private MenuItemApiService menuItemApiService; private MenuItemApiService menuItemApiService;
@Autowired @Autowired
private CollaboratorApiService collaboratorApiService;
@Autowired
private LogApiService logApiService; private LogApiService logApiService;
@Autowired @Autowired
private UserApiService userApiService; private UserApiService userApiService;
...@@ -138,29 +136,6 @@ public class MenuController { ...@@ -138,29 +136,6 @@ public class MenuController {
return ResultControllerUtils.commonResult(response); return ResultControllerUtils.commonResult(response);
} }
@RequestMapping("login-collaborator-menu-of-app")
public RestResponse getCollaboratorMenu(String appId, String menuCode) {
LOGGER.info("查询登录用户的协作应用的菜单参数：{}-{}", appId, menuCode);
UserDetail userDetail = UserDetailUtils.getUserDetail();
appId = getAppId(appId, menuCode);
ServiceResponse<List<MenuDTO>> userMenu = this.collaboratorApiService.getCollaboratorMenuPage(
userDetail.getEnterpriseId(), userDetail.getUserInfo().getPhoneNumber(), appId);
if (userMenu.isSuccess()) {
return RestResponse.success(userMenu.getResult());
}
return EnterpriseRestResponse.failure(userMenu);
}
@RequestMapping("login-collaborator-operation-item")
public RestResponse getCollaboratorOperationItem(String appId, String menuCode) {
LOGGER.info("查询登录用户的协作应用的操作项参数：{}-{}", appId, menuCode);
UserDetail userDetail = UserDetailUtils.getUserDetail();
appId = getAppId(appId, menuCode);
ServiceResponse<List<MenuDTO>> userMenu = this.collaboratorApiService.getCollaboratorOperationItem(
userDetail.getEnterpriseId(), userDetail.getUserInfo().getPhoneNumber(), appId, userDetail.getUserId());
return ResultControllerUtils.commonResult(userMenu, UserOperationItemAuthVO.class);
}
/** /**
* 登陆用户没有权限的操作项列表数据（gic） * 登陆用户没有权限的操作项列表数据（gic）
* @Title: loginUserOperationItem
 * @Title: loginUserOperationItem

......
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/CollaboratorDetailVO.java deleted 100644 → 0
package com.gic.auth.web.vo;
import java.io.Serializable;
import java.util.List;
/**
* 协作人详情
* @ClassName: CollaboratorDetailVO

* @Description: 

* @author guojuxing

* @date 2019/11/4 3:29 PM

*/
public class CollaboratorDetailVO implements Serializable{
private static final long serialVersionUID = -3869612411018633754L;
/**
* ID
*/
private Integer collaboratorId;
private String collaboratorName;
private String collaborationEnterpriseName;
private String phone;
private String appId;
private String appName;
private List<String> subAppIdList;
private List<Integer> menuIdList;
private List<Integer> resourceIdList;
public Integer getCollaboratorId() {
return collaboratorId;
}
public void setCollaboratorId(Integer collaboratorId) {
this.collaboratorId = collaboratorId;
}
public String getCollaboratorName() {
return collaboratorName;
}
public void setCollaboratorName(String collaboratorName) {
this.collaboratorName = collaboratorName;
}
public String getCollaborationEnterpriseName() {
return collaborationEnterpriseName;
}
public void setCollaborationEnterpriseName(String collaborationEnterpriseName) {
this.collaborationEnterpriseName = collaborationEnterpriseName;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
public List<String> getSubAppIdList() {
return subAppIdList;
}
public void setSubAppIdList(List<String> subAppIdList) {
this.subAppIdList = subAppIdList;
}
public List<Integer> getMenuIdList() {
return menuIdList;
}
public void setMenuIdList(List<Integer> menuIdList) {
this.menuIdList = menuIdList;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public List<Integer> getResourceIdList() {
return resourceIdList;
}
public void setResourceIdList(List<Integer> resourceIdList) {
this.resourceIdList = resourceIdList;
}
@Override
public String toString() {
return "CollaboratorDetailVO{" +
"collaboratorId=" + collaboratorId +
", collaboratorName='" + collaboratorName + '\'' +
", collaborationEnterpriseName='" + collaborationEnterpriseName + '\'' +
", phone='" + phone + '\'' +
", appId='" + appId + '\'' +
", appName='" + appName + '\'' +
", subAppIdList=" + subAppIdList +
", menuIdList=" + menuIdList +
", resourceIdList=" + resourceIdList +
'}';
}
}
gic-platform-auth-web/src/main/resources/dubbo-gic-platform-auth-web.xml
...@@ -55,8 +55,6 @@ ...@@ -55,8 +55,6 @@
<dubbo:reference interface="com.gic.goods.api.service.GoodsRightsSelectorApiService" id="goodsRightsSelectorApiService" timeout="60000" retries="0" /> <dubbo:reference interface="com.gic.goods.api.service.GoodsRightsSelectorApiService" id="goodsRightsSelectorApiService" timeout="60000" retries="0" />
<!--账号分组--> <!--账号分组-->
<dubbo:reference interface="com.gic.auth.service.AccountGroupApiService" id="accountGroupApiService" timeout="6000" /> <dubbo:reference interface="com.gic.auth.service.AccountGroupApiService" id="accountGroupApiService" timeout="6000" />
<!--协作人-->
<dubbo:reference interface="com.gic.auth.service.CollaboratorApiService" id="collaboratorApiService" timeout="6000" />
<!--短信签名--> <!--短信签名-->
<dubbo:reference interface="com.gic.marketing.api.service.sms.SmsApiService" id="smsApiService" timeout="6000" /> <dubbo:reference interface="com.gic.marketing.api.service.sms.SmsApiService" id="smsApiService" timeout="6000" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment