Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-cloud
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
data-hook
gic-cloud
Commits
8bcff9d8
Commit
8bcff9d8
authored
Jun 04, 2020
by
陶光胜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
取数平台权限
parent
2c7c0e83
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
DownloadRecordDao.xml
...k-service/src/main/resources/mapper/DownloadRecordDao.xml
+3
-1
DownloadTaskController.java
...a/com/gic/cloud/data/hook/web/DownloadTaskController.java
+4
-4
No files found.
gic-cloud-data-hook-service/src/main/resources/mapper/DownloadRecordDao.xml
View file @
8bcff9d8
...
...
@@ -40,7 +40,9 @@
<include
refid=
"queryTables"
/>
<include
refid=
"queryJoins"
/>
WHERE
q.user_id = #{userId}
<if
test=
"userId != null and userId !=''"
>
q.user_id = #{userId}
</if>
<if
test=
"startTime != null"
>
AND q.download_time
<![CDATA[ >= ]]>
#{startTime}
</if>
...
...
gic-cloud-data-hook/src/main/java/com/gic/cloud/data/hook/web/DownloadTaskController.java
View file @
8bcff9d8
...
...
@@ -6,6 +6,7 @@ import com.gic.cloud.data.hook.api.dto.DownloadTask;
import
com.gic.cloud.data.hook.api.dto.RiskModeRecord
;
import
com.gic.cloud.data.hook.api.entity.GeneralResult
;
import
com.gic.cloud.data.hook.api.service.IDownloadTaskService
;
import
com.gic.web.common.utils.SessionContextUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
...
...
@@ -89,8 +90,9 @@ public class DownloadTaskController {
String
finEndTimeText
=
StringUtils
.
isNoneBlank
(
endTimeText
)
?
endTimeText
+
" 23:59:59"
:
""
;
Date
startTime
=
finStartTimeText
.
equals
(
""
)
?
null
:
datetimeFormatter
.
parse
(
finStartTimeText
);
Date
endTime
=
finEndTimeText
.
equals
(
""
)
?
null
:
datetimeFormatter
.
parse
(
finEndTimeText
);
System
.
out
.
println
(
startTime
);
System
.
out
.
println
(
endTime
);
if
(
SessionContextUtils
.
getLoginUser
().
getSuperAdmin
()
==
1
){
userId
=
null
;
}
return
this
.
downloadTaskService
.
getDownloadRecordPage
(
userId
,
enterpriseId
,
startTime
,
endTime
,
queryDataType
,
fuzzyRange
,
fuzzy
,
pageNum
,
pageSize
);
}
...
...
@@ -112,8 +114,6 @@ public class DownloadTaskController {
String
finEndTimeText
=
StringUtils
.
isNoneBlank
(
endTimeText
)
?
endTimeText
+
" 23:59:59"
:
""
;
Date
startTime
=
finStartTimeText
.
equals
(
""
)
?
null
:
datetimeFormatter
.
parse
(
finStartTimeText
);
Date
endTime
=
finEndTimeText
.
equals
(
""
)
?
null
:
datetimeFormatter
.
parse
(
finEndTimeText
);
// Date startTime = startTimeText.equals("") ? null : datetimeFormatter.parse(startTimeText);
// Date endTime = endTimeText.equals("") ? null : datetimeFormatter.parse(endTimeText);
return
this
.
downloadTaskService
.
getRiskModeRecordPage
(
enterpriseId
,
startTime
,
endTime
,
riskDuration
,
fuzzyRange
,
fuzzy
,
pageNum
,
pageSize
);
}
...
...
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