Skip to content

G
gic-platform-auth
Commit b2ad3e12 by 陶光胜
Options

Merge branch 'developer' of… 

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer
parents 85ed977c 99e012ce
Showing with 359 additions and 123 deletions
gic-platform-auth-api/src/main/java/com/gic/auth/dto/CollaboratorDTO.java
......@@ -73,6 +73,11 @@ public class CollaboratorDTO implements Serializable{
private String creator;
/**
* 资源组ids，可以多选，_隔开，类似_1_2_'
*/
private String resourceIds;
/**
* 子应用ids，可以多选，用_隔开_2_3_
*/
private String subAppIds;
......@@ -96,6 +101,8 @@ public class CollaboratorDTO implements Serializable{
private List<Integer> menuIdList;
private List<Integer> resourceIdList;
public Integer getCollaboratorId() {
return collaboratorId;
}
......@@ -215,4 +222,20 @@ public class CollaboratorDTO implements Serializable{
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;
}
}
gic-platform-auth-api/src/main/java/com/gic/auth/service/AccountGroupApiService.java
......@@ -78,6 +78,16 @@ public interface AccountGroupApiService {
ServiceResponse<Void> sort(Integer accountGroupId, Integer sort);
/**
* 根据分组ID查询分组内的组员，给会员组使用的接口
* @Title: listAccountGroupMemberByAccountGroupId

* @Description:

 * @author guojuxing
* @param accountGroupIdList

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


 */
ServiceResponse<List<AccountGroupMemberDTO>> listAccountGroupMemberByAccountGroupId(List<Integer> accountGroupIdList);
/**
* 查询不在对应账号分组内的所有组员
* @Title: listNotInAccountGroupByAccountGroupId

* @Description:
......
gic-platform-auth-api/src/main/java/com/gic/auth/service/CollaboratorApiService.java
......@@ -76,10 +76,11 @@ public interface CollaboratorApiService {

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


 */
ServiceResponse<Void> auth(String subAppIds, String menuIds, Integer collaboratorId);
ServiceResponse<Void> auth(String subAppIds, String menuIds, String resourcesIds, Integer collaboratorId);
/**
* 取消
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysAccountGroupRelMapper.java
......@@ -122,4 +122,6 @@ public interface TabSysAccountGroupRelMapper {
List<TabSysAccountGroupRel> listByAccountGroupId(@Param("accountGroupId") Integer accountGroupId, @Param("type") Integer type);
List<AccountGroupListDTO> groupByAccountGroupId(@Param("list") List<Integer> accountGroupId);
List<TabSysAccountGroupRel> listByAccountGroupIdList(@Param("list") List<Integer> accountGroupIdList, @Param("type") Integer type);
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysCollaborator.java
......@@ -47,6 +47,11 @@ public class TabSysCollaborator {
private String creator;
/**
* 资源组ids，可以多选，_隔开，类似_1_2_'
*/
private String resourceIds;
/**
* 子应用ids，可以多选，用_隔开_2_3_
*/
private String subAppIds;
......@@ -161,4 +166,12 @@ public class TabSysCollaborator {
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/service/AccountGroupRelService.java
......@@ -80,6 +80,8 @@ public interface AccountGroupRelService {

 */
List<TabSysAccountGroupRel> listByAccountGroupId(Integer accountGroupId);
List<TabSysAccountGroupRel> listByAccountGroupId(List<Integer> accountGroupIdList, Integer type);
List<TabSysAccountGroupRel> listByAccountGroupId(Integer accountGroupId, Integer type);
/**
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/AccountGroupRelServiceImpl.java
......@@ -67,6 +67,11 @@ public class AccountGroupRelServiceImpl implements AccountGroupRelService{
}
@Override
public List<TabSysAccountGroupRel> listByAccountGroupId(List<Integer> accountGroupIdList, Integer type) {
return tabSysAccountGroupRelMapper.listByAccountGroupIdList(accountGroupIdList, type);
}
@Override
public List<TabSysAccountGroupRel> listByAccountGroupId(Integer accountGroupId, Integer type) {
return tabSysAccountGroupRelMapper.listByAccountGroupId(accountGroupId, type);
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/AccountGroupApiServiceImpl.java
......@@ -133,6 +133,17 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService {
}
@Override
public ServiceResponse<List<AccountGroupMemberDTO>> listAccountGroupMemberByAccountGroupId(List<Integer> accountGroupIdList) {
List<AccountGroupMemberDTO> result = new ArrayList<>();
List<TabSysAccountGroupRel> list = accountGroupRelService.listByAccountGroupId(accountGroupIdList, null);
//查询管理员列表
result.addAll(getMemberOfUser(list, true, null, null));
// 查询协作人列表
result.addAll(getMemberOfCollaborator(list, true, null, null));
return ServiceResponse.success(result);
}
@Override
public ServiceResponse<List<AccountGroupMemberDTO>> listNotInAccountGroupByAccountGroupId(Integer accountGroupId,
String search) {
TabSysAccountGroup record = accountGroupService.getById(accountGroupId);
......@@ -144,7 +155,7 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService {
//查询管理员列表
result.addAll(getMemberOfUser(list, false, search, record.getEnterpriseId()));
// 查询协作人列表
result.addAll(getMemberOfCollaborator(list, true, search, record.getEnterpriseId()));
result.addAll(getMemberOfCollaborator(list, false, search, record.getEnterpriseId()));
return ServiceResponse.success(result);
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/CollaboratorApiServiceImpl.java
......@@ -143,12 +143,10 @@ public class CollaboratorApiServiceImpl implements CollaboratorApiService {
result.setMenuIdList(menuIdList);
}
if (StringUtils.isNotBlank(result.getSubAppIds())) {
String[] subAppArr = result.getSubAppIds().split(SignConstants.UNDERLINE);
List<String> subAppList = new ArrayList<>(subAppArr.length);
for (String subApp : subAppArr) {
subAppList.add(subApp);
}
result.setSubAppIdList(subAppList);
result.setSubAppIdList(strToList(result.getSubAppIds()));
}
if (StringUtils.isNotBlank(result.getResourceIds())) {
result.setResourceIdList(strToListOfInteger(result.getResourceIds()));
}
ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService
.getEnterpriseById(record.getCollaborationEnterpriseId());
......@@ -160,23 +158,21 @@ public class CollaboratorApiServiceImpl implements CollaboratorApiService {
@Transactional(rollbackFor = Exception.class)
@Override
public ServiceResponse<Void> auth(String subAppIds, String menuIds, Integer collaboratorId) {
public ServiceResponse<Void> 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)) {
String[] subAppArr = subAppIds.split(SignConstants.COMMA);
StringBuilder sb = new StringBuilder(SignConstants.UNDERLINE);
for (String str : subAppArr) {
sb.append(str).append(SignConstants.UNDERLINE);
}
CollaboratorDTO dto = new CollaboratorDTO();
dto.setCollaboratorId(collaboratorId);
dto.setSubAppIds(sb.toString());
collaboratorService.update(dto);
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);
......@@ -209,4 +205,35 @@ public class CollaboratorApiServiceImpl implements CollaboratorApiService {
collaboratorService.update(dto);
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) {
list.add(Integer.parseInt(str));
}
return list;
}
}
gic-platform-auth-service/src/main/resources/mapper/TabSysAccountGroupRelMapper.xml
......@@ -219,4 +219,22 @@
</if>
group by account_group_id
</select>
<select id="listByAccountGroupIdList" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_sys_account_group_rel
where
status = 1
<if test="list != null and list.size() > 0">
and account_group_id in
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="type != null">
and type = #{type}
</if>
</select>
</mapper>
\ No newline at end of file
gic-platform-auth-service/src/main/resources/mapper/TabSysCollaboratorMapper.xml
......@@ -10,6 +10,7 @@
<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="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
......@@ -17,7 +18,7 @@
</resultMap>
<sql id="Base_Column_List">
collaborator_id, collaborator_name, enterprise_id, collaboration_enterprise_id, phone,
app_id, app_name, creator, sub_app_ids, status, create_time, update_time
app_id, app_name, creator, resource_ids, sub_app_ids, status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -33,12 +34,12 @@
insert into tab_sys_collaborator (collaborator_id, collaborator_name,
enterprise_id, collaboration_enterprise_id,
phone, app_id, app_name,
creator, sub_app_ids, status,
creator, resource_ids, sub_app_ids, status,
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}, #{subAppIds,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
#{creator,jdbcType=VARCHAR}, #{resourceIds,jdbcType=VARCHAR}, #{subAppIds,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.auth.entity.TabSysCollaborator" useGeneratedKeys="true" keyProperty="collaboratorId">
......@@ -68,6 +69,9 @@
<if test="creator != null">
creator,
</if>
<if test="resourceIds != null">
resource_ids,
</if>
<if test="subAppIds != null">
sub_app_ids,
</if>
......@@ -106,6 +110,9 @@
<if test="creator != null">
#{creator,jdbcType=VARCHAR},
</if>
<if test="resourceIds != null">
#{resourceIds,jdbcType=VARCHAR},
</if>
<if test="subAppIds != null">
#{subAppIds,jdbcType=VARCHAR},
</if>
......@@ -144,6 +151,9 @@
<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>
......@@ -168,6 +178,7 @@
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},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
......
gic-platform-auth-web/pom.xml
......@@ -23,6 +23,7 @@
<gic-store-api>4.0-SNAPSHOT</gic-store-api>
<gic-redis-data>4.0-SNAPSHOT</gic-redis-data>
<gic-marketing-api>4.0-SNAPSHOT</gic-marketing-api>
<gic-open-platform-api>4.0-SNAPSHOT</gic-open-platform-api>
</properties>
<dependencies>
......@@ -143,6 +144,16 @@
<artifactId>gic-marketing-api</artifactId>
<version>${gic-marketing-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-enterprise-download</artifactId>
<version>${gic-enterprise-download}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-open-platform-api</artifactId>
<version>${gic-open-platform-api}</version>
</dependency>
</dependencies>
<build>
......
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/CollaboratorController.java
package com.gic.auth.web.controller;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import com.gic.auth.web.vo.CollaboratorDetailVO;
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.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.DataDownloadUtils;
import com.gic.download.utils.DownloadReport;
import com.gic.download.utils.DownloadUtils;
import com.gic.download.utils.ExecutorPoolSingleton;
import com.gic.download.utils.log.LogUtils;
import com.gic.enterprise.response.EnterpriseRestResponse;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetail;
import com.gic.enterprise.utils.UserDetailUtils;
@RestController
@RequestMapping("/collaborator")
public class CollaboratorController {
public class CollaboratorController extends DownloadUtils{
private static final Logger LOGGER = LogManager.getLogger(CollaboratorController.class);
@Autowired
......@@ -47,6 +55,51 @@ public class CollaboratorController {
.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(1);
report.setDataUrl("www.baidu.com");
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/");
//异步生成文件并上传到腾讯云
ExecutorPoolSingleton.getInstance().executeTask(new Runnable() {
@Override
public void run() {
DownloadDataLoader<CollaboratorListDTO> loader = new DownloadDataLoader<CollaboratorListDTO>() {
@Override
protected List<CollaboratorListDTO> getDownloadData(Integer pageNum) throws Exception {
params.setCurrentPage(pageNum);
ServiceResponse<Page<CollaboratorListDTO>> result = collaboratorApiService.page(params);
return result.getResult().getResult();
}
};
String[] headers = new String[] {"协作人名称", "手机号"};
String[] fields = new String[] { "collaboratorName", "phone" };
try {
download(path, reportId, fileName, excelExtensionCode, Arrays.asList(headers), Arrays.asList(fields), loader, null);
} catch (Exception e) {
LOGGER.warn(e);
}
}
});
return RestResponse.success(reportId);
}
@RequestMapping("/list-sub-app")
public RestResponse listSubApp(String appId) {
return ResultControllerUtils.commonResult(
......@@ -55,6 +108,7 @@ public class CollaboratorController {
@RequestMapping("/get-detail")
public RestResponse getDetail(Integer collaboratorId) {
LogUtils.createLog("获取协作人明细", "北丐测试");
return ResultControllerUtils.commonResultOne(
collaboratorApiService.getDetail(collaboratorId), CollaboratorDetailVO.class);
}
......@@ -68,9 +122,9 @@ public class CollaboratorController {
* @return com.gic.commons.webapi.reponse.RestResponse


 */
@RequestMapping("/auth")
public RestResponse auth(String subAppIds, String menuIds, Integer collaboratorId) {
public RestResponse auth(String subAppIds, String menuIds, String resourceIds, Integer collaboratorId) {
return ResultControllerUtils.commonResult(
collaboratorApiService.auth(subAppIds, menuIds, collaboratorId));
collaboratorApiService.auth(subAppIds, menuIds, resourceIds, collaboratorId));
}
@RequestMapping("/app-menu-tree")
......
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/LoginController.java
......@@ -9,6 +9,7 @@ import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.Md5Util;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.base.EnterpriseInfo;
import com.gic.enterprise.base.MenuInfo;
import com.gic.enterprise.base.UserInfo;
import com.gic.enterprise.dto.EnterpriseDTO;
import com.gic.enterprise.error.ErrorCode;
......@@ -97,14 +98,19 @@ public class LoginController {
ServiceResponse<List<MenuDTO>> menuResult = menuApiService.listUserMenu(userDetail.getUserId());
if (menuResult.isSuccess()) {
List<MenuDTO> menuList = menuResult.getResult();
List<MenuInfo> menuInfoList = EntityUtil.changeEntityListNew(MenuInfo.class, menuList);
Map<String, Object> map = new HashMap<>(16);
for (MenuDTO menuDTO : menuList) {
Map<String, MenuInfo> moduleMap = new HashMap<>(16);
for (MenuInfo menuDTO : menuInfoList) {
if (StringUtils.isBlank(menuDTO.getMenuUrl())) {
continue;
}
map.put(menuDTO.getMenuUrl(), "1");
moduleMap.put(menuDTO.getProjectUrlForWeb() + menuDTO.getMenuUrl(), menuDTO);
map.put(menuDTO.getMenuUrl(), menuDTO);
}
userDetail.setMenuInfoList(menuInfoList);
userDetail.setMenuUrlMap(map);
userDetail.setModuleUrlMap(moduleMap);
}
//塞缓存
UserDetailUtils.setUserDetail(userDetail);
......
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java
......@@ -22,6 +22,10 @@ import com.gic.goods.api.dto.GoodsRightsSelectorDTO;
import com.gic.goods.api.service.GoodsRightsSelectorApiService;
import com.gic.marketing.api.dto.sms.EnterpriseSmsSignDTO;
import com.gic.marketing.api.service.sms.SmsApiService;
import com.gic.open.api.dto.ApplicationDTO;
import com.gic.open.api.dto.ApplicationSubDTO;
import com.gic.open.api.service.AppTokenApiService;
import com.gic.open.api.service.ApplicationSubApiService;
import com.gic.store.dto.StoreWidgetDTO;
import com.gic.store.service.StoreWidgetApiService;
import org.apache.commons.collections.CollectionUtils;
......@@ -31,6 +35,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
......@@ -51,6 +56,34 @@ public class ResourceController {
private GoodsRightsSelectorApiService goodsRightsSelectorApiService;
@Autowired
private SmsApiService smsApiService;
@Autowired
private AppTokenApiService appTokenApiService;
@Autowired
private ApplicationSubApiService applicationSubApiService;
@RequestMapping("/list-resource-app")
public RestResponse listResourceApp() {
Integer enterpriseId = 100;
ServiceResponse<List<ApplicationDTO>> appServiceResponse = appTokenApiService.listApplicationByEnterpriseId(Long.valueOf(enterpriseId), 0);
if (!appServiceResponse.isSuccess()) {
return ResultControllerUtils.commonResult(appServiceResponse);
}
List<ApplicationDTO> appDTOList = appServiceResponse.getResult();
List<ApplicationVO> appVOList = new ArrayList<>(appDTOList.size());
for (ApplicationDTO applicationDTO : appDTOList) {
ServiceResponse<List<ApplicationSubDTO>> subServiceResponse = applicationSubApiService.listSubApp(enterpriseId, applicationDTO.getApplicationId());
if (subServiceResponse.isSuccess()) {
if (CollectionUtils.isNotEmpty(subServiceResponse.getResult())) {
ApplicationVO applicationVO = new ApplicationVO();
applicationVO.setApplicationId(applicationDTO.getApplicationId());
applicationVO.setName(applicationDTO.getName());
applicationVO.setChildren(EntityUtil.changeEntityListByJSON(ApplicationSubVO.class, subServiceResponse.getResult()));
appVOList.add(applicationVO);
}
}
}
return RestResponse.success(appVOList);
}
@RequestMapping("/list-sms-sign")
public RestResponse listSmsSign(String search) {
......@@ -145,7 +178,7 @@ public class ResourceController {
vo.setOrderResourceJSON(orderResourceList);
}
if (StringUtils.isNotBlank(dto.getAppResourceJson())) {
List<AppResourceVO> appResourceList = JSON.parseArray(dto.getAppResourceJson(), AppResourceVO.class);
List<List> appResourceList = JSON.parseArray(dto.getAppResourceJson(), List.class);
vo.setAppResourceJSON(appResourceList);
}
ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.getGoodsRightsSelector(response.getResult().getGoodsResourceId());
......
gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/AppResourceQO.java deleted 100644 → 0
package com.gic.auth.web.qo;
import java.io.Serializable;
import java.util.List;
/**
*
* @Description:
* @author zhiwj
* @date 2019-09-26 17:15
*/
public class AppResourceQO implements Serializable {
private static final long serialVersionUID = 3106090790767253020L;
private Integer appId;
private String appName;
private List<AppResourceQO> child;
public Integer getAppId() {
return appId;
}
public void setAppId(Integer appId) {
this.appId = appId;
}
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
public List<AppResourceQO> getChild() {
return child;
}
public void setChild(List<AppResourceQO> child) {
this.child = child;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/ResourceQO.java
......@@ -64,7 +64,7 @@ public class ResourceQO implements Serializable {
*/
private List<OrderResourceQO> orderResourceJSON;
private List<AppResourceQO> appResourceJSON;
private List<List<Long>> appResourceJSON;
private List<SmsSignResourceQO> smsSignResourceJSON;
......@@ -132,15 +132,15 @@ public class ResourceQO implements Serializable {
this.orderResourceJSON = orderResourceJSON;
}
public List<AppResourceQO> getAppResourceJSON() {
public List<List<Long>> getAppResourceJSON() {
return appResourceJSON;
}
public void setAppResourceJSON(List<AppResourceQO> appResourceJSON) {
public void setAppResourceJSON(List<List<Long>> appResourceJSON) {
this.appResourceJSON = appResourceJSON;
}
// public Long getGoodsResourceId() {
// public Long getGoodsResourceId() {
// return goodsResourceId;
// }
//
......
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/AppResourceVO.java deleted 100644 → 0
package com.gic.auth.web.vo;
import java.io.Serializable;
import java.util.List;
/**
*
* @Description:
* @author zhiwj
* @date 2019-09-27 10:23
*/
public class AppResourceVO implements Serializable {
private static final long serialVersionUID = -495359852430529567L;
private Integer appId;
private String appName;
private List<AppResourceVO> child;
public Integer getAppId() {
return appId;
}
public void setAppId(Integer appId) {
this.appId = appId;
}
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
public List<AppResourceVO> getChild() {
return child;
}
public void setChild(List<AppResourceVO> child) {
this.child = child;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ApplicationSubVO.java 0 → 100644
package com.gic.auth.web.vo;
import java.io.Serializable;
/**
*
* @Description:
* @author zhiwj
* @date 2019-11-06 14:32
*/
public class ApplicationSubVO implements Serializable {
private static final long serialVersionUID = -4918329047567649472L;
private Long applicationId;
private String name;
public Long getApplicationId() {
return applicationId;
}
public void setApplicationId(Long applicationId) {
this.applicationId = applicationId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ApplicationVO.java 0 → 100644
package com.gic.auth.web.vo;
import java.io.Serializable;
import java.util.List;
/**
*
* @Description:
* @author zhiwj
* @date 2019-11-06 11:36
*/
public class ApplicationVO implements Serializable {
private static final long serialVersionUID = 4558390896804884123L;
private Long applicationId;
private String name;
private List<ApplicationSubVO> children;
public Long getApplicationId() {
return applicationId;
}
public void setApplicationId(Long applicationId) {
this.applicationId = applicationId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public List<ApplicationSubVO> getChildren() {
return children;
}
public void setChildren(List<ApplicationSubVO> children) {
this.children = children;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/CollaboratorDetailVO.java
......@@ -32,6 +32,8 @@ public class CollaboratorDetailVO implements Serializable{
private List<Integer> menuIdList;
private List<Integer> resourceIdList;
public Integer getCollaboratorId() {
return collaboratorId;
}
......@@ -95,4 +97,12 @@ public class CollaboratorDetailVO implements Serializable{
public void setAppId(String appId) {
this.appId = appId;
}
public List<Integer> getResourceIdList() {
return resourceIdList;
}
public void setResourceIdList(List<Integer> resourceIdList) {
this.resourceIdList = resourceIdList;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ResourceVO.java
......@@ -51,7 +51,7 @@ public class ResourceVO implements Serializable{
*/
private List<OrderResourceVO> orderResourceJSON;
private List<AppResourceVO> appResourceJSON;
private List<List> appResourceJSON;
private Integer userResourceCount;
private StoreResouceVO storeResouce;
......@@ -121,11 +121,11 @@ public class ResourceVO implements Serializable{
this.orderResourceJSON = orderResourceJSON;
}
public List<AppResourceVO> getAppResourceJSON() {
public List<List> getAppResourceJSON() {
return appResourceJSON;
}
public void setAppResourceJSON(List<AppResourceVO> appResourceJSON) {
public void setAppResourceJSON(List<List> appResourceJSON) {
this.appResourceJSON = appResourceJSON;
}
......
gic-platform-auth-web/src/main/resources/dubbo-gic-platform-auth-web.xml
......@@ -61,4 +61,9 @@
<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.enterprise.service.DownloadReportApiService" id="downloadReportApiService" timeout="6000"/>
<!--应用-->
<dubbo:reference interface="com.gic.open.api.service.ApplicationSubApiService" id="applicationSubApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.open.api.service.AppTokenApiService" id="appTokenApiService" timeout="6000"/>
</beans>
\ No newline at end of file
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