Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-webapp-plug
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-webapp-plug
Commits
90ebd4b2
Commit
90ebd4b2
authored
May 18, 2020
by
何文超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix
parent
5df575c7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
29 deletions
+16
-29
ScreeningController.java
...java/com/gic/plug/web/controller/ScreeningController.java
+16
-29
No files found.
src/main/java/com/gic/plug/web/controller/ScreeningController.java
View file @
90ebd4b2
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.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.search.business.api.constant.enums.OperateEnum
;
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.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
;
/**
...
...
@@ -80,9 +65,11 @@ public class ScreeningController {
if
(
Constants
.
STORE_SCENECODE
.
equals
(
sceneCode
))
{
enterpriseId
=
Constants
.
INDEX_ENTERPRISEID
;
}
if
(
Constant
.
ERP_GOODS_SCREEN
.
equals
(
sceneCode
)
||
Constant
.
WEIMOB_GOODS_SCREEN
.
equals
(
sceneCode
))
{
if
(
Constant
.
ERP_GOODS_SCREEN
.
equals
(
sceneCode
)
||
Constant
.
WEIMOB_GOODS_SCREEN
.
equals
(
sceneCode
)
||
Constant
.
CHANNEL_CODE_MALL
.
equals
(
sceneCode
)
)
{
//TODO
enterpriseId
=
"goods-test-"
+
enterpriseId
;
if
(
"1129"
.
equals
(
enterpriseId
))
{
enterpriseId
=
"goods-test-1129"
;
}
}
List
<
EsScreeningEnterpriseCategorySceneInfoDTO
>
list
=
this
.
esScreeningInitService
.
queryEsScreeningByEnterpriseAndScene
(
enterpriseId
,
sceneCode
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment