Skip to content

G
gic-platform-auth
Commit 91f7b4d1 by zhiwj
Options

资源组添加新的资源

parent f159be6e
Showing with 597 additions and 233 deletions
gic-platform-auth-api/src/main/java/com/gic/auth/constant/OrderOrAppEnum.java 0 → 100644
package com.gic.auth.constant;
/**
*
* @Description:
* @author zhiwj
* @date 2019-09-26 18:35
*/
public enum OrderOrAppEnum {
ORDER(1, "订单"),
APP(2, "应用")
;
private Integer code;
private String message;
OrderOrAppEnum(Integer code, String message){
this.code = code;
this.message = message;
}
public Integer getCode() {
return code;
}
public String getMessage() {
return message;
}
}
gic-platform-auth-api/src/main/java/com/gic/auth/constant/OrderResourceChannelEnum.java 0 → 100644
package com.gic.auth.constant;
/**
*
* @Description:
* @author zhiwj
* @date 2019-09-26 17:46
*/
public enum OrderResourceChannelEnum {
OFFLINE(1, "线下门店"),
DAMO_MALL(2, "达摩微商城"),
WEIMOB_MALL(3, "微盟微商城")
;
private Integer code;
private String message;
OrderResourceChannelEnum(Integer code, String message){
this.code = code;
this.message = message;
}
public Integer getCode() {
return code;
}
public String getMessage() {
return message;
}
}
gic-platform-auth-api/src/main/java/com/gic/auth/dto/ResourceDTO.java
......@@ -54,7 +54,9 @@ public class ResourceDTO implements Serializable {
}
]
*/
private String orderResource;
private Long orderResource;
private String orderResourceJson;
/**
* 应用资源
......@@ -69,8 +71,8 @@ public class ResourceDTO implements Serializable {
}
]
*/
private String appResource;
private Long appResource;
private String appResourceJson;
private Integer userResourceCount;
......@@ -130,22 +132,38 @@ public class ResourceDTO implements Serializable {
this.storeResource = storeResource;
}
public String getOrderResource() {
public Long getOrderResource() {
return orderResource;
}
public void setOrderResource(String orderResource) {
public void setOrderResource(Long orderResource) {
this.orderResource = orderResource;
}
public String getAppResource() {
public String getOrderResourceJson() {
return orderResourceJson;
}
public void setOrderResourceJson(String orderResourceJson) {
this.orderResourceJson = orderResourceJson;
}
public Long getAppResource() {
return appResource;
}
public void setAppResource(String appResource) {
public void setAppResource(Long appResource) {
this.appResource = appResource;
}
public String getAppResourceJson() {
return appResourceJson;
}
public void setAppResourceJson(String appResourceJson) {
this.appResourceJson = appResourceJson;
}
public Integer getUserResourceCount() {
return userResourceCount;
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysResource.java
package com.gic.auth.entity;
import java.util.Date;
/**
* tab_sys_resource
*/
public class TabSysResource {
/**
*
*/
private Integer resourceId;
/**
* 资源名称
*/
private String resourceName;
/**
*
*/
private Integer enterpriseId;
/**
* 会员卡资源控件id
*/
private Long memberCardResource;
/**
* 服务号资源
*/
private Long fwhResource;
/**
* 小程序资源
*/
private Long appletResource;
/**
* 门店资源
*/
private Long storeResource;
/**
* 商品资源
*/
private Long goodsResource;
/**
* 订单资源 [ { "channel":1, // 渠道 1：线下门店， 2:达摩微商城， 3：微盟微商城 "storeContent":1 // 门店id或门店选择器id， 多个逗号隔开 } ]
*/
private String orderResource;
/**
* 应用资源 [ { appId:1, // 应用id appName:微商城 // 应用名称 child:[ appId: 10, // 子应用id appName: 短信发送 // 子应用名称 ] } ]
*/
private String appResource;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*
*/
private Integer status;
public Integer getResourceId() {
return resourceId;
}
public void setResourceId(Integer resourceId) {
this.resourceId = resourceId;
}
public String getResourceName() {
return resourceName;
}
public void setResourceName(String resourceName) {
this.resourceName = resourceName;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Long getMemberCardResource() {
return memberCardResource;
}
public void setMemberCardResource(Long memberCardResource) {
this.memberCardResource = memberCardResource;
}
public Long getFwhResource() {
return fwhResource;
}
public void setFwhResource(Long fwhResource) {
this.fwhResource = fwhResource;
}
public Long getAppletResource() {
return appletResource;
}
public void setAppletResource(Long appletResource) {
this.appletResource = appletResource;
}
public Long getStoreResource() {
return storeResource;
}
public void setStoreResource(Long storeResource) {
this.storeResource = storeResource;
}
public Long getGoodsResource() {
return goodsResource;
}
public void setGoodsResource(Long goodsResource) {
this.goodsResource = goodsResource;
}
public String getOrderResource() {
return orderResource;
}
public void setOrderResource(String orderResource) {
this.orderResource = orderResource;
}
public String getAppResource() {
return appResource;
}
public void setAppResource(String appResource) {
this.appResource = appResource;
}
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 getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
package com.gic.auth.entity;
import java.util.Date;
/**
* tab_sys_resource
*/
public class TabSysResource {
/**
*
*/
private Integer resourceId;
/**
* 资源名称
*/
private String resourceName;
/**
*
*/
private Integer enterpriseId;
/**
* 会员卡资源控件id
*/
private Long memberCardResource;
/**
* 服务号资源
*/
private Long fwhResource;
/**
* 小程序资源
*/
private Long appletResource;
/**
* 门店资源
*/
private Long storeResource;
/**
* 商品资源
*/
private Long goodsResource;
/**
* 订单资源
[
{
"channel":1, // 渠道 1：线下门店， 2:达摩微商城， 3：微盟微商城
"storeContent":1 // 门店id或门店选择器id， 多个逗号隔开
}
]
*/
private Integer orderResource;
/**
* 应用资源
[
{
appId:1, // 应用id
appName:微商城 // 应用名称
child:[
appId: 10, // 子应用id
appName: 短信发送 // 子应用名称
]
}
]
*/
private Integer appResource;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*
*/
private Integer status;
public Integer getResourceId() {
return resourceId;
}
public void setResourceId(Integer resourceId) {
this.resourceId = resourceId;
}
public String getResourceName() {
return resourceName;
}
public void setResourceName(String resourceName) {
this.resourceName = resourceName;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Long getMemberCardResource() {
return memberCardResource;
}
public void setMemberCardResource(Long memberCardResource) {
this.memberCardResource = memberCardResource;
}
public Long getFwhResource() {
return fwhResource;
}
public void setFwhResource(Long fwhResource) {
this.fwhResource = fwhResource;
}
public Long getAppletResource() {
return appletResource;
}
public void setAppletResource(Long appletResource) {
this.appletResource = appletResource;
}
public Long getStoreResource() {
return storeResource;
}
public void setStoreResource(Long storeResource) {
this.storeResource = storeResource;
}
public Long getGoodsResource() {
return goodsResource;
}
public void setGoodsResource(Long goodsResource) {
this.goodsResource = goodsResource;
}
public Integer getOrderResource() {
return orderResource;
}
public void setOrderResource(Integer orderResource) {
this.orderResource = orderResource;
}
public Integer getAppResource() {
return appResource;
}
public void setAppResource(Integer appResource) {
this.appResource = appResource;
}
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 getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceApiServiceImpl.java
......@@ -2,8 +2,12 @@ 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.OrderOrAppEnum;
import com.gic.auth.dto.OrderAppResourceDTO;
import com.gic.auth.dto.ResourceDTO;
import com.gic.auth.entity.TabSysOrderAppResource;
import com.gic.auth.entity.TabSysResource;
import com.gic.auth.service.OrderAppResourceService;
import com.gic.auth.service.ResourceApiService;
import com.gic.auth.service.ResourceService;
import com.gic.auth.service.UserResourceService;
......@@ -35,6 +39,8 @@ public class ResourceApiServiceImpl implements ResourceApiService {
private ResourceService resourceService;
@Autowired
private UserResourceService userResourceService;
@Autowired
private OrderAppResourceService orderAppResourceService;
@Override
public ServiceResponse<Integer> saveOrUpdateResource(ResourceDTO resourceDTO) {
......@@ -43,11 +49,28 @@ public class ResourceApiServiceImpl implements ResourceApiService {
logger.info("enterpriseId:{} , resourceName:{}, 资源组名称重复 ", resourceDTO.getEnterpriseId(), resourceDTO.getResourceName());
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "资源组名称重复");
}
OrderAppResourceDTO orderDTO = new OrderAppResourceDTO();
orderDTO.setEnterpriseId(resourceDTO.getEnterpriseId());
orderDTO.setType(OrderOrAppEnum.ORDER.getCode());
orderDTO.setContent(resourceDTO.getOrderResourceJson());
Integer order = orderAppResourceService.save(orderDTO);
resourceDTO.setOrderResource(order.longValue());
OrderAppResourceDTO appDTO = new OrderAppResourceDTO();
appDTO.setEnterpriseId(resourceDTO.getEnterpriseId());
appDTO.setType(OrderOrAppEnum.ORDER.getCode());
appDTO.setContent(resourceDTO.getOrderResourceJson());
Integer app = orderAppResourceService.save(appDTO);
resourceDTO.setOrderResource(app.longValue());
if (resourceDTO.getResourceId() == null) {
// save
resourceService.save(resourceDTO);
} else {
// update
// 删除老的订单资源和应用资源
TabSysResource resource = resourceService.getResource(resourceDTO.getResourceId());
orderAppResourceService.del(resource.getOrderResource());
orderAppResourceService.del(resource.getOrderResource());
resourceService.update(resourceDTO);
}
return ServiceResponse.success();
......@@ -84,6 +107,14 @@ public class ResourceApiServiceImpl implements ResourceApiService {
public ServiceResponse<ResourceDTO> getResource(Integer resourceId) {
TabSysResource resource = resourceService.getResource(resourceId);
ResourceDTO resourceDTO = EntityUtil.changeEntityByOrika(ResourceDTO.class, resource);
if (resourceDTO.getOrderResource() != null) {
TabSysOrderAppResource orderResource = orderAppResourceService.getById(resourceDTO.getOrderResource().intValue());
resourceDTO.setOrderResourceJson(orderResource.getContent());
}
if (resourceDTO.getAppResource() != null) {
TabSysOrderAppResource appResource = orderAppResourceService.getById(resourceDTO.getAppResource().intValue());
resourceDTO.setAppResourceJson(appResource.getContent());
}
return ServiceResponse.success(resourceDTO);
}
}
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.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.OrderResourceChannelEnum;
import com.gic.auth.dto.ResourceDTO;
import com.gic.auth.service.ResourceApiService;
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.qo.StoreResouceQO;
import com.gic.auth.web.vo.AppResourceVO;
import com.gic.auth.web.vo.OrderResourceVO;
import com.gic.auth.web.vo.ResourceVO;
import com.gic.auth.web.vo.StoreResouceVO;
import com.gic.commons.util.EntityUtil;
......@@ -15,10 +23,15 @@ import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.store.dto.StoreWidgetDTO;
import com.gic.store.service.StoreWidgetApiService;
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.Collections;
import java.util.List;
/**
*
* @Description:
......@@ -34,23 +47,41 @@ public class ResourceController {
private StoreWidgetApiService storeWidgetApiService;
@RequestMapping("/save-resource")
public RestResponse saveResource(ResourceQO resourceQO) {
public RestResponse saveResource(@RequestBody ResourceQO resourceQO) {
ResourceDTO resourceDTO = EntityUtil.changeEntityByOrika(ResourceDTO.class, resourceQO);
resourceDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
StoreWidgetDTO storeWidgetDTO = new StoreWidgetDTO();
storeWidgetDTO.setAuthMode(resourceQO.getStoreResouce().getAuthMode());
storeWidgetDTO.setSearchParam(resourceQO.getStoreResouce().getSearchParam());
storeWidgetDTO.setStoreWidgetId(resourceQO.getStoreResouce().getStoreResourceId());
storeWidgetDTO.setWriteBackParam(resourceQO.getStoreResouce().getWriteBackParam());
ServiceResponse<Integer> storeWidgetResponse = this.storeWidgetApiService.saveAuthStoreWidget(storeWidgetDTO);
// 门店资源
ServiceResponse<Integer> storeWidgetResponse = saveStoreWidget(resourceQO.getStoreResouce());
if(storeWidgetResponse.isSuccess()){
resourceDTO.setStoreResource(storeWidgetResponse.getResult().longValue());
// 订单资源
List<OrderResourceQO> orderResource = resourceQO.getOrderResource();
JSONArray orderResourceArray = new JSONArray();
for (OrderResourceQO orderResourceQO : orderResource) {
List<Integer> storeIds;
if (OrderResourceChannelEnum.OFFLINE.getCode().equals(orderResourceQO.getChannel())) {
ServiceResponse<Integer> widgetResponse = saveStoreWidget(orderResourceQO.getStoreResouce());
Integer storeId = widgetResponse.getResult();
storeIds = Collections.singletonList(storeId);
} else {
storeIds = orderResourceQO.getStoreContent();
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("channel", orderResourceQO.getChannel());
jsonObject.put("storeIds", storeIds);
orderResourceArray.add(jsonObject);
}
resourceDTO.setOrderResourceJson(JSON.toJSONString(orderResourceArray));
// 应用资源
resourceDTO.setAppResourceJson(JSON.toJSONString(resourceQO.getAppResource()));
ServiceResponse<Integer> response = resourceApiService.saveOrUpdateResource(resourceDTO);
if(response.isSuccess()){
return RestResponse.success(response.getResult());
}
return EnterpriseRestResponse.failure(response);
}
// 订单资源
return EnterpriseRestResponse.failure(storeWidgetResponse);
}
......@@ -72,21 +103,55 @@ public class ResourceController {
public RestResponse getResource(Integer resourceId){
ServiceResponse<ResourceDTO> response = resourceApiService.getResource(resourceId);
if (response.isSuccess()) {
ResourceVO vo = EntityUtil.changeEntityByJSON(ResourceVO.class, response.getResult());
ServiceResponse<StoreWidgetDTO> storeWidget = this.storeWidgetApiService.getStoreWidget(response.getResult().getStoreResource().intValue());
if(storeWidget.isSuccess()) {
if (storeWidget.getResult() != null) {
StoreResouceVO storeResouceVO = new StoreResouceVO();
storeResouceVO.setStoreResourceId(response.getResult().getStoreResource().intValue());
storeResouceVO.setAuthMode(storeWidget.getResult().getAuthMode());
storeResouceVO.setSearchParam(storeWidget.getResult().getSearchParam());
storeResouceVO.setWriteBackParam(storeWidget.getResult().getWriteBackParam());
vo.setStoreResouce(storeResouceVO);
ResourceDTO dto = response.getResult();
ResourceVO vo = EntityUtil.changeEntityByJSON(ResourceVO.class, dto);
StoreResouceVO storeResouceVO = getStoreResouce(dto.getStoreResource().intValue());
vo.setStoreResouce(storeResouceVO);
if (StringUtils.isNotBlank(dto.getOrderResourceJson())) {
List<OrderResourceVO> orderResourceList = JSON.parseArray(dto.getOrderResourceJson(), OrderResourceVO.class);
for (OrderResourceVO orderResourceVO : orderResourceList) {
Integer channel = orderResourceVO.getChannel();
if (OrderResourceChannelEnum.OFFLINE.getCode().equals(channel)) {
List<Integer> storeContent = orderResourceVO.getStoreContent();
StoreResouceVO orderStoreResouce = getStoreResouce(storeContent.get(0));
if (orderStoreResouce != null) {
orderResourceVO.setStoreResouce(orderStoreResouce);
}
}
}
vo.setOrderResource(orderResourceList);
}
if (StringUtils.isNotBlank(dto.getAppResourceJson())) {
List<AppResourceVO> appResourceList = JSON.parseArray(dto.getAppResourceJson(), AppResourceVO.class);
vo.setAppResource(appResourceList);
}
return RestResponse.success(vo);
}
return EnterpriseRestResponse.failure(response);
}
private StoreResouceVO getStoreResouce(Integer storeWidgetId) {
StoreResouceVO storeResouceVO = null;
ServiceResponse<StoreWidgetDTO> storeWidget = this.storeWidgetApiService.getStoreWidget(storeWidgetId);
if(storeWidget.isSuccess()) {
if (storeWidget.getResult() != null) {
storeResouceVO = new StoreResouceVO();
storeResouceVO.setStoreResourceId(storeWidgetId);
storeResouceVO.setAuthMode(storeWidget.getResult().getAuthMode());
storeResouceVO.setSearchParam(storeWidget.getResult().getSearchParam());
storeResouceVO.setWriteBackParam(storeWidget.getResult().getWriteBackParam());
}
}
return storeResouceVO;
}
private ServiceResponse<Integer> saveStoreWidget(StoreResouceQO storeResouce) {
StoreWidgetDTO storeWidgetDTO = new StoreWidgetDTO();
storeWidgetDTO.setAuthMode(storeResouce.getAuthMode());
storeWidgetDTO.setSearchParam(storeResouce.getSearchParam());
storeWidgetDTO.setStoreWidgetId(storeResouce.getStoreResourceId());
storeWidgetDTO.setWriteBackParam(storeResouce.getWriteBackParam());
return this.storeWidgetApiService.saveAuthStoreWidget(storeWidgetDTO);
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/AppResourceQO.java 0 → 100644
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 Integer appName;
private List<AppResourceQO> child;
public Integer getAppId() {
return appId;
}
public void setAppId(Integer appId) {
this.appId = appId;
}
public Integer getAppName() {
return appName;
}
public void setAppName(Integer 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/OrderResourceQO.java 0 → 100644
package com.gic.auth.web.qo;
import java.io.Serializable;
import java.util.List;
/**
*
* @Description:
* @author zhiwj
* @date 2019-09-26 17:08
*/
public class OrderResourceQO implements Serializable {
/**
* 1：gic 2：达摩微商城 3：微盟微商城
*/
private Integer channel;
/**
* channel:2 或者 channel:3时 传店铺ids，
*/
private List<Integer> storeContent;
private StoreResouceQO storeResouce;
public Integer getChannel() {
return channel;
}
public void setChannel(Integer channel) {
this.channel = channel;
}
public List<Integer> getStoreContent() {
return storeContent;
}
public void setStoreContent(List<Integer> storeContent) {
this.storeContent = storeContent;
}
public StoreResouceQO getStoreResouce() {
return storeResouce;
}
public void setStoreResouce(StoreResouceQO storeResouce) {
this.storeResouce = storeResouce;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/ResourceQO.java
......@@ -2,6 +2,7 @@ package com.gic.auth.web.qo;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.List;
/**
*
......@@ -59,7 +60,9 @@ public class ResourceQO implements Serializable {
/**
* 订单资源
*/
private Long orderResource;
private List<OrderResourceQO> orderResource;
private List<AppResourceQO> appResource;
public Integer getResourceId() {
return resourceId;
......@@ -125,11 +128,19 @@ public class ResourceQO implements Serializable {
this.goodsResource = goodsResource;
}
public Long getOrderResource() {
public List<OrderResourceQO> getOrderResource() {
return orderResource;
}
public void setOrderResource(Long orderResource) {
public void setOrderResource(List<OrderResourceQO> orderResource) {
this.orderResource = orderResource;
}
public List<AppResourceQO> getAppResource() {
return appResource;
}
public void setAppResource(List<AppResourceQO> appResource) {
this.appResource = appResource;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/AppResourceVO.java 0 → 100644
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 Integer appName;
private List<AppResourceVO> child;
public Integer getAppId() {
return appId;
}
public void setAppId(Integer appId) {
this.appId = appId;
}
public Integer getAppName() {
return appName;
}
public void setAppName(Integer 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/OrderResourceVO.java 0 → 100644
package com.gic.auth.web.vo;
import java.io.Serializable;
import java.util.List;
/**
*
* @Description:
* @author zhiwj
* @date 2019-09-27 10:17
*/
public class OrderResourceVO implements Serializable {
private static final long serialVersionUID = -4464992062479250749L;
/**
* 1：gic 2：达摩微商城 3：微盟微商城
*/
private Integer channel;
/**
* channel:2 或者 channel:3时 传店铺ids，
*/
private List<Integer> storeContent;
private StoreResouceVO storeResouce;
public Integer getChannel() {
return channel;
}
public void setChannel(Integer channel) {
this.channel = channel;
}
public List<Integer> getStoreContent() {
return storeContent;
}
public void setStoreContent(List<Integer> storeContent) {
this.storeContent = storeContent;
}
public StoreResouceVO getStoreResouce() {
return storeResouce;
}
public void setStoreResouce(StoreResouceVO storeResouce) {
this.storeResouce = storeResouce;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ResourceVO.java
package com.gic.auth.web.vo;
import java.io.Serializable;
import java.util.List;
/**
*
......@@ -47,30 +48,10 @@ public class ResourceVO implements Serializable{
/**
* 订单资源
[
{
"channel":1, // 渠道 1：线下门店， 2:达摩微商城， 3：微盟微商城
"storeContent":1 // 门店id或门店选择器id， 多个逗号隔开
}
]
*/
private String orderResource;
/**
* 应用资源
[
{
appId:1, // 应用id
appName:微商城 // 应用名称
child:[
appId: 10, // 子应用id
appName: 短信发送 // 子应用名称
]
}
]
*/
private String appResource;
private List<OrderResourceVO> orderResource;
private List<AppResourceVO> appResource;
private Integer userResourceCount;
private StoreResouceVO storeResouce;
......@@ -131,19 +112,19 @@ public class ResourceVO implements Serializable{
this.storeResource = storeResource;
}
public String getOrderResource() {
public List<OrderResourceVO> getOrderResource() {
return orderResource;
}
public void setOrderResource(String orderResource) {
public void setOrderResource(List<OrderResourceVO> orderResource) {
this.orderResource = orderResource;
}
public String getAppResource() {
public List<AppResourceVO> getAppResource() {
return appResource;
}
public void setAppResource(String appResource) {
public void setAppResource(List<AppResourceVO> appResource) {
this.appResource = appResource;
}
......@@ -155,11 +136,11 @@ public class ResourceVO implements Serializable{
this.userResourceCount = userResourceCount;
}
public void setStoreResouce(StoreResouceVO storeResouce) {
this.storeResouce = storeResouce;
}
public StoreResouceVO getStoreResouce() {
return storeResouce;
}
public void setStoreResouce(StoreResouceVO storeResouce) {
this.storeResouce = storeResouce;
}
}
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