From 512590bff7709153911bbc6d83beed7c809b2bf1 Mon Sep 17 00:00:00 2001
From: ZZ <coml_aaron@163.com>
Date: Fri, 30 Jul 2021 16:14:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=85=A8=E5=B1=80=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F=E9=85=8D=E7=BD=AE;=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E7=9B=B4=E6=8E=A5=E8=AE=BE=E7=BD=AE=E8=B4=B9=E7=8E=87?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=B2=A1=E6=9C=89=E7=94=B5=E7=AB=99=E7=9A=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/xhpc/DateFormatConfig.java  | 87 ++++++++-----------
 .../pp/controller/ChargingController.java     |  2 +-
 .../xhpc/pp/controller/StationController.java |  1 +
 3 files changed, 40 insertions(+), 50 deletions(-)

diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/DateFormatConfig.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/DateFormatConfig.java
index 589dcc0b..560b27fb 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/DateFormatConfig.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/DateFormatConfig.java
@@ -1,55 +1,44 @@
 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.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
 public class DateFormatConfig {
-
-    @Value("${spring.jackson.date-format:yyyy-MM-dd HH:mm:ss}")
-    private String pattern;
-
-    /**
-     * @author xiaofu
-     * @description date 类型全局时间格式化
-     * @date 2020/8/31 18:22
-     */
-    @Bean
-    public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilder() {
-
-        return builder -> {
-            TimeZone tz = TimeZone.getTimeZone("UTC");
-            DateFormat df = new SimpleDateFormat(pattern);
-            df.setTimeZone(tz);
-            builder.failOnEmptyBeans(false)
-                    .failOnUnknownProperties(false)
-                    .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
-                    .dateFormat(df);
-        };
-    }
-
-    /**
-     * @author xiaofu
-     * @description LocalDate 类型全局时间格式化
-     * @date 2020/8/31 18:22
-     */
-    @Bean
-    public LocalDateTimeSerializer localDateTimeDeserializer() {
-        return new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(pattern));
-    }
-
-    @Bean
-    public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer(LocalDateTimeSerializer localDateTimeDeserializer) {
-        return builder -> builder.serializerByType(LocalDateTime.class, localDateTimeDeserializer);
-    }
-}
\ No newline at end of file
+//
+//    @Value("${spring.jackson.date-format:yyyy-MM-dd HH:mm:ss}")
+//    private String pattern;
+//
+//    /**
+//     * @author xiaofu
+//     * @description date 类型全局时间格式化
+//     * @date 2020/8/31 18:22
+//     */
+//    @Bean
+//    public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilder() {
+//
+//        return builder -> {
+//            TimeZone tz = TimeZone.getTimeZone("UTC");
+//            DateFormat df = new SimpleDateFormat(pattern);
+//            df.setTimeZone(tz);
+//            builder.failOnEmptyBeans(false)
+//                    .failOnUnknownProperties(false)
+//                    .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+//                    .dateFormat(df);
+//        };
+//    }
+//
+//    /**
+//     * @author xiaofu
+//     * @description LocalDate 类型全局时间格式化
+//     * @date 2020/8/31 18:22
+//     */
+//    @Bean
+//    public LocalDateTimeSerializer localDateTimeDeserializer() {
+//        return new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(pattern));
+//    }
+//
+//    @Bean
+//    public Jackson2ObjectMapperBuilderCustomizer jackson2ObjectMapperBuilderCustomizer(LocalDateTimeSerializer localDateTimeDeserializer) {
+//        return builder -> builder.serializerByType(LocalDateTime.class, localDateTimeDeserializer);
+//    }
+}
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
index 2b8e9e12..f8f89018 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
@@ -89,7 +89,7 @@ public class ChargingController {
             clientHandler.sendClientBinary(msg);
             return R.ok();
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("send message failed. " + e.getMessage(), e);
             return R.fail(e.getMessage());
         }
     }
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/StationController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/StationController.java
index f2c61f44..dcf7e2ce 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/StationController.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/StationController.java
@@ -18,6 +18,7 @@ public class StationController {
 
         String skey = "station:".concat(stationId.toString());
         ChargingStationDto cacheStation = REDIS.getCacheObject(skey);
+        if (cacheStation==null) cacheStation = new ChargingStationDto();
         cacheStation.setRateModelId(rateModelId);
         REDIS.setCacheObject(skey, cacheStation);
         String rkey = "rateModel:".concat(rateModelId.toString());