Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zhj-report
Project
Project
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
data-spider
zhj-report
Commits
36d4fa41
Commit
36d4fa41
authored
Apr 01, 2020
by
董建华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化时间工具类
parent
8b15fb9f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
29 deletions
+25
-29
IReportServiceImpl.java
...main/java/com/service/report/impl/IReportServiceImpl.java
+1
-1
DateUtil.java
src/main/java/com/util/DateUtil.java
+24
-28
No files found.
src/main/java/com/service/report/impl/IReportServiceImpl.java
View file @
36d4fa41
...
...
@@ -599,7 +599,7 @@ public class IReportServiceImpl implements ReportService {
Map
<
String
,
String
>
param
=
new
HashMap
<>();
param
.
put
(
"startDate"
,
DateUtil
.
getCurrentDay
(-
1
,
DateUtil
.
YYYY_MM_DD
));
param
.
put
(
"endDate"
,
DateUtil
.
getCurrentDay
(
0
,
DateUtil
.
YYYY_MM_DD
));
log
.
info
(
"开始上报月逾期数据
"
);
log
.
info
(
"开始上报月逾期数据
param:{}"
,
param
);
List
<
Map
<
String
,
Object
>>
overMonthData
=
dataMapper
.
getOverMonthData
(
param
);
if
(
overMonthData
==
null
||
overMonthData
.
size
()
==
0
)
{
return
;
...
...
src/main/java/com/util/DateUtil.java
View file @
36d4fa41
...
...
@@ -28,14 +28,10 @@ public class DateUtil {
public
static
final
String
YYYYMM
=
"yyyyMM"
;
public
static
String
getCurrentDay
(
int
day
)
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
add
(
Calendar
.
DAY_OF_MONTH
,
day
);
calendar
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
calendar
.
set
(
Calendar
.
MINUTE
,
0
);
calendar
.
set
(
Calendar
.
SECOND
,
0
);
return
new
SimpleDateFormat
(
YYYY_MM_DD_MM_HH_SS
).
format
(
calendar
.
getTime
());
return
getCurrentDay
(
day
,
YYYY_MM_DD_MM_HH_SS
);
}
public
static
String
getCurrentDay
(
int
day
,
String
pattner
)
{
public
static
String
getCurrentDay
(
int
day
,
String
pattner
)
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
add
(
Calendar
.
DAY_OF_MONTH
,
day
);
calendar
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
...
...
@@ -43,26 +39,16 @@ public class DateUtil {
calendar
.
set
(
Calendar
.
SECOND
,
0
);
return
new
SimpleDateFormat
(
pattner
).
format
(
calendar
.
getTime
());
}
public
static
String
getCurrentDay
(
String
date
,
int
day
)
{
Date
time
=
null
;
try
{
time
=
new
SimpleDateFormat
(
YYYY_MM_DD_MM_HH_SS
).
parse
(
date
);
}
catch
(
Exception
e
){
e
.
printStackTrace
();
}
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
setTime
(
time
);
calendar
.
add
(
Calendar
.
DAY_OF_MONTH
,
day
);
calendar
.
set
(
Calendar
.
HOUR_OF_DAY
,
0
);
calendar
.
set
(
Calendar
.
MINUTE
,
0
);
calendar
.
set
(
Calendar
.
SECOND
,
0
);
return
new
SimpleDateFormat
(
YYYY_MM_DD_MM_HH_SS
).
format
(
calendar
.
getTime
());
return
getCurrentDay
(
date
,
day
,
YYYY_MM_DD_MM_HH_SS
,
YYYY_MM_DD_MM_HH_SS
);
}
public
static
String
getCurrentDay
(
String
date
,
int
day
,
String
inPartner
,
String
outPartner
)
{
public
static
String
getCurrentDay
(
String
date
,
int
day
,
String
inPartner
,
String
outPartner
)
{
Date
time
=
null
;
try
{
time
=
new
SimpleDateFormat
(
inPartner
).
parse
(
date
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
Calendar
calendar
=
Calendar
.
getInstance
();
...
...
@@ -73,17 +59,26 @@ public class DateUtil {
calendar
.
set
(
Calendar
.
SECOND
,
0
);
return
new
SimpleDateFormat
(
outPartner
).
format
(
calendar
.
getTime
());
}
public
static
String
getCurrentMonth
(
String
date
,
int
month
,
String
inPartner
,
String
outPartner
)
{
/**
*
* @param date 时间
* @param month 月份
* @param inPartner 入参时间格式
* @param outPartner 出参时间格式
* @return
*/
public
static
String
getCurrentMonth
(
String
date
,
int
month
,
String
inPartner
,
String
outPartner
)
{
Date
time
=
null
;
try
{
time
=
new
SimpleDateFormat
(
inPartner
).
parse
(
date
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
setTime
(
time
);
calendar
.
add
(
Calendar
.
MONTH
,
month
);
calendar
.
set
(
Calendar
.
DAY_OF_MONTH
,
1
);
calendar
.
set
(
Calendar
.
DAY_OF_MONTH
,
1
);
return
new
SimpleDateFormat
(
outPartner
).
format
(
calendar
.
getTime
());
}
...
...
@@ -130,17 +125,18 @@ public class DateUtil {
public
static
String
formatterDate
(
Object
date
,
String
pattern
)
{
SimpleDateFormat
dateFormat
=
new
SimpleDateFormat
(
pattern
);
if
(
date
instanceof
Date
)
{
if
(
date
instanceof
Date
)
{
return
dateFormat
.
format
(
date
);
}
else
{
}
else
{
return
date
.
toString
();
}
}
public
static
String
formatterDate
(
String
date
,
String
oldPattern
,
String
newPattern
)
{
SimpleDateFormat
dateFormat
=
new
SimpleDateFormat
(
oldPattern
);
try
{
SimpleDateFormat
dateFormatNew
=
new
SimpleDateFormat
(
newPattern
);
return
dateFormatNew
.
format
(
dateFormat
.
parse
(
date
));
return
dateFormatNew
.
format
(
dateFormat
.
parse
(
date
));
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
...
...
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