Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
VideoManager
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
1
Merge Requests
1
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
wangjinjing
VideoManager
Commits
d34943ec
Commit
d34943ec
authored
May 14, 2021
by
wangjinjing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
重新提交
parent
6ca54bf1
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
25 deletions
+13
-25
src/main/java/com/cx/cn/cxquartz/CXQuartzApplication.java
src/main/java/com/cx/cn/cxquartz/CXQuartzApplication.java
+0
-1
src/main/java/com/cx/cn/cxquartz/util/DateUtils.java
src/main/java/com/cx/cn/cxquartz/util/DateUtils.java
+0
-8
src/main/java/com/cx/cn/cxquartz/util/FileTransferManager.java
...ain/java/com/cx/cn/cxquartz/util/FileTransferManager.java
+1
-1
src/main/java/com/cx/cn/cxquartz/vo/TraffpictureParam.java
src/main/java/com/cx/cn/cxquartz/vo/TraffpictureParam.java
+4
-4
src/main/java/com/cx/cn/cxquartz/vo/UpperBoundingBox.java
src/main/java/com/cx/cn/cxquartz/vo/UpperBoundingBox.java
+7
-0
src/main/resources/application.yml
src/main/resources/application.yml
+1
-11
No files found.
src/main/java/com/cx/cn/cxquartz/CXQuartzApplication.java
View file @
d34943ec
...
...
@@ -2,7 +2,6 @@ package com.cx.cn.cxquartz;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
;
import
org.springframework.boot.builder.SpringApplicationBuilder
;
import
org.springframework.boot.web.servlet.support.SpringBootServletInitializer
;
...
...
src/main/java/com/cx/cn/cxquartz/util/DateUtils.java
View file @
d34943ec
...
...
@@ -51,11 +51,6 @@ public class DateUtils {
return
new
DateTime
(
date
).
toString
(
YMD_HMS
);
}
public
static
String
formatDateTime
(
DateTime
date
){
return
date
.
toString
(
YMD_HMS
);
}
public
static
String
formatDateToNoSign
(
Date
date
){
return
new
DateTime
(
date
).
toString
(
YMDHMS
);
}
...
...
@@ -67,10 +62,7 @@ public class DateUtils {
private
static
String
formatCurrDateByType
(
DateTimeFormatter
dateTimeFormatter
){
return
DateTime
.
now
().
toString
(
dateTimeFormatter
);
}
public
static
DateTime
getNowDate
(){
return
DateTime
.
now
();
}
public
static
Date
addMinutes
(
Date
date
,
int
minutes
)
{
return
new
DateTime
(
date
).
plusMinutes
(
minutes
).
toDate
();
}
...
...
src/main/java/com/cx/cn/cxquartz/util/FileTransferManager.java
View file @
d34943ec
...
...
@@ -147,7 +147,7 @@ public class FileTransferManager {
GoalStructureParam
param
=
new
GoalStructureParam
();
param
.
setOutput
(
new
Output
(
1
,
1
,
-
1
,
3
));
param
.
setModel
(
model
);
param
.
setApiout
(
"
0
"
);
////打开1400标准输出,默认可以不填
param
.
setApiout
(
"
1
"
);
////打开1400标准输出,默认可以不填
List
<
ImageList
>
list
=
new
ArrayList
<>();
getImageList
(
"1"
,
roiarray
,
base64Encoder
,
list
,
transferRecord
.
getImg1path
());
getImageList
(
"2"
,
roiarray
,
base64Encoder
,
list
,
transferRecord
.
getImg2path
());
...
...
src/main/java/com/cx/cn/cxquartz/vo/TraffpictureParam.java
View file @
d34943ec
...
...
@@ -2,7 +2,6 @@ package com.cx.cn.cxquartz.vo;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
org.joda.time.DateTime
;
import
java.io.Serializable
;
import
java.util.Date
;
...
...
@@ -18,6 +17,7 @@ import java.util.Date;
public
class
TraffpictureParam
extends
Traffpicture
{
private
static
final
long
serialVersionUID
=
1L
;
@JsonIgnore
private
Long
recordid
;
@JsonIgnore
...
...
@@ -37,7 +37,7 @@ public class TraffpictureParam extends Traffpicture {
@JsonIgnore
private
String
creator
;
@JsonIgnore
private
Date
Time
createtime
;
private
Date
createtime
;
@JsonIgnore
private
String
updator
;
@JsonIgnore
...
...
@@ -156,11 +156,11 @@ public class TraffpictureParam extends Traffpicture {
this
.
creator
=
creator
;
}
public
Date
Time
getCreatetime
()
{
public
Date
getCreatetime
()
{
return
createtime
;
}
public
void
setCreatetime
(
Date
Time
createtime
)
{
public
void
setCreatetime
(
Date
createtime
)
{
this
.
createtime
=
createtime
;
}
...
...
src/main/java/com/cx/cn/cxquartz/vo/UpperBoundingBox.java
View file @
d34943ec
...
...
@@ -2,6 +2,13 @@
* Copyright 2021 json.cn
*/
package
com
.
cx
.
cn
.
cxquartz
.
vo
;
/**
* Auto-generated: 2021-04-28 19:16:46
*
* @author json.cn (i@json.cn)
* @website http://www.json.cn/java2pojo/
*/
public
class
UpperBoundingBox
{
private
int
x
;
...
...
src/main/resources/application.yml
View file @
d34943ec
...
...
@@ -37,18 +37,8 @@ spring:
cache
:
false
enabled
:
true
encoding
:
UTF-8
mode
:
HTML
mode
:
HTML
redis
:
host
:
172.16.24.153
port
:
6379
timeout
:
300
# password:
pool
:
minIdle
:
1
maxIdle
:
10
maxWait
:
-1
maxActive
:
8
#logging:
# level:
# root:
...
...
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