Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
schbrain-parent
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
framework
schbrain-parent
Commits
33d47341
Commit
33d47341
authored
Oct 04, 2023
by
liaozan
🏀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
52fc332d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
6 deletions
+16
-6
commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/DateTimeConditionalConverter.java
...port/converter/datetime/DateTimeConditionalConverter.java
+4
-6
commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToDateConditionalConverter.java
.../converter/datetime/StringToDateConditionalConverter.java
+6
-0
commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateTimeConditionalConverter.java
...r/datetime/StringToLocalDateTimeConditionalConverter.java
+6
-0
No files found.
commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/DateTimeConditionalConverter.java
View file @
33d47341
...
@@ -23,7 +23,7 @@ abstract class DateTimeConditionalConverter<T> implements ConditionalGenericConv
...
@@ -23,7 +23,7 @@ abstract class DateTimeConditionalConverter<T> implements ConditionalGenericConv
private
final
TypeDescriptor
stringType
=
TypeDescriptor
.
valueOf
(
String
.
class
);
private
final
TypeDescriptor
stringType
=
TypeDescriptor
.
valueOf
(
String
.
class
);
private
final
Map
<
String
,
DateTimeFormatter
>
formatters
=
new
ConcurrentHashMap
<>();
private
final
Map
<
String
,
DateTimeFormatter
>
formatters
=
new
ConcurrentHashMap
<>();
public
DateTimeConditionalConverter
()
{
DateTimeConditionalConverter
()
{
this
.
targetType
=
TypeDescriptor
.
valueOf
(
ResolvableType
.
forClass
(
getClass
()).
getSuperType
().
getGeneric
(
0
).
getRawClass
());
this
.
targetType
=
TypeDescriptor
.
valueOf
(
ResolvableType
.
forClass
(
getClass
()).
getSuperType
().
getGeneric
(
0
).
getRawClass
());
}
}
...
@@ -45,7 +45,7 @@ abstract class DateTimeConditionalConverter<T> implements ConditionalGenericConv
...
@@ -45,7 +45,7 @@ abstract class DateTimeConditionalConverter<T> implements ConditionalGenericConv
return
convert
((
String
)
source
,
targetType
);
return
convert
((
String
)
source
,
targetType
);
}
}
protected
final
T
convert
(
String
source
,
TypeDescriptor
targetType
)
{
protected
T
convert
(
String
source
,
TypeDescriptor
targetType
)
{
if
(
StringUtils
.
isBlank
(
source
))
{
if
(
StringUtils
.
isBlank
(
source
))
{
return
null
;
return
null
;
}
}
...
@@ -69,14 +69,12 @@ abstract class DateTimeConditionalConverter<T> implements ConditionalGenericConv
...
@@ -69,14 +69,12 @@ abstract class DateTimeConditionalConverter<T> implements ConditionalGenericConv
return
pattern
;
return
pattern
;
}
}
protected
String
defaultPattern
()
{
return
DatePattern
.
NORM_DATETIME_PATTERN
;
}
protected
DateTimeFormatter
ofPattern
(
String
pattern
)
{
protected
DateTimeFormatter
ofPattern
(
String
pattern
)
{
return
formatters
.
computeIfAbsent
(
pattern
,
ignore
->
DatePattern
.
createFormatter
(
pattern
));
return
formatters
.
computeIfAbsent
(
pattern
,
ignore
->
DatePattern
.
createFormatter
(
pattern
));
}
}
protected
abstract
String
defaultPattern
();
protected
abstract
T
doConvert
(
Long
source
);
protected
abstract
T
doConvert
(
Long
source
);
protected
abstract
T
doConvert
(
String
source
,
DateTimeFormatter
formatter
);
protected
abstract
T
doConvert
(
String
source
,
DateTimeFormatter
formatter
);
...
...
commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToDateConditionalConverter.java
View file @
33d47341
package
com.schbrain.common.web.support.converter.datetime
;
package
com.schbrain.common.web.support.converter.datetime
;
import
cn.hutool.core.date.DatePattern
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.DateUtil
;
import
java.time.format.DateTimeFormatter
;
import
java.time.format.DateTimeFormatter
;
...
@@ -13,6 +14,11 @@ class StringToDateConditionalConverter extends DateTimeConditionalConverter<Date
...
@@ -13,6 +14,11 @@ class StringToDateConditionalConverter extends DateTimeConditionalConverter<Date
static
final
StringToDateConditionalConverter
INSTANCE
=
new
StringToDateConditionalConverter
();
static
final
StringToDateConditionalConverter
INSTANCE
=
new
StringToDateConditionalConverter
();
@Override
protected
String
defaultPattern
()
{
return
DatePattern
.
NORM_DATETIME_PATTERN
;
}
@Override
@Override
protected
Date
doConvert
(
Long
source
)
{
protected
Date
doConvert
(
Long
source
)
{
return
DateUtil
.
date
(
source
);
return
DateUtil
.
date
(
source
);
...
...
commons/web-common/src/main/java/com/schbrain/common/web/support/converter/datetime/StringToLocalDateTimeConditionalConverter.java
View file @
33d47341
package
com.schbrain.common.web.support.converter.datetime
;
package
com.schbrain.common.web.support.converter.datetime
;
import
cn.hutool.core.date.DatePattern
;
import
cn.hutool.core.date.LocalDateTimeUtil
;
import
cn.hutool.core.date.LocalDateTimeUtil
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
...
@@ -13,6 +14,11 @@ class StringToLocalDateTimeConditionalConverter extends DateTimeConditionalConve
...
@@ -13,6 +14,11 @@ class StringToLocalDateTimeConditionalConverter extends DateTimeConditionalConve
static
final
StringToLocalDateTimeConditionalConverter
INSTANCE
=
new
StringToLocalDateTimeConditionalConverter
();
static
final
StringToLocalDateTimeConditionalConverter
INSTANCE
=
new
StringToLocalDateTimeConditionalConverter
();
@Override
protected
String
defaultPattern
()
{
return
DatePattern
.
NORM_DATETIME_PATTERN
;
}
@Override
@Override
protected
LocalDateTime
doConvert
(
Long
source
)
{
protected
LocalDateTime
doConvert
(
Long
source
)
{
return
LocalDateTimeUtil
.
of
(
source
);
return
LocalDateTimeUtil
.
of
(
source
);
...
...
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