Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-evaluate
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-evaluate
Commits
8d48f771
Commit
8d48f771
authored
Feb 17, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
门店资源权限
parent
b9f8543d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
119 additions
and
1 deletions
+119
-1
EvaluateManagerController.java
...ic/evaluate/web/controller/EvaluateManagerController.java
+18
-0
EvaluateOverviewController.java
...c/evaluate/web/controller/EvaluateOverviewController.java
+83
-1
ProblemController.java
...va/com/gic/evaluate/web/controller/ProblemController.java
+16
-0
dubbo-gic-evaluate-web.xml
...valuate-web/src/main/resources/dubbo-gic-evaluate-web.xml
+2
-0
No files found.
gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateManagerController.java
View file @
8d48f771
...
...
@@ -2,6 +2,9 @@ package com.gic.evaluate.web.controller;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.auth.constant.ResourceHoldEnum
;
import
com.gic.auth.dto.OrderResourceDTO
;
import
com.gic.auth.service.ResourceApiService
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
...
...
@@ -14,6 +17,7 @@ import com.gic.evaluate.qo.EvaluateQO;
import
com.gic.evaluate.service.EvaluateManageApiService
;
import
com.gic.evaluate.web.vo.UserReplyVO
;
import
com.gic.store.service.StoreWidgetApiService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -34,15 +38,29 @@ public class EvaluateManagerController {
private
EvaluateManageApiService
evaluateManageApiService
;
@Autowired
private
StoreWidgetApiService
storeWidgetApiService
;
@Autowired
private
ResourceApiService
resourceApiService
;
@RequestMapping
(
"/list-evaluate"
)
public
RestResponse
listEvaluate
(
EvaluateQO
evaluateQO
)
{
evaluateQO
.
setEnterpriseId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
());
// 判断权限
OrderResourceDTO
orderResourceDTO
=
resourceApiService
.
getOrderResourceByUserId
(
UserDetailUtils
.
getUserDetail
().
getUserId
()).
getResult
();
if
(
ResourceHoldEnum
.
DART
.
getCode
().
equals
(
orderResourceDTO
.
getType
()))
{
if
(
CollectionUtils
.
isEmpty
(
orderResourceDTO
.
getStoreIdList
()))
{
return
RestResponse
.
success
();
}
else
{
evaluateQO
.
setStoreIdList
(
orderResourceDTO
.
getStoreIdList
());
}
}
if
(
evaluateQO
.
getStoreWidgetId
()
!=
null
)
{
ServiceResponse
<
List
<
Integer
>>
serviceResponse
=
storeWidgetApiService
.
listStoreIdByStoreWidgetId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
evaluateQO
.
getStoreWidgetId
());
evaluateQO
.
setStoreIdList
(
serviceResponse
.
getResult
());
}
if
(
StringUtils
.
isNotBlank
(
evaluateQO
.
getStartTime
()))
{
evaluateQO
.
setStartTime
(
evaluateQO
.
getStartTime
()
+
" 00:00:00"
);
}
...
...
gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateOverviewController.java
View file @
8d48f771
...
...
@@ -2,6 +2,9 @@ package com.gic.evaluate.web.controller;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.auth.constant.ResourceHoldEnum
;
import
com.gic.auth.dto.StoreResourceDTO
;
import
com.gic.auth.service.ResourceApiService
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
import
com.gic.enterprise.utils.UserDetailUtils
;
...
...
@@ -9,11 +12,15 @@ import com.gic.evaluate.qo.StoreScoreQO;
import
com.gic.evaluate.qo.StoreTrendQO
;
import
com.gic.evaluate.service.EvaluateOverviewApiService
;
import
com.gic.store.service.StoreWidgetApiService
;
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
;
import
java.util.*
;
import
java.util.Collections
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
/**
* @author zhiwj
...
...
@@ -27,10 +34,21 @@ public class EvaluateOverviewController {
private
EvaluateOverviewApiService
evaluateOverviewApiService
;
@Autowired
private
StoreWidgetApiService
storeWidgetApiService
;
@Autowired
private
ResourceApiService
resourceApiService
;
@RequestMapping
(
"/evaluate-chart1"
)
public
RestResponse
evaluateChart1
(
String
startTime
,
String
endTime
,
Integer
storeWidgetId
)
{
List
<
Integer
>
storeIdList
=
Collections
.
emptyList
();
// 权限判断
StoreResourceDTO
storeResource
=
resourceApiService
.
getStoreResourceByUserId
(
UserDetailUtils
.
getUserDetail
().
getUserId
()).
getResult
();
if
(
ResourceHoldEnum
.
DART
.
getCode
().
equals
(
storeResource
.
getType
()))
{
if
(
CollectionUtils
.
isEmpty
(
storeResource
.
getStoreIdList
()))
{
return
RestResponse
.
success
();
}
else
{
storeIdList
=
storeResource
.
getStoreIdList
();
}
}
if
(
storeWidgetId
!=
null
)
{
ServiceResponse
<
List
<
Integer
>>
serviceResponse
=
storeWidgetApiService
.
listStoreIdByStoreWidgetId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
storeWidgetId
);
storeIdList
=
serviceResponse
.
getResult
();
...
...
@@ -42,6 +60,15 @@ public class EvaluateOverviewController {
@RequestMapping
(
"/evaluate-chart2"
)
public
RestResponse
evaluateChart2
(
String
startTime
,
String
endTime
,
Integer
storeWidgetId
)
{
List
<
Integer
>
storeIdList
=
Collections
.
emptyList
();
// 权限判断
StoreResourceDTO
storeResource
=
resourceApiService
.
getStoreResourceByUserId
(
UserDetailUtils
.
getUserDetail
().
getUserId
()).
getResult
();
if
(
ResourceHoldEnum
.
DART
.
getCode
().
equals
(
storeResource
.
getType
()))
{
if
(
CollectionUtils
.
isEmpty
(
storeResource
.
getStoreIdList
()))
{
return
RestResponse
.
success
();
}
else
{
storeIdList
=
storeResource
.
getStoreIdList
();
}
}
if
(
storeWidgetId
!=
null
)
{
ServiceResponse
<
List
<
Integer
>>
serviceResponse
=
storeWidgetApiService
.
listStoreIdByStoreWidgetId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
storeWidgetId
);
storeIdList
=
serviceResponse
.
getResult
();
...
...
@@ -53,6 +80,15 @@ public class EvaluateOverviewController {
@RequestMapping
(
"/evaluate-chart3"
)
public
RestResponse
evaluateChart3
(
String
startTime
,
String
endTime
,
Integer
storeWidgetId
)
{
List
<
Integer
>
storeIdList
=
Collections
.
emptyList
();
// 权限判断
StoreResourceDTO
storeResource
=
resourceApiService
.
getStoreResourceByUserId
(
UserDetailUtils
.
getUserDetail
().
getUserId
()).
getResult
();
if
(
ResourceHoldEnum
.
DART
.
getCode
().
equals
(
storeResource
.
getType
()))
{
if
(
CollectionUtils
.
isEmpty
(
storeResource
.
getStoreIdList
()))
{
return
RestResponse
.
success
();
}
else
{
storeIdList
=
storeResource
.
getStoreIdList
();
}
}
if
(
storeWidgetId
!=
null
)
{
ServiceResponse
<
List
<
Integer
>>
serviceResponse
=
storeWidgetApiService
.
listStoreIdByStoreWidgetId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
storeWidgetId
);
storeIdList
=
serviceResponse
.
getResult
();
...
...
@@ -64,6 +100,15 @@ public class EvaluateOverviewController {
@RequestMapping
(
"/evaluate-chart4"
)
public
RestResponse
evaluateChart4
(
String
startTime
,
String
endTime
,
Integer
storeWidgetId
)
{
List
<
Integer
>
storeIdList
=
Collections
.
emptyList
();
// 权限判断
StoreResourceDTO
storeResource
=
resourceApiService
.
getStoreResourceByUserId
(
UserDetailUtils
.
getUserDetail
().
getUserId
()).
getResult
();
if
(
ResourceHoldEnum
.
DART
.
getCode
().
equals
(
storeResource
.
getType
()))
{
if
(
CollectionUtils
.
isEmpty
(
storeResource
.
getStoreIdList
()))
{
return
RestResponse
.
success
();
}
else
{
storeIdList
=
storeResource
.
getStoreIdList
();
}
}
if
(
storeWidgetId
!=
null
)
{
ServiceResponse
<
List
<
Integer
>>
serviceResponse
=
storeWidgetApiService
.
listStoreIdByStoreWidgetId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
storeWidgetId
);
storeIdList
=
serviceResponse
.
getResult
();
...
...
@@ -75,6 +120,16 @@ public class EvaluateOverviewController {
@RequestMapping
(
"/evaluate-store-score"
)
public
RestResponse
evaluateStoreScore
(
StoreScoreQO
storeScoreQO
)
{
storeScoreQO
.
setEnterpriseId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
());
// 权限判断
StoreResourceDTO
storeResource
=
resourceApiService
.
getStoreResourceByUserId
(
UserDetailUtils
.
getUserDetail
().
getUserId
()).
getResult
();
if
(
ResourceHoldEnum
.
DART
.
getCode
().
equals
(
storeResource
.
getType
()))
{
if
(
CollectionUtils
.
isEmpty
(
storeResource
.
getStoreIdList
()))
{
return
RestResponse
.
success
();
}
else
{
storeScoreQO
.
setStoreIdList
(
storeResource
.
getStoreIdList
());
}
}
ServiceResponse
<
Page
<
Map
<
String
,
Object
>>>
serviceResponse
=
evaluateOverviewApiService
.
listStoreScore
(
storeScoreQO
);
ServiceResponse
<
Map
<
String
,
Object
>>
totalStoreScore
=
evaluateOverviewApiService
.
getTotalStoreScore
(
storeScoreQO
);
List
<
Map
<
String
,
Object
>>
result
=
serviceResponse
.
getResult
().
getResult
();
...
...
@@ -85,6 +140,15 @@ public class EvaluateOverviewController {
@RequestMapping
(
"/evaluate-list-trend"
)
public
RestResponse
evaluateListTrend
(
StoreTrendQO
storeTrendQO
)
{
storeTrendQO
.
setEnterpriseId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
());
// 权限判断
StoreResourceDTO
storeResource
=
resourceApiService
.
getStoreResourceByUserId
(
UserDetailUtils
.
getUserDetail
().
getUserId
()).
getResult
();
if
(
ResourceHoldEnum
.
DART
.
getCode
().
equals
(
storeResource
.
getType
()))
{
if
(
CollectionUtils
.
isEmpty
(
storeResource
.
getStoreIdList
()))
{
return
RestResponse
.
success
();
}
else
{
storeTrendQO
.
setStoreIdList
(
storeResource
.
getStoreIdList
());
}
}
ServiceResponse
<
Page
<
Map
<
String
,
Object
>>>
serviceResponse
=
evaluateOverviewApiService
.
listTrend
(
storeTrendQO
);
return
ResultControllerUtils
.
commonResult
(
serviceResponse
);
}
...
...
@@ -92,6 +156,15 @@ public class EvaluateOverviewController {
@RequestMapping
(
"/good-trend-by-date"
)
public
RestResponse
listGoodEvaluateTrendByDate
(
String
startTime
,
String
endTime
,
Integer
storeWidgetId
)
{
List
<
Integer
>
storeIdList
=
Collections
.
emptyList
();
// 权限判断
StoreResourceDTO
storeResource
=
resourceApiService
.
getStoreResourceByUserId
(
UserDetailUtils
.
getUserDetail
().
getUserId
()).
getResult
();
if
(
ResourceHoldEnum
.
DART
.
getCode
().
equals
(
storeResource
.
getType
()))
{
if
(
CollectionUtils
.
isEmpty
(
storeResource
.
getStoreIdList
()))
{
return
RestResponse
.
success
();
}
else
{
storeIdList
=
storeResource
.
getStoreIdList
();
}
}
if
(
storeWidgetId
!=
null
)
{
ServiceResponse
<
List
<
Integer
>>
serviceResponse
=
storeWidgetApiService
.
listStoreIdByStoreWidgetId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
storeWidgetId
);
storeIdList
=
serviceResponse
.
getResult
();
...
...
@@ -103,6 +176,15 @@ public class EvaluateOverviewController {
@RequestMapping
(
"/bad-trend-by-date"
)
public
RestResponse
listBadEvaluateTrendByDate
(
String
startTime
,
String
endTime
,
Integer
storeWidgetId
)
{
List
<
Integer
>
storeIdList
=
Collections
.
emptyList
();
// 权限判断
StoreResourceDTO
storeResource
=
resourceApiService
.
getStoreResourceByUserId
(
UserDetailUtils
.
getUserDetail
().
getUserId
()).
getResult
();
if
(
ResourceHoldEnum
.
DART
.
getCode
().
equals
(
storeResource
.
getType
()))
{
if
(
CollectionUtils
.
isEmpty
(
storeResource
.
getStoreIdList
()))
{
return
RestResponse
.
success
();
}
else
{
storeIdList
=
storeResource
.
getStoreIdList
();
}
}
if
(
storeWidgetId
!=
null
)
{
ServiceResponse
<
List
<
Integer
>>
serviceResponse
=
storeWidgetApiService
.
listStoreIdByStoreWidgetId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
storeWidgetId
);
storeIdList
=
serviceResponse
.
getResult
();
...
...
gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/ProblemController.java
View file @
8d48f771
...
...
@@ -2,6 +2,9 @@ package com.gic.evaluate.web.controller;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.auth.constant.ResourceHoldEnum
;
import
com.gic.auth.dto.StoreResourceDTO
;
import
com.gic.auth.service.ResourceApiService
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
...
...
@@ -12,6 +15,7 @@ import com.gic.evaluate.qo.ProblemQO;
import
com.gic.evaluate.service.ProblemManageApiService
;
import
com.gic.evaluate.web.vo.ProblemUserReplyVO
;
import
com.gic.store.service.StoreWidgetApiService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -32,10 +36,22 @@ public class ProblemController {
private
ProblemManageApiService
problemManageApiService
;
@Autowired
private
StoreWidgetApiService
storeWidgetApiService
;
@Autowired
private
ResourceApiService
resourceApiService
;
@RequestMapping
(
"/list-problem"
)
public
RestResponse
listProblem
(
ProblemQO
problemQO
)
{
problemQO
.
setEnterpriseId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
());
// 权限判断
StoreResourceDTO
storeResource
=
resourceApiService
.
getStoreResourceByUserId
(
UserDetailUtils
.
getUserDetail
().
getUserId
()).
getResult
();
if
(
ResourceHoldEnum
.
DART
.
getCode
().
equals
(
storeResource
.
getType
()))
{
if
(
CollectionUtils
.
isEmpty
(
storeResource
.
getStoreIdList
()))
{
return
RestResponse
.
success
();
}
else
{
problemQO
.
setStoreIdList
(
storeResource
.
getStoreIdList
());
}
}
if
(
problemQO
.
getStoreWidgetId
()
!=
null
)
{
ServiceResponse
<
List
<
Integer
>>
serviceResponse
=
storeWidgetApiService
.
listStoreIdByStoreWidgetId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
problemQO
.
getStoreWidgetId
());
problemQO
.
setStoreIdList
(
serviceResponse
.
getResult
());
...
...
gic-evaluate-web/src/main/resources/dubbo-gic-evaluate-web.xml
View file @
8d48f771
...
...
@@ -26,4 +26,5 @@
<dubbo:reference
interface=
"com.gic.log.api.service.LogApiService"
id=
"logApiService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.enterprise.service.DownloadReportApiService"
id=
"downloadReportApiService"
timeout=
"6000"
retries=
"0"
/>
<dubbo:reference
interface=
"com.gic.auth.service.MenuApiService"
id=
"menuApiService"
timeout=
"6000"
retries=
"0"
/>
<dubbo:reference
interface=
"com.gic.auth.service.ResourceApiService"
id=
"resourceApiService"
timeout=
"6000"
retries=
"0"
/>
</beans>
\ No newline at end of file
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