Skip to content

G
gic-platform-enterprise
Commit 74be57f2 by zhiwj
Options

Merge branch 'developer' of… 

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
parents 9c2481d7 08912007
Showing with 44 additions and 78 deletions
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/AppletServiceConfigController.java
package com.gic.enterprise.web.controller;
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.dto.ChannelResourceDTO;
import com.gic.auth.service.ResourceApiService;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.download.utils.log.LogUtils;
import com.gic.enterprise.constant.applet.AppletServiceConfigEnum;
......@@ -12,10 +14,6 @@ import com.gic.enterprise.qo.AppletServiceConfigQO;
import com.gic.enterprise.service.AppletServiceConfigApiService;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
*
......@@ -28,27 +26,15 @@ public class AppletServiceConfigController {
@Autowired
private AppletServiceConfigApiService appletServiceConfigApiService;
@Autowired
private ResourceApiService resourceApiService;
@RequestMapping("list-applet")
public RestResponse listApplet(AppletServiceConfigQO appletServiceConfigQO) {
ChannelResourceDTO channelResourceDTO = resourceApiService.getChannelResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
if (channelResourceDTO == null || CollectionUtils.isEmpty(channelResourceDTO.getAppletConfigIdList())) {
return RestResponse.success(new Page<>());
}
appletServiceConfigQO.setConfigIdList(channelResourceDTO.getAppletConfigIdList());
ServiceResponse<Page<AppletServiceConfigDTO>> serviceResponse = appletServiceConfigApiService.listApplet(UserDetailUtils.getUserDetail().getEnterpriseId(), appletServiceConfigQO);
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("list-service")
public RestResponse listService(AppletServiceConfigQO appletServiceConfigQO) {
ChannelResourceDTO channelResourceDTO = resourceApiService.getChannelResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
if (channelResourceDTO == null || CollectionUtils.isEmpty(channelResourceDTO.getServiceConfigIdList())) {
return RestResponse.success(new Page<>());
}
appletServiceConfigQO.setConfigIdList(channelResourceDTO.getServiceConfigIdList());
ServiceResponse<Page<AppletServiceConfigDTO>> serviceResponse = appletServiceConfigApiService.listService(UserDetailUtils.getUserDetail().getEnterpriseId(), appletServiceConfigQO);
return ResultControllerUtils.commonResult(serviceResponse);
}
......
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java
package com.gic.enterprise.web.controller;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
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.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.ChannelResourceDTO;
import com.gic.auth.service.ResourceApiService;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.data.api.dto.*;
......@@ -36,20 +49,6 @@ import com.gic.store.dto.StoreSearchDTO;
import com.gic.store.service.ProvincesApiService;
import com.gic.store.service.StoreApiService;
import com.gic.store.service.StoreWidgetApiService;
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 java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
......@@ -77,8 +76,6 @@ public class IndexModuleController {
@Autowired
private MemberDataApiService memberDataApiService;
@Autowired
private ResourceApiService resourceApiService;
@Autowired
private MemberCardApiService memberCardApiService;
@Autowired
private AppletsConfigApiService appletsConfigApiService;
......@@ -148,7 +145,7 @@ public class IndexModuleController {
ServiceResponse<List<ProvinceDTO>> serviceResponse = this.provincesApiService.selectAllProvince();
List<Integer> authStoreIdList = new ArrayList<>();
if(UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1){
ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource().intValue());
ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId());
if(authResponse.isSuccess()){
authStoreIdList = authResponse.getResult();
}
......@@ -214,7 +211,7 @@ public class IndexModuleController {
}
List<Integer> authStoreIdList = new ArrayList<>();
if(UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1){
ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource().intValue());
ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId());
if(authResponse.isSuccess()){
authStoreIdList = authResponse.getResult();
}
......@@ -308,52 +305,35 @@ public class IndexModuleController {
@RequestMapping("list-resource")
public RestResponse listResource(){
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
Integer userId = UserDetailUtils.getUserDetail().getUserId();
ServiceResponse<ChannelResourceDTO> response = this.resourceApiService.getChannelResourceByUserId(userId);
List<OwnerMemberCardDTO> memberCardList = memberCardApiService.getAll(enterpriseId).getResult();
List<AppletsConfigSimpleOutputDTO> appletList = appletsConfigApiService.listValidAppletConfigAppId(enterpriseId).getResult();
List<ServiceConfigSimpleOutputDTO> serviceList = serviceConfigApiService.listValidServiceConfigAppId(enterpriseId).getResult();
Map<String, Object> result = new HashMap<>();
List<Long> appletConfigIdList = response.getResult().getAppletConfigIdList();
List<Long> serviceConfigIdList = response.getResult().getServiceConfigIdList();
List<Long> cardConfigIdList = response.getResult().getCardConfigIdList();
List<ResouceVO> applet = new ArrayList<>();
List<ResouceVO> service = new ArrayList<>();
List<ResouceVO> card = new ArrayList<>();
if(CollectionUtils.isNotEmpty(appletConfigIdList) && CollectionUtils.isNotEmpty(appletList)){
for(Long s : appletConfigIdList){
for(AppletsConfigSimpleOutputDTO dto : appletList){
if(s.longValue() == dto.getAppletConfigId().longValue()){
ResouceVO vo = new ResouceVO();
vo.setId(s);
vo.setName(dto.getAppletConfigName());
applet.add(vo);
}
}
if( CollectionUtils.isNotEmpty(appletList)){
for(AppletsConfigSimpleOutputDTO dto : appletList){
ResouceVO vo = new ResouceVO();
vo.setId(dto.getAppletConfigId());
vo.setName(dto.getAppletConfigName());
applet.add(vo);
}
}
if(CollectionUtils.isNotEmpty(serviceConfigIdList) && CollectionUtils.isNotEmpty(serviceList)){
for(Long s : serviceConfigIdList){
for(ServiceConfigSimpleOutputDTO dto : serviceList){
if(s.longValue() == dto.getServiceConfigId().longValue()){
ResouceVO vo = new ResouceVO();
vo.setId(s);
vo.setName(dto.getServiceConfigName());
service.add(vo);
}
}
if(CollectionUtils.isNotEmpty(serviceList)){
for(ServiceConfigSimpleOutputDTO dto : serviceList){
ResouceVO vo = new ResouceVO();
vo.setId(dto.getServiceConfigId());
vo.setName(dto.getServiceConfigName());
service.add(vo);
}
}
if(CollectionUtils.isNotEmpty(cardConfigIdList) && CollectionUtils.isNotEmpty(memberCardList)){
for(Long s : cardConfigIdList){
for(OwnerMemberCardDTO dto : memberCardList){
if(s.longValue() == dto.getCardConfigId().longValue()){
ResouceVO vo = new ResouceVO();
vo.setId(s);
vo.setName(dto.getCardName());
card.add(vo);
}
}
if(CollectionUtils.isNotEmpty(memberCardList)){
for(OwnerMemberCardDTO dto : memberCardList){
ResouceVO vo = new ResouceVO();
vo.setId(dto.getCardConfigId());
vo.setName(dto.getCardName());
card.add(vo);
}
}
result.put("card", card);
......@@ -389,7 +369,7 @@ public class IndexModuleController {
storeSearchDTO.setStatus(status);
storeSearchDTO.setProvinceId(provinceId);
if(UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1){
Long storeResource = UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource();
Long storeResource = Long.valueOf(UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId());
if(storeResource != null){
storeSearchDTO.setStoreResource(storeResource);
}
......@@ -405,7 +385,7 @@ public class IndexModuleController {
storeSearchDTO.setProvinceId(provinceId);
storeSearchDTO.setCityId(cityId);
if(UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1){
Long storeResource = UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource();
Long storeResource = Long.valueOf(UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId());
if(storeResource != null){
storeSearchDTO.setStoreResource(storeResource);
}
......@@ -418,10 +398,10 @@ public class IndexModuleController {
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
List<Integer> authStoreIdList = new ArrayList<>();
if(UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1){
if (UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource() == null) {
if (UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId() == null) {
authStoreIdList.add(-1);
} else {
ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource().intValue());
ServiceResponse<List<Integer>> authResponse = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, UserDetailUtils.getUserDetail().getStoreResourceInfo().getStoreResourceId());
if(authResponse.isSuccess()){
authStoreIdList = authResponse.getResult();
}
......
gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml
......@@ -123,7 +123,7 @@
<dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="shopApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.mall.api.service.MallActivityThemeApiService" id="mallActivityThemeApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.data.api.service.StoreStatisicsApiService" id="storeStatisicsApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.auth.service.ResourceApiService" id="resourceApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.auth.service.ResourceGroupApiService" id="resourceGroupApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.data.api.service.MemberDataApiService" id="memberDataApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.member.config.api.service.MemberCardApiService" id="memberCardApiService" 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