Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit d850ebba
authored
Jul 06, 2023
by
丁伟峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
改用cn.hutool.core.date.LocalDateTimeUtil
1 parent
fec66e6f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
57 deletions
project-order/src/main/java/com/dituhui/pea/order/OrderServiceApplication.java
project-order/src/main/java/com/dituhui/pea/order/config/DateTimeConfig.java
project-order/src/main/java/com/dituhui/pea/order/config/OrderConfig.java
project-order/src/main/java/com/dituhui/pea/order/config/PeaDateTimeFormatter.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/OrderServiceApplication.java
View file @
d850ebb
...
...
@@ -16,17 +16,14 @@
package
com
.
dituhui
.
pea
.
order
;
import
com.dituhui.pea.order.config.DateTimeConfig
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.cloud.openfeign.EnableFeignClients
;
import
org.springframework.context.annotation.Import
;
/**
* @author TrevorLink
*/
@SpringBootApplication
@Import
(
DateTimeConfig
.
class
)
@EnableFeignClients
public
class
OrderServiceApplication
{
...
...
project-order/src/main/java/com/dituhui/pea/order/config/DateTimeConfig.java
deleted
100644 → 0
View file @
fec66e6
package
com
.
dituhui
.
pea
.
order
.
config
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.format.FormatterRegistrar
;
import
org.springframework.format.FormatterRegistry
;
import
org.springframework.format.datetime.standard.DateTimeFormatterRegistrar
;
@Configuration
public
class
DateTimeConfig
{
@Bean
public
FormatterRegistrar
dateTimeFormatterRegistrar
()
{
return
new
DateTimeFormatterRegistrar
()
{
@Override
public
void
registerFormatters
(
FormatterRegistry
registry
)
{
// 注册自定义的日期时间解析器
registry
.
addFormatter
(
new
PeaDateTimeFormatter
());
}
};
}
}
project-order/src/main/java/com/dituhui/pea/order/config/OrderConfig.java
View file @
d850ebb
...
...
@@ -6,4 +6,7 @@ import org.springframework.context.annotation.Configuration;
public
class
OrderConfig
{
public
static
final
int
DEFAULT_PAGE_SIZE
=
10
;
public
static
final
int
DEFAULT_PAGE_INDEX
=
1
;
public
static
final
String
PATTERN_DATETIME
=
"yyyy-MM-dd HH:mm:ss"
;
public
static
final
String
PATTERN_DATE
=
"yyyy-MM-dd"
;
}
project-order/src/main/java/com/dituhui/pea/order/config/PeaDateTimeFormatter.java
deleted
100644 → 0
View file @
fec66e6
package
com
.
dituhui
.
pea
.
order
.
config
;
import
org.springframework.format.Formatter
;
import
java.text.ParseException
;
import
java.time.LocalDateTime
;
import
java.time.format.DateTimeFormatter
;
import
java.util.Locale
;
public
class
PeaDateTimeFormatter
implements
Formatter
<
LocalDateTime
>
{
private
static
final
String
PATTERN
=
"yyyy-MM-dd HH:mm:ss"
;
private
static
final
DateTimeFormatter
FORMATTER
=
DateTimeFormatter
.
ofPattern
(
PATTERN
);
@Override
public
LocalDateTime
parse
(
String
text
,
Locale
locale
)
throws
ParseException
{
return
LocalDateTime
.
parse
(
text
,
FORMATTER
);
}
@Override
public
String
print
(
LocalDateTime
object
,
Locale
locale
)
{
return
FORMATTER
.
format
(
object
);
}
}
project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
View file @
d850ebb
package
com
.
dituhui
.
pea
.
order
.
service
.
impl
;
import
cn.hutool.core.date.LocalDateTimeUtil
;
import
com.dituhui.pea.common.Result
;
import
com.dituhui.pea.order.dao.*
;
import
com.dituhui.pea.order.dto.CapacityOrderQueryReqDTO
;
...
...
@@ -18,11 +19,12 @@ import org.springframework.stereotype.Service;
import
java.time.DayOfWeek
;
import
java.time.LocalDate
;
import
java.time.format.DateTimeFormatter
;
import
java.time.format.TextStyle
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
static
com
.
dituhui
.
pea
.
order
.
config
.
OrderConfig
.
PATTERN_DATE
;
@Service
@Slf4j
public
class
CapacityQueryServiceImpl
implements
CapacityQueryService
{
...
...
@@ -202,8 +204,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
}
private
String
getWeekday
(
String
day
)
{
DateTimeFormatter
dateFormatter
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd"
);
LocalDate
date
=
LocalDate
.
parse
(
day
,
dateFormatter
);
LocalDate
date
=
LocalDateTimeUtil
.
parseDate
(
day
,
PATTERN_DATE
);
DayOfWeek
weekday
=
date
.
getDayOfWeek
();
return
weekday
.
getDisplayName
(
TextStyle
.
SHORT
,
Locale
.
CHINA
);
}
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java
View file @
d850ebb
...
...
@@ -17,6 +17,7 @@
package
com
.
dituhui
.
pea
.
order
.
service
.
impl
;
import
cn.hutool.core.util.IdUtil
;
import
cn.hutool.core.date.LocalDateTimeUtil
;
import
com.dituhui.pea.common.Result
;
import
com.dituhui.pea.order.dao.OrderRequestDao
;
import
com.dituhui.pea.order.dao.OrgTeamDao
;
...
...
@@ -36,12 +37,13 @@ import org.apache.commons.lang3.StringUtils;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.UUID
;
import
static
com
.
dituhui
.
pea
.
order
.
config
.
OrderConfig
.
PATTERN_DATE
;
import
static
com
.
dituhui
.
pea
.
order
.
config
.
OrderConfig
.
PATTERN_DATETIME
;
@Slf4j
@Service
public
class
OrderCreateServiceImpl
implements
OrderCreateService
{
...
...
@@ -102,11 +104,11 @@ public class OrderCreateServiceImpl implements OrderCreateService {
entity
.
setSkill
(
req
.
getSkill
());
entity
.
setFaultDescribe
(
req
.
getFaultDescribe
());
entity
.
setExpectTimeBegin
(
LocalDateTime
.
parse
(
req
.
getExpectBegin
()
));
entity
.
setExpectTimeEnd
(
LocalDateTime
.
parse
(
req
.
getExpectEnd
()
));
entity
.
setExpectTimeBegin
(
LocalDateTime
Util
.
parse
(
req
.
getExpectBegin
(),
PATTERN_DATETIME
));
entity
.
setExpectTimeEnd
(
LocalDateTime
Util
.
parse
(
req
.
getExpectEnd
(),
PATTERN_DATETIME
));
entity
.
setExpectTimeDesc
(
req
.
getExpectDesc
());
entity
.
setDescription
(
req
.
getDescription
());
entity
.
setDt
(
LocalDate
.
parse
(
req
.
getExpectBegin
()
));
entity
.
setDt
(
LocalDate
TimeUtil
.
parseDate
(
req
.
getExpectBegin
(),
PATTERN_DATE
));
// location
LocationDTO
location
=
req
.
getLocation
();
entity
.
setProvince
(
location
.
getProvince
());
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment