Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 7be56a93 by 丁伟峰
Options

Merge branch 'feature-dingwf-0715' into develop

2 parents 9159b9a8 d850ebba
Inline Side-by-side
Showing with 14 additions and 57 deletions
project-order/src/main/java/com/dituhui/pea/order/OrderServiceApplication.java
...@@ -16,17 +16,14 @@ ...@@ -16,17 +16,14 @@
package com.dituhui.pea.order; package com.dituhui.pea.order;
import com.dituhui.pea.order.config.DateTimeConfig;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Import;
/** /**
* @author TrevorLink * @author TrevorLink
*/ */
@SpringBootApplication @SpringBootApplication
@Import(DateTimeConfig.class)
@EnableFeignClients @EnableFeignClients
public class OrderServiceApplication { public class OrderServiceApplication {
......
project-order/src/main/java/com/dituhui/pea/order/config/DateTimeConfig.java deleted 100644 → 0
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
...@@ -6,4 +6,7 @@ import org.springframework.context.annotation.Configuration; ...@@ -6,4 +6,7 @@ import org.springframework.context.annotation.Configuration;
public class OrderConfig { public class OrderConfig {
public static final int DEFAULT_PAGE_SIZE = 10; public static final int DEFAULT_PAGE_SIZE = 10;
public static final int DEFAULT_PAGE_INDEX = 1; 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
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
package com.dituhui.pea.order.service.impl; package com.dituhui.pea.order.service.impl;
import cn.hutool.core.date.LocalDateTimeUtil;
import com.dituhui.pea.common.Result; import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dao.*; import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.CapacityOrderQueryReqDTO; import com.dituhui.pea.order.dto.CapacityOrderQueryReqDTO;
...@@ -18,11 +19,12 @@ import org.springframework.stereotype.Service; ...@@ -18,11 +19,12 @@ import org.springframework.stereotype.Service;
import java.time.DayOfWeek; import java.time.DayOfWeek;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.format.TextStyle; import java.time.format.TextStyle;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.dituhui.pea.order.config.OrderConfig.PATTERN_DATE;
@Service @Service
@Slf4j @Slf4j
public class CapacityQueryServiceImpl implements CapacityQueryService { public class CapacityQueryServiceImpl implements CapacityQueryService {
...@@ -204,8 +206,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -204,8 +206,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
} }
private String getWeekday(String day) { private String getWeekday(String day) {
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); LocalDate date = LocalDateTimeUtil.parseDate(day, PATTERN_DATE);
LocalDate date = LocalDate.parse(day, dateFormatter);
DayOfWeek weekday = date.getDayOfWeek(); DayOfWeek weekday = date.getDayOfWeek();
return weekday.getDisplayName(TextStyle.SHORT, Locale.CHINA); return weekday.getDisplayName(TextStyle.SHORT, Locale.CHINA);
} }
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package com.dituhui.pea.order.service.impl; package com.dituhui.pea.order.service.impl;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import com.dituhui.pea.common.Result; import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dao.OrderRequestDao; import com.dituhui.pea.order.dao.OrderRequestDao;
import com.dituhui.pea.order.dao.OrgTeamDao; import com.dituhui.pea.order.dao.OrgTeamDao;
...@@ -36,12 +37,13 @@ import org.apache.commons.lang3.StringUtils; ...@@ -36,12 +37,13 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID; 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 @Slf4j
@Service @Service
public class OrderCreateServiceImpl implements OrderCreateService { public class OrderCreateServiceImpl implements OrderCreateService {
...@@ -102,11 +104,11 @@ public class OrderCreateServiceImpl implements OrderCreateService { ...@@ -102,11 +104,11 @@ public class OrderCreateServiceImpl implements OrderCreateService {
entity.setSkill(req.getSkill()); entity.setSkill(req.getSkill());
entity.setFaultDescribe(req.getFaultDescribe()); entity.setFaultDescribe(req.getFaultDescribe());
entity.setExpectTimeBegin(LocalDateTime.parse(req.getExpectBegin())); entity.setExpectTimeBegin(LocalDateTimeUtil.parse(req.getExpectBegin(), PATTERN_DATETIME));
entity.setExpectTimeEnd(LocalDateTime.parse(req.getExpectEnd())); entity.setExpectTimeEnd(LocalDateTimeUtil.parse(req.getExpectEnd(), PATTERN_DATETIME));
entity.setExpectTimeDesc(req.getExpectDesc()); entity.setExpectTimeDesc(req.getExpectDesc());
entity.setDescription(req.getDescription()); entity.setDescription(req.getDescription());
entity.setDt(LocalDate.parse(req.getExpectBegin())); entity.setDt(LocalDateTimeUtil.parseDate(req.getExpectBegin(), PATTERN_DATE));
// location // location
LocationDTO location = req.getLocation(); LocationDTO location = req.getLocation();
entity.setProvince(location.getProvince()); entity.setProvince(location.getProvince());
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!