Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
Imagedx
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
VideoAIService
Imagedx
Commits
5749f15e
Commit
5749f15e
authored
May 26, 2021
by
yzm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复bug
parent
e8e0764e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
src/main/java/im/zhaojun/system/controller/TrafficStatisticsController.java
...haojun/system/controller/TrafficStatisticsController.java
+1
-0
src/main/resources/static/js/util/http_util.js
src/main/resources/static/js/util/http_util.js
+12
-1
No files found.
src/main/java/im/zhaojun/system/controller/TrafficStatisticsController.java
View file @
5749f15e
...
...
@@ -519,6 +519,7 @@ public class TrafficStatisticsController {
@GetMapping
(
"/fielagent"
)
@ResponseBody
protected
void
fielagent
(
@RequestParam
(
"ftpPath"
)
String
ftpPath
,
HttpServletRequest
request
,
HttpServletResponse
response
)
{
long
startTime
=
System
.
currentTimeMillis
();
FileInputStream
hFile
=
null
;
...
...
src/main/resources/static/js/util/http_util.js
View file @
5749f15e
...
...
@@ -168,4 +168,15 @@ $.ajaxSetup({
}
}
}
});
\ No newline at end of file
});
function
timestampToTime
(
timestamp
)
{
//转化成YYYYMMDDhhmmss格式的时间戳
var
date
=
new
Date
(
timestamp
),
//时间戳为10位需*1000,时间戳为13位的话不需乘1000
Y
=
date
.
getFullYear
()
+
'
-
'
,
M
=
(
date
.
getMonth
()
+
1
<
10
?
'
0
'
+
(
date
.
getMonth
()
+
1
)
:
date
.
getMonth
()
+
1
)
+
'
-
'
,
D
=
date
.
getDate
()
+
'
-
'
,
h
=
date
.
getHours
()
+
'
:
'
,
m
=
date
.
getMinutes
()
+
'
:
'
,
s
=
date
.
getSeconds
();
return
Y
+
M
+
D
+
h
+
m
+
s
;
}
\ 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