Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-webapp-plug into developer

pom.xml

@@ -155,6 +155,11 @@
             <artifactId>gic-mall-share-api</artifactId>
             <version>${gic-mall-share-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic </groupId>
+            <artifactId>gic-platform-auth-api </artifactId>
+            <version>${gic-platform-auth-api} </version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/gic/plug/web/controller/ScreeningController.java

 package com.gic.plug.web.controller;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.dto.ResourceDTO;
+import com.gic.auth.dto.UserResourceDTO;
+import com.gic.auth.service.ResourceApiService;
+import com.gic.auth.service.UserResourceApiService;
+import com.gic.plug.web.vo.StoreResourceVO;
+import com.gic.store.dto.StoreWidgetDTO;
+import com.gic.store.service.StoreWidgetApiService;
+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.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.constants.Constants;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.goods.api.util.Constant;
 import com.gic.plug.web.strategy.init.StrategyInit;
-import com.gic.plug.web.vo.StoreResourceVO;
 import com.gic.search.business.api.constant.enums.OperateEnum;
-import com.gic.store.dto.StoreWidgetDTO;
-import com.gic.store.service.StoreWidgetApiService;
 import com.gic.widget.screening.api.dto.EsScreeningChainDetailDTO;
 import com.gic.widget.screening.api.dto.EsScreeningEnterpriseCategorySceneInfoDTO;
 import com.gic.widget.screening.api.dto.EsScreeningTemplateDTO;
 import com.gic.widget.screening.api.service.EsScreeningInitService;
 import com.gic.widget.screening.api.service.EsScreeningTemplateService;
-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.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
 
 /**
  *
@@ -48,6 +54,10 @@ public class ScreeningController {
     private StrategyInit strategyInit;
     @Autowired
     private StoreWidgetApiService storeWidgetApiService;
+    @Autowired
+    private UserResourceApiService userResourceApiService;
+    @Autowired
+    private ResourceApiService resourceApiService;
 
     /**
      * @return
@@ -132,11 +142,11 @@ public class ScreeningController {
     @ResponseBody
     public RestResponse getUserStoreResouce() throws ClassNotFoundException {
         if(UserDetailUtils.getUserDetail().getUserInfo().getSuperAdmin() != 1){
-            Long storeResource = UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource();
-            if(storeResource == null){
-                return RestResponse.success(new StoreResourceVO());
-            }
-            ServiceResponse<StoreWidgetDTO> storeWidget = this.storeWidgetApiService.getStoreWidget(storeResource.intValue());
+            ServiceResponse<UserResourceDTO> resource = this.userResourceApiService.getResourceByUserId(UserDetailUtils.getUserDetail().getUserId());
+            if (resource.isSuccess() && resource.getResult() != null) {
+                ServiceResponse<ResourceDTO> serviceResource = this.resourceApiService.getResource(resource.getResult().getResourceId());
+                if(serviceResource.isSuccess() && serviceResource.getResult() != null){
+                    ServiceResponse<StoreWidgetDTO> storeWidget = this.storeWidgetApiService.getStoreWidget(serviceResource.getResult().getStoreResource().intValue());
                     if(storeWidget.isSuccess() && storeWidget.getResult() != null){
                         StoreResourceVO vo = new StoreResourceVO();
                         vo.setAuthMode(storeWidget.getResult().getAuthMode());
@@ -145,6 +155,8 @@ public class ScreeningController {
                         return RestResponse.success(vo);
                     }
                 }
+            }
+        }
         return RestResponse.success(new StoreResourceVO());
     }
 

src/main/java/com/gic/plug/web/controller/StoreFieldController.java

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.gic.store.utils.StoreRedisKeyUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -111,12 +112,13 @@ public class StoreFieldController {
     }
 
     private List<StoreFieldRegionVO> transferDtoToVo(List<StoreFieldDTO> dtoList, Integer enterpriseId) {
+
         String key = "enterprise:store:storeField:" + enterpriseId + ":";
         List<StoreFieldRegionVO> voList = new ArrayList<>(dtoList.size());
         for (StoreFieldDTO dto : dtoList) {
             //不需要文本类型字段
             if (dto.getStoreFieldType().intValue() != StoreFieldTypeEnum.TEXT.getCode()) {
-                Object obj = RedisUtil.getCache(key + dto.getStoreFieldId());
+                Object obj = RedisUtil.getCache(StoreRedisKeyUtils.getStoreFieldKey(enterpriseId, dto.getStoreFieldId()));
                 if (obj != null) {
                     StoreFieldRegionVO vo = EntityUtil.changeEntityNew(StoreFieldRegionVO.class, dto);
                     vo.setStoreFieldKey(obj.toString());

src/main/resources/dubbo-gic-webapp-plug.xml

@@ -57,5 +57,7 @@
     <dubbo:reference interface="com.gic.store.service.StoreWidgetApiService" id="storeWidgetApiService" timeout="60000" retries="0" />
     <dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="shopApiService" timeout="10000" retries="0" />
     <dubbo:reference interface="com.gic.member.config.api.service.AppletsConfigApiService" id="appletsConfigApiService" timeout="10000" retries="0" />
+    <dubbo:reference interface="com.gic.auth.service.UserResourceApiService" id="userResourceApiService" timeout="10000" retries="0" />
+    <dubbo:reference interface="com.gic.auth.service.ResourceApiService" id="resourceApiService" timeout="10000" retries="0" />
 
 </beans>
\ No newline at end of file