Skip to content

G
gic-platform-auth
Commit b8389d07 by guojuxing
Options

Merge remote-tracking branch 'origin/developer' into developer

parents 1623d626 c93096c6
Showing with 63 additions and 48 deletions
gic-platform-auth-api/src/main/java/com/gic/auth/dto/ResourceDTO.java
......@@ -46,6 +46,11 @@ public class ResourceDTO implements Serializable {
private Long storeResource;
/**
* 商品资源
*/
private Long goodsResource;
/**
* 订单资源
[
{
......@@ -132,6 +137,14 @@ public class ResourceDTO implements Serializable {
this.storeResource = storeResource;
}
public Long getGoodsResource() {
return goodsResource;
}
public void setGoodsResource(Long goodsResource) {
this.goodsResource = goodsResource;
}
public Long getOrderResource() {
return orderResource;
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceApiServiceImpl.java
......@@ -19,6 +19,7 @@ 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.List;
import java.util.Map;
......@@ -43,6 +44,7 @@ public class ResourceApiServiceImpl implements ResourceApiService {
private OrderAppResourceService orderAppResourceService;
@Override
@Transactional
public ServiceResponse<Integer> saveOrUpdateResource(ResourceDTO resourceDTO) {
boolean repeat = resourceService.isRepeatByResourceName(resourceDTO.getEnterpriseId(), resourceDTO.getResourceName(), resourceDTO.getResourceId());
if (repeat) {
......@@ -59,9 +61,9 @@ public class ResourceApiServiceImpl implements ResourceApiService {
OrderAppResourceDTO appDTO = new OrderAppResourceDTO();
appDTO.setEnterpriseId(resourceDTO.getEnterpriseId());
appDTO.setType(OrderOrAppEnum.ORDER.getCode());
appDTO.setContent(resourceDTO.getOrderResourceJson());
appDTO.setContent(resourceDTO.getAppResourceJson());
Integer app = orderAppResourceService.save(appDTO);
resourceDTO.setOrderResource(app.longValue());
resourceDTO.setAppResource(app.longValue());
if (resourceDTO.getResourceId() == null) {
// save
resourceService.save(resourceDTO);
......@@ -70,7 +72,7 @@ public class ResourceApiServiceImpl implements ResourceApiService {
// 删除老的订单资源和应用资源
TabSysResource resource = resourceService.getResource(resourceDTO.getResourceId());
orderAppResourceService.del(resource.getOrderResource());
orderAppResourceService.del(resource.getOrderResource());
orderAppResourceService.del(resource.getAppResource());
resourceService.update(resourceDTO);
}
return ServiceResponse.success();
......
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java
......@@ -48,19 +48,19 @@ public class ResourceController {
@RequestMapping("/save-resource")
public RestResponse saveResource(@RequestBody ResourceQO resourceQO) {
ResourceDTO resourceDTO = EntityUtil.changeEntityByOrika(ResourceDTO.class, resourceQO);
ResourceDTO resourceDTO = EntityUtil.changeEntityByJSON(ResourceDTO.class, resourceQO);
resourceDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
// 门店资源
ServiceResponse<Integer> storeWidgetResponse = saveStoreWidget(resourceQO.getStoreResouce());
ServiceResponse<Integer> storeWidgetResponse = saveStoreWidget(resourceQO.getStoreResouceJSON());
if(storeWidgetResponse.isSuccess()){
resourceDTO.setStoreResource(storeWidgetResponse.getResult().longValue());
// 订单资源
List<OrderResourceQO> orderResource = resourceQO.getOrderResource();
List<OrderResourceQO> orderResource = resourceQO.getOrderResourceJSON();
JSONArray orderResourceArray = new JSONArray();
for (OrderResourceQO orderResourceQO : orderResource) {
List<Integer> storeIds;
if (OrderResourceChannelEnum.OFFLINE.getCode().equals(orderResourceQO.getChannel())) {
ServiceResponse<Integer> widgetResponse = saveStoreWidget(orderResourceQO.getStoreResouce());
ServiceResponse<Integer> widgetResponse = saveStoreWidget(orderResourceQO.getStoreResouceJSON());
Integer storeId = widgetResponse.getResult();
storeIds = Collections.singletonList(storeId);
} else {
......@@ -68,12 +68,12 @@ public class ResourceController {
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("channel", orderResourceQO.getChannel());
jsonObject.put("storeIds", storeIds);
jsonObject.put("storeContent", storeIds);
orderResourceArray.add(jsonObject);
}
resourceDTO.setOrderResourceJson(JSON.toJSONString(orderResourceArray));
// 应用资源
resourceDTO.setAppResourceJson(JSON.toJSONString(resourceQO.getAppResource()));
resourceDTO.setAppResourceJson(JSON.toJSONString(resourceQO.getAppResourceJSON()));
ServiceResponse<Integer> response = resourceApiService.saveOrUpdateResource(resourceDTO);
if(response.isSuccess()){
......@@ -104,7 +104,7 @@ public class ResourceController {
ServiceResponse<ResourceDTO> response = resourceApiService.getResource(resourceId);
if (response.isSuccess()) {
ResourceDTO dto = response.getResult();
ResourceVO vo = EntityUtil.changeEntityByJSON(ResourceVO.class, dto);
ResourceVO vo = EntityUtil.changeEntity(ResourceVO.class, dto);
StoreResouceVO storeResouceVO = getStoreResouce(dto.getStoreResource().intValue());
vo.setStoreResouce(storeResouceVO);
if (StringUtils.isNotBlank(dto.getOrderResourceJson())) {
......@@ -119,11 +119,11 @@ public class ResourceController {
}
}
}
vo.setOrderResource(orderResourceList);
vo.setOrderResourceJSON(orderResourceList);
}
if (StringUtils.isNotBlank(dto.getAppResourceJson())) {
List<AppResourceVO> appResourceList = JSON.parseArray(dto.getAppResourceJson(), AppResourceVO.class);
vo.setAppResource(appResourceList);
vo.setAppResourceJSON(appResourceList);
}
return RestResponse.success(vo);
}
......
gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/AppResourceQO.java
......@@ -13,7 +13,7 @@ public class AppResourceQO implements Serializable {
private static final long serialVersionUID = 3106090790767253020L;
private Integer appId;
private Integer appName;
private String appName;
private List<AppResourceQO> child;
public Integer getAppId() {
......@@ -24,11 +24,11 @@ public class AppResourceQO implements Serializable {
this.appId = appId;
}
public Integer getAppName() {
public String getAppName() {
return appName;
}
public void setAppName(Integer appName) {
public void setAppName(String appName) {
this.appName = appName;
}
......
gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/OrderResourceQO.java
......@@ -21,7 +21,7 @@ public class OrderResourceQO implements Serializable {
*/
private List<Integer> storeContent;
private StoreResouceQO storeResouce;
private StoreResouceQO storeResouceJSON;
public Integer getChannel() {
return channel;
......@@ -39,11 +39,11 @@ public class OrderResourceQO implements Serializable {
this.storeContent = storeContent;
}
public StoreResouceQO getStoreResouce() {
return storeResouce;
public StoreResouceQO getStoreResouceJSON() {
return storeResouceJSON;
}
public void setStoreResouce(StoreResouceQO storeResouce) {
this.storeResouce = storeResouce;
public void setStoreResouceJSON(StoreResouceQO storeResouceJSON) {
this.storeResouceJSON = storeResouceJSON;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/ResourceQO.java
......@@ -50,7 +50,7 @@ public class ResourceQO implements Serializable {
* 门店资源
*/
// private Long storeResource;
private StoreResouceQO storeResouce;
private StoreResouceQO storeResouceJSON;
/**
* 商品资源
......@@ -60,9 +60,9 @@ public class ResourceQO implements Serializable {
/**
* 订单资源
*/
private List<OrderResourceQO> orderResource;
private List<OrderResourceQO> orderResourceJSON;
private List<AppResourceQO> appResource;
private List<AppResourceQO> appResourceJSON;
public Integer getResourceId() {
return resourceId;
......@@ -112,12 +112,12 @@ public class ResourceQO implements Serializable {
this.appletResource = appletResource;
}
public StoreResouceQO getStoreResouce() {
return storeResouce;
public StoreResouceQO getStoreResouceJSON() {
return storeResouceJSON;
}
public void setStoreResouce(StoreResouceQO storeResouce) {
this.storeResouce = storeResouce;
public void setStoreResouceJSON(StoreResouceQO storeResouceJSON) {
this.storeResouceJSON = storeResouceJSON;
}
public Long getGoodsResource() {
......@@ -128,19 +128,19 @@ public class ResourceQO implements Serializable {
this.goodsResource = goodsResource;
}
public List<OrderResourceQO> getOrderResource() {
return orderResource;
public List<OrderResourceQO> getOrderResourceJSON() {
return orderResourceJSON;
}
public void setOrderResource(List<OrderResourceQO> orderResource) {
this.orderResource = orderResource;
public void setOrderResourceJSON(List<OrderResourceQO> orderResourceJSON) {
this.orderResourceJSON = orderResourceJSON;
}
public List<AppResourceQO> getAppResource() {
return appResource;
public List<AppResourceQO> getAppResourceJSON() {
return appResourceJSON;
}
public void setAppResource(List<AppResourceQO> appResource) {
this.appResource = appResource;
public void setAppResourceJSON(List<AppResourceQO> appResourceJSON) {
this.appResourceJSON = appResourceJSON;
}
}
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/AppResourceVO.java
......@@ -13,7 +13,7 @@ public class AppResourceVO implements Serializable {
private static final long serialVersionUID = -495359852430529567L;
private Integer appId;
private Integer appName;
private String appName;
private List<AppResourceVO> child;
public Integer getAppId() {
......@@ -24,11 +24,11 @@ public class AppResourceVO implements Serializable {
this.appId = appId;
}
public Integer getAppName() {
public String getAppName() {
return appName;
}
public void setAppName(Integer appName) {
public void setAppName(String appName) {
this.appName = appName;
}
......
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ResourceVO.java
......@@ -49,9 +49,9 @@ public class ResourceVO implements Serializable{
/**
* 订单资源
*/
private List<OrderResourceVO> orderResource;
private List<OrderResourceVO> orderResourceJSON;
private List<AppResourceVO> appResource;
private List<AppResourceVO> appResourceJSON;
private Integer userResourceCount;
private StoreResouceVO storeResouce;
......@@ -112,20 +112,20 @@ public class ResourceVO implements Serializable{
this.storeResource = storeResource;
}
public List<OrderResourceVO> getOrderResource() {
return orderResource;
public List<OrderResourceVO> getOrderResourceJSON() {
return orderResourceJSON;
}
public void setOrderResource(List<OrderResourceVO> orderResource) {
this.orderResource = orderResource;
public void setOrderResourceJSON(List<OrderResourceVO> orderResourceJSON) {
this.orderResourceJSON = orderResourceJSON;
}
public List<AppResourceVO> getAppResource() {
return appResource;
public List<AppResourceVO> getAppResourceJSON() {
return appResourceJSON;
}
public void setAppResource(List<AppResourceVO> appResource) {
this.appResource = appResource;
public void setAppResourceJSON(List<AppResourceVO> appResourceJSON) {
this.appResourceJSON = appResourceJSON;
}
public Integer getUserResourceCount() {
......
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