yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去掉全局日期格式配置;解决直接设置费率模型没有电站的错误

Browse Source
This commit is contained in:
ZZ 2021-07-30 16:14:17 +08:00
parent bb2def0f4a
commit 512590bff7
3 changed files with 40 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
xhpc-modules/xhpc-common/src/main/java/com/xhpc/DateFormatConfig.java
View File

@ -1,55 +1,44 @@
package com.xhpc; package com.xhpc;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
import org.springframework.boot.jackson.JsonComponent; import org.springframework.boot.jackson.JsonComponent;
import org.springframework.context.annotation.Bean;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.TimeZone;
@JsonComponent @JsonComponent
public class DateFormatConfig { public class DateFormatConfig {
//
@Value("${spring.jackson.date-format:yyyy-MM-dd HH:mm:ss}") // @Value("${spring.jackson.date-format:yyyy-MM-dd HH:mm:ss}")
private String pattern; // private String pattern;
//
/** // /**
* @author xiaofu // * @author xiaofu
* @description date 类型全局时间格式化 // * @description date 类型全局时间格式化
* @date 2020/8/31 18:22 // * @date 2020/8/31 18:22
*/ // */
@Bean // @Bean
public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilder() { // public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilder() {
//
return builder -> { // return builder -> {
TimeZone tz = TimeZone.getTimeZone("UTC"); // TimeZone tz = TimeZone.getTimeZone("UTC");
DateFormat df = new SimpleDateFormat(pattern); // DateFormat df = new SimpleDateFormat(pattern);
df.setTimeZone(tz); // df.setTimeZone(tz);
builder.failOnEmptyBeans(false) // builder.failOnEmptyBeans(false)
.failOnUnknownProperties(false) // .failOnUnknownProperties(false)
.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) // .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
.dateFormat(df); // .dateFormat(df);
}; // };
} // }
//
/** // /**
* @author xiaofu // * @author xiaofu
* @description LocalDate 类型全局时间格式化 // * @description LocalDate 类型全局时间格式化
* @date 2020/8/31 18:22 // * @date 2020/8/31 18:22
*/ // */
@Bean // @Bean
public LocalDateTimeSerializer localDateTimeDeserializer() { // public LocalDateTimeSerializer localDateTimeDeserializer() {
return new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(pattern)); // return new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(pattern));
} // }
//
@Bean // @Bean
public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer(LocalDateTimeSerializer localDateTimeDeserializer) { // public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer(LocalDateTimeSerializer localDateTimeDeserializer) {
return builder -> builder.serializerByType(LocalDateTime.class, localDateTimeDeserializer); // return builder -> builder.serializerByType(LocalDateTime.class, localDateTimeDeserializer);
} // }
} }

2
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
View File

@ -89,7 +89,7 @@ public class ChargingController {
clientHandler.sendClientBinary(msg); clientHandler.sendClientBinary(msg);
return R.ok(); return R.ok();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); log.error("send message failed. " + e.getMessage(), e);
return R.fail(e.getMessage()); return R.fail(e.getMessage());
} }
} }

1
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/StationController.java
View File

@ -18,6 +18,7 @@ public class StationController {
String skey = "station:".concat(stationId.toString()); String skey = "station:".concat(stationId.toString());
ChargingStationDto cacheStation = REDIS.getCacheObject(skey); ChargingStationDto cacheStation = REDIS.getCacheObject(skey);
if (cacheStation==null) cacheStation = new ChargingStationDto();
cacheStation.setRateModelId(rateModelId); cacheStation.setRateModelId(rateModelId);
REDIS.setCacheObject(skey, cacheStation); REDIS.setCacheObject(skey, cacheStation);
String rkey = "rateModel:".concat(rateModelId.toString()); String rkey = "rateModel:".concat(rateModelId.toString());