Skip to content

G
gic-platform-auth
Commit c98fcf25 by guojuxing
Options

删除旧的资源组接口

parent 63fce641
Showing with 46 additions and 578 deletions
gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/ResourceOpenDTO.java
package com.gic.auth.dto.open;
import com.gic.auth.dto.CustomUserAreaDTO;
import java.io.Serializable;
/**
......@@ -17,17 +19,9 @@ public class ResourceOpenDTO implements Serializable{
*/
private StoreResourceDTO store;
/**
* 用户资源
*/
private UserResourceDTO userResource;
/**
* 渠道资源
* 用户域资源
*/
private ChannelResourceDTO channelResource;
/**
* 订单资源
*/
private OrderResourceDTO orderResource;
private CustomUserAreaDTO customUserAreaDTO;
/**
* 商品资源
*/
......@@ -42,28 +36,13 @@ public class ResourceOpenDTO implements Serializable{
this.store = store;
}
public UserResourceDTO getUserResource() {
return userResource;
}
public void setUserResource(UserResourceDTO userResource) {
this.userResource = userResource;
}
public ChannelResourceDTO getChannelResource() {
return channelResource;
}
public void setChannelResource(ChannelResourceDTO channelResource) {
this.channelResource = channelResource;
}
public OrderResourceDTO getOrderResource() {
return orderResource;
public CustomUserAreaDTO getCustomUserAreaDTO() {
return customUserAreaDTO;
}
public void setOrderResource(OrderResourceDTO orderResource) {
this.orderResource = orderResource;
public ResourceOpenDTO setCustomUserAreaDTO(CustomUserAreaDTO customUserAreaDTO) {
this.customUserAreaDTO = customUserAreaDTO;
return this;
}
public GoodsResourceDTO getGoodsResource() {
......@@ -78,9 +57,7 @@ public class ResourceOpenDTO implements Serializable{
public String toString() {
return "ResourceOpenDTO{" +
"store=" + store +
", userResource=" + userResource +
", channelResource=" + channelResource +
", orderResource=" + orderResource +
", customUserAreaDTO=" + customUserAreaDTO +
", goodsResource=" + goodsResource +
'}';
}
......
gic-platform-auth-api/src/main/java/com/gic/auth/service/ResourceApiService.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.*;
/**
*
* @ClassName: ResourceApiService
* @Description:
* @author zhiwj
* @date 2019/8/28 18:14
*/
public interface ResourceApiService {
/**
* 保存或更新资源
* @Title: saveOrUpdateResource
* @Description: 保存或更新资源
* @author zhiwj
* @param resourceDTO
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
* @throws
*/
ServiceResponse<Integer> saveOrUpdateResource(ResourceDTO resourceDTO);
/**
* 删除资源
* @Title: delResource
* @Description: 删除资源
* @author zhiwj
* @param resourceId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
* @throws
*/
ServiceResponse<Integer> delResource(Integer resourceId);
/**
* 资源组列表
* @Title: listResource
* @Description:
* @author zhiwj
* @param resourceDTO
* @param pageNum
* @param pageSize
* @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.auth.dto.ResourceDTO>>
* @throws
*/
ServiceResponse<Page<ResourceDTO>> listResource(ResourceDTO resourceDTO, Integer pageNum, Integer pageSize);
/**
* 查询资源详情
* todo 前端对齐之后，要切换最新的接口 resourceGroupApiService
* @Title: getResource
* @Description:
* @author zhiwj
* @param resourceId
* @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.auth.dto.ResourceDTO>>
* @throws
*/
ServiceResponse<ResourceDTO> getResource(Integer resourceId);
/**
* 按用户查询短信签名
* @Title: getSmsResourceByUserId
* @Description:
* @author zhiwj
* @param userId
* @return com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.SmsSignResourceDTO>
* @throws
*/
ServiceResponse<SmsSignResourceDTO> getSmsResourceByUserId(Integer userId);
/**
* 查询用户的渠道资源(仅当前可用的数据)
* @Title: getChannelResourceByUserId
* @Description:
* @author zhiwj
* @param userId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<ChannelResourceDTO> getChannelResourceByUserId(Integer userId);
/**
* 查询用户的渠道资源(包含已经删除的数据)
* @Title: getChannelResourceByUserIdContainDel
* @Description:
* @author zhiwj
* @param userId
* @return com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.ChannelResourceDTO>
* @throws
*/
ServiceResponse<ChannelResourceDTO> getChannelResourceByUserIdContainDel(Integer userId);
/**
* 查询门店资源
* @Title: getStoreResourceByUserId
* @Description:
* @author zhiwj
* @param userId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<StoreResourceDTO> getStoreResourceByUserId(Integer userId);
/**
* 查询订单资源
* @Title: getOrderResourceByUserId
* @Description:
* @author zhiwj
* @param userId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<OrderResourceDTO> getOrderResourceByUserId(Integer userId);
/**
* getUserResourceByUserId
* @Title: getUserResourceByUserId
* @Description:
* @author zhiwj
* @param userId
* @return com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.OrderResourceDTO> 返回null表示没有授权 返回 -1 表示全部
* @throws
*/
ServiceResponse<Long> getUserResourceByUserId(Integer userId);
}
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysResourceMapper.java deleted 100644 → 0
package com.gic.auth.dao.mapper;
import com.gic.auth.dto.ResourceDTO;
import com.gic.auth.entity.TabSysResource;
import com.github.pagehelper.Page;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
* @ClassName: TabSysResourceMapper
* @Description:
* @author zhiwj
* @date 2020-09-10 9:41
*/
public interface TabSysResourceMapper {
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabSysResource record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabSysResource record);
/**
* 根据主键查询
*
* @param resourceId 主键
* @return 实体对象
*/
TabSysResource selectByPrimaryKey(Integer resourceId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabSysResource record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabSysResource record);
/**
* listResource
* @Title: listResource
* @Description:
* @author zhiwj
* @param resourceDTO
* @return com.github.pagehelper.Page<com.gic.auth.entity.TabSysResource>
* @throws
*/
Page<TabSysResource> listResource(ResourceDTO resourceDTO);
/**
* getBySelective
* @Title: getBySelective
* @Description:
* @author zhiwj
* @param enterpriseId
* @param resourceName
* @param resourceId
* @return com.gic.auth.entity.TabSysResource
* @throws
*/
TabSysResource getBySelective(@Param("enterpriseId") Integer enterpriseId, @Param("resourceName") String resourceName, @Param("resourceId") Integer resourceId);
/**
* listByIds
* @Title: listByIds
* @Description:
* @author zhiwj
* @param ids
* @return java.util.List<com.gic.auth.entity.TabSysResource>
* @throws
*/
List<TabSysResource> listByIds(@Param("ids") List<Integer> ids);
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/service/ResourceService.java deleted 100644 → 0
package com.gic.auth.service;
import com.gic.auth.dto.ResourceDTO;
import com.gic.auth.entity.TabSysResource;
import com.github.pagehelper.Page;
import java.util.List;
/**
*
* @Description:
* @author zhiwj
* @date 2019/8/28 18:29
*/
public interface ResourceService {
/**
* save
* @Title: save
* @Description:
* @author zhiwj
* @param resourceDTO
* @return java.lang.Integer
* @throws
*/
Integer save(ResourceDTO resourceDTO);
/**
* update
* @Title: update
* @Description:
* @author zhiwj
* @param resourceDTO
* @return java.lang.Integer
* @throws
*/
Integer update(ResourceDTO resourceDTO);
/**
* delResource
* @Title: delResource
* @Description:
* @author zhiwj
* @param resourceId
* @return java.lang.Integer
* @throws
*/
Integer delResource(Integer resourceId);
/**
* listResource
* @Title: listResource
* @Description:
* @author zhiwj
* @param resourceDTO
* @param pageNum
* @param pageSize
* @return com.github.pagehelper.Page<com.gic.auth.entity.TabSysResource>
* @throws
*/
Page<TabSysResource> listResource(ResourceDTO resourceDTO, Integer pageNum, Integer pageSize);
/**
* getResource
* @Title: getResource
* @Description:
* @author zhiwj
* @param resourceId
* @return com.gic.auth.entity.TabSysResource
* @throws
*/
TabSysResource getResource(Integer resourceId);
/**
* isRepeatByResourceName
* @Title: isRepeatByResourceName
* @Description:
* @author zhiwj
* @param enterpriseId
* @param resourceName
* @param resourceId
* @return boolean
* @throws
*/
boolean isRepeatByResourceName(Integer enterpriseId, String resourceName, Integer resourceId);
/**
* listByIds
* @Title: listByIds
* @Description:
* @author zhiwj
* @param ids
* @return java.util.List<com.gic.auth.entity.TabSysResource>
* @throws
*/
List<TabSysResource> listByIds(List<Integer> ids);
}
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/ResourceServiceImpl.java deleted 100644 → 0
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabSysResourceMapper;
import com.gic.auth.dto.ResourceDTO;
import com.gic.auth.entity.TabSysResource;
import com.gic.auth.service.ResourceService;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GlobalInfo;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.Date;
import java.util.List;
/**
*
* @Description:
* @author zhiwj
* @date 2019/8/28 18:29
*/
@Service
public class ResourceServiceImpl implements ResourceService {
@Autowired
private TabSysResourceMapper tabSysResourceMapper;
@Override
public Integer save(ResourceDTO resourceDTO) {
TabSysResource resource = EntityUtil.changeEntityByOrika(TabSysResource.class, resourceDTO);
resource.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
resource.setCreateTime(new Date());
return tabSysResourceMapper.insertSelective(resource);
}
@Override
public Integer update(ResourceDTO resourceDTO) {
TabSysResource resource = EntityUtil.changeEntityByOrika(TabSysResource.class, resourceDTO);
return tabSysResourceMapper.updateByPrimaryKeySelective(resource);
}
@Override
public Integer delResource(Integer resourceId) {
TabSysResource resource = new TabSysResource();
resource.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
resource.setResourceId(resourceId);
return tabSysResourceMapper.updateByPrimaryKeySelective(resource);
}
@Override
public Page<TabSysResource> listResource(ResourceDTO resourceDTO, Integer pageNum, Integer pageSize) {
PageHelper.startPage(pageNum, pageSize);
return tabSysResourceMapper.listResource(resourceDTO);
}
@Override
public TabSysResource getResource(Integer resourceId) {
return tabSysResourceMapper.selectByPrimaryKey(resourceId);
}
@Override
public boolean isRepeatByResourceName(Integer enterpriseId, String resourceName, Integer resourceId) {
TabSysResource resource = tabSysResourceMapper.getBySelective(enterpriseId, resourceName, resourceId);
return resource != null;
}
@Override
public List<TabSysResource> listByIds(List<Integer> ids) {
if (CollectionUtils.isNotEmpty(ids)) {
return tabSysResourceMapper.listByIds(ids);
} else {
return Collections.emptyList();
}
}
}
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/UserApiServiceImpl.java
......@@ -53,7 +53,7 @@ public class UserApiServiceImpl implements UserApiService {
@Autowired
private UserResourceService userResourceService;
@Autowired
private ResourceService resourceService;
private ResourceGroupService resourceGroupService;
@Autowired
private RoleService roleService;
@Autowired
......@@ -734,7 +734,7 @@ public class UserApiServiceImpl implements UserApiService {
userResourceDTO.setEnterpriseId(enterpriseId);
for (String userResource : userResourceIdArr) {
int resourceId = Integer.parseInt(userResource);
TabSysResource tabSysResource = resourceService.getResource(resourceId);
TabSysResourceGroup tabSysResource = resourceGroupService.getResourceGroup(resourceId);
if (tabSysResource == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "资源数据有误，无此资源数据");
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/utils/resourcegroup/ResourceGroupUtils.java
......@@ -36,9 +36,9 @@ public class ResourceGroupUtils {
public static Integer GOODS_RESOURCE = 3;
static {
map.put(1, new CustomResourceData());
map.put(2, new StoreResourceData());
map.put(3, new GoodsResourceData());
map.put(CUSTOM_RESOURCE, new CustomResourceData());
map.put(STORE_RESOURCE, new StoreResourceData());
map.put(GOODS_RESOURCE, new GoodsResourceData());
}
/**
......
gic-platform-auth-service/src/main/resources/dubbo-gic-platform-auth-service.xml
......@@ -18,8 +18,6 @@
<dubbo:service interface="com.gic.auth.service.UserApiService" ref="userApiService" timeout="6000" />
<dubbo:service interface="com.gic.auth.service.MenuApiService" ref="menuApiService" timeout="6000" />
<dubbo:service interface="com.gic.auth.service.MenuItemApiService" ref="menuItemApiService" timeout="6000" />
<!--资源组-->
<dubbo:service interface="com.gic.auth.service.ResourceApiService" ref="resourceApiService" timeout="6000" />
<dubbo:service interface="com.gic.auth.service.AuthCodeApiService" ref="authCodeApiService" timeout="6000" />
<dubbo:service interface="com.gic.auth.service.UnionEnterpriseApiService" ref="unionEnterpriseApiService" timeout="6000" />
<!--角色-->
......
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/LoginController.java
package com.gic.auth.web.controller;
import com.alibaba.fastjson.JSON;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
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.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.LoginUserTypeEnum;
import com.gic.auth.dto.*;
import com.gic.auth.dto.MenuDTO;
import com.gic.auth.dto.ResourceGroupDataDTO;
import com.gic.auth.dto.UserDTO;
import com.gic.auth.dto.UserResourceDTO;
import com.gic.auth.service.*;
import com.gic.auth.web.vo.ChannelResourceVO;
import com.gic.commons.annotation.HeaderSignIgnore;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.Md5Util;
......@@ -26,19 +45,6 @@ import com.gic.member.config.api.service.AppletsConfigApiService;
import com.gic.member.config.api.service.MemberCardApiService;
import com.gic.member.config.api.service.ServiceConfigApiService;
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.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
/**
*
......@@ -64,8 +70,6 @@ public class LoginController {
@Autowired
private UserResourceApiService userResourceApiService;
@Autowired
private ResourceApiService resourceApiService;
@Autowired
private MemberCardApiService memberCardApiService;
@Autowired
private AppletsConfigApiService appletsConfigApiService;
......@@ -283,29 +287,6 @@ public class LoginController {
detail.setGoodsResourceInfo(new GoodsResourceInfo());
detail.setStoreResourceInfo(new StoreResourceInfo());
}
//todo 暂时保留旧代码，防止环境报错，等前端同步，删除
ServiceResponse<ResourceDTO> serviceResource = this.resourceApiService
.getResource(resource.getResult().getResourceId());
if (serviceResource.isSuccess() && serviceResource.getResult() != null) {
UserResourceInfo userResourceInfo = new UserResourceInfo();
userResourceInfo.setUserResource(serviceResource.getResult().getUserResource());
userResourceInfo.setStoreResource(serviceResource.getResult().getStoreResource());
userResourceInfo.setGoodsResourceId(serviceResource.getResult().getGoodsResourceId());
userResourceInfo.setAppResource(serviceResource.getResult().getAppResource());
userResourceInfo.setOrderResource(serviceResource.getResult().getOrderResource());
userResourceInfo.setSmsSignResource(serviceResource.getResult().getSmsSignResource());
// 取的渠道资源
String channelResourceJson = serviceResource.getResult().getChannelResourceJson();
if (StringUtils.isNotBlank(channelResourceJson)) {
ChannelResourceVO channelResourceVO = JSON.parseObject(channelResourceJson, ChannelResourceVO.class);
userResourceInfo.setCardConfigIdList(channelResourceVO.getCardConfigIdList());
userResourceInfo.setAppletConfigIdList(channelResourceVO.getAppletConfigIdList());
userResourceInfo.setServiceConfigIdList(channelResourceVO.getServiceConfigIdList());
}
detail.setUserResourceInfo(userResourceInfo);
}
}
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java
package com.gic.auth.web.controller;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
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.ServiceResponse;
import com.gic.auth.dto.ResourceDTO;
import com.gic.auth.dto.ResourceGroupDTO;
import com.gic.auth.service.ResourceApiService;
import com.gic.auth.service.ResourceGroupApiService;
import com.gic.auth.web.qo.OrderResourceQO;
import com.gic.auth.web.qo.PageQO;
import com.gic.auth.web.qo.ResourceQO;
import com.gic.auth.web.vo.*;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.download.utils.OperationResultUtils;
import com.gic.download.utils.log.LogUtils;
import com.gic.enterprise.response.EnterpriseRestResponse;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.goods.api.service.GoodsRightsSelectorApiService;
......@@ -33,16 +32,6 @@ import com.gic.member.config.api.service.ServiceConfigApiService;
import com.gic.open.api.dto.EnterpriseServeInfoDTO;
import com.gic.open.api.service.AppTokenApiService;
import com.gic.open.api.service.EnterpriseLicenseApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
......@@ -52,9 +41,7 @@ import java.util.Map;
*/
@RestController
public class ResourceController {
@Autowired
private ResourceApiService resourceApiService;
@Autowired
private GoodsRightsSelectorApiService goodsRightsSelectorApiService;
@Autowired
......@@ -86,34 +73,6 @@ public class ResourceController {
}
}
@Deprecated
@RequestMapping("/save-resource")
public RestResponse saveResource(@RequestBody ResourceQO resourceQO) {
ResourceDTO resourceDTO = EntityUtil.changeEntityByJSON(ResourceDTO.class, resourceQO);
resourceDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
// 订单资源
if (CollectionUtils.isNotEmpty(resourceQO.getOrderResourceJson())) {
List<OrderResourceQO> orderResource = resourceQO.getOrderResourceJson();
resourceDTO.setOrderResourceJson(JSON.toJSONString(orderResource));
}
// 短信签名资源
if (resourceQO.getSmsResourceJson() != null) {
resourceDTO.setSmsSignResourceJson(JSON.toJSONString(resourceQO.getSmsResourceJson()));
}
if (resourceQO.getChannelResourceVO() != null) {
resourceDTO.setChannelResourceJson(JSON.toJSONString(resourceQO.getChannelResourceVO()));
}
ServiceResponse<Integer> response = resourceApiService.saveOrUpdateResource(resourceDTO);
if (response.isSuccess()) {
LogUtils.createLog((resourceQO.getResourceId() == null ? "新增" : "修改") + "资源组",
resourceQO.getResourceName());
return RestResponse.success(response.getResult());
}
return EnterpriseRestResponse.failure(response);
}
@RequestMapping("/save-resource-new")
public RestResponse saveResourceNew(ResourceGroupDTO resourceGroup) {
resourceGroup.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
......@@ -145,54 +104,6 @@ public class ResourceController {
return ResultControllerUtils.commonResultOne(resourceGroupApiService.getResourceGroup(resourceGroupId), ResourceGroupDetailVO.class);
}
@Deprecated
@RequestMapping("/del-resource")
public RestResponse delResource(Integer resourceId) {
ServiceResponse<ResourceDTO> resource = resourceApiService.getResource(resourceId);
ServiceResponse<Integer> serviceResponse = resourceApiService.delResource(resourceId);
if (resource.isSuccess()) {
LogUtils.createLog("删除资源组", resource.getResult().getResourceName());
}
return ResultControllerUtils.commonResult(serviceResponse);
}
@Deprecated
@RequestMapping("/list-resource")
public RestResponse listResource(ResourceQO resourceQO, PageQO pageQO) {
ResourceDTO resourceDTO = EntityUtil.changeEntityByOrika(ResourceDTO.class, resourceQO);
resourceDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
ServiceResponse<Page<ResourceDTO>> serviceResponse = resourceApiService.listResource(resourceDTO,
pageQO.getCurrentPage(), pageQO.getPageSize());
return ResultControllerUtils.commonResult(serviceResponse);
}
@Deprecated
@RequestMapping("/get-resource")
public RestResponse getResource(Integer resourceId) {
ServiceResponse<ResourceDTO> response = resourceApiService.getResource(resourceId);
if (response.isSuccess()) {
ResourceDTO dto = response.getResult();
ResourceVO vo = EntityUtil.changeEntity(ResourceVO.class, dto);
if (StringUtils.isNotBlank(dto.getOrderResourceJson())) {
List<OrderResourceVO> orderResourceList = JSON.parseArray(dto.getOrderResourceJson(),
OrderResourceVO.class);
vo.setOrderResourceJson(orderResourceList);
}
if (StringUtils.isNotBlank(dto.getSmsSignResourceJson())) {
SmsSignResourceVO smsSignResourceDTO = JSON.parseObject(dto.getSmsSignResourceJson(),
SmsSignResourceVO.class);
vo.setSmsResourceJson(smsSignResourceDTO);
}
if (StringUtils.isNotBlank(dto.getChannelResourceJson())) {
ChannelResourceVO channelResourceDTO = JSON.parseObject(dto.getChannelResourceJson(),
ChannelResourceVO.class);
vo.setChannelResourceJson(channelResourceDTO);
}
return RestResponse.success(vo);
}
return EnterpriseRestResponse.failure(response);
}
@RequestMapping("/channel-resource")
public RestResponse channelResource() {
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
......
gic-platform-auth-web/src/main/resources/dubbo-gic-platform-auth-web.xml
......@@ -40,8 +40,6 @@
<dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="6000" />
<dubbo:reference interface="com.gic.auth.service.UserApiService" id="userApiService" timeout="6000" />
<!--资源组-->
<dubbo:reference interface="com.gic.auth.service.ResourceApiService" id="resourceApiService" timeout="6000" />
<dubbo:reference interface="com.gic.auth.service.AuthCodeApiService" id="authCodeApiService" timeout="6000" />
<dubbo:reference interface="com.gic.auth.service.UnionEnterpriseApiService" id="unionEnterpriseApiService" 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