From 69a0671e8ebbb8caaf2bc9aed82654941f118b93 Mon Sep 17 00:00:00 2001
From: ZZ <coml_aaron@163.com>
Date: Tue, 21 Dec 2021 13:36:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E5=A0=86?=
 =?UTF-8?q?=E6=A0=88=E6=89=93=E5=8D=B0;=E5=85=85=E7=94=B5=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8F=96=E7=BB=9D=E5=AF=B9=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evcs/dto/CDChargeOrderInfo4BonusReq.java  |  2 +-
 .../com/xhpc/evcs/config/TaskLogConfig.java   | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/TaskLogConfig.java

diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/CDChargeOrderInfo4BonusReq.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/CDChargeOrderInfo4BonusReq.java
index 0d611add..eb01d1fb 100644
--- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/CDChargeOrderInfo4BonusReq.java
+++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/CDChargeOrderInfo4BonusReq.java
@@ -109,7 +109,7 @@ public class CDChargeOrderInfo4BonusReq {
         if (starttime != null && endtime != null) {
             cl = Math.toIntExact((endtime.getTime() - starttime.getTime()) / 1000);
         }
-        this.chargeLast = cl;
+        this.chargeLast = Math.abs(cl);
         this.meterValueStart = xhpcHistoryOrder.getMeterValueStartEvcs();
         this.meterValueEnd = xhpcHistoryOrder.getMeterValueEndEvcs();
     }
diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/TaskLogConfig.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/TaskLogConfig.java
new file mode 100644
index 00000000..49e67bc2
--- /dev/null
+++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/TaskLogConfig.java
@@ -0,0 +1,31 @@
+package com.xhpc.evcs.config;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.task.TaskSchedulerCustomizer;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.util.ErrorHandler;
+
+@Configuration
+public class TaskLogConfig implements TaskSchedulerCustomizer {
+
+    @Override
+    public void customize(ThreadPoolTaskScheduler taskScheduler) {
+
+        taskScheduler.setErrorHandler(new CustomErrorHandler());
+    }
+
+    private static class CustomErrorHandler implements ErrorHandler {
+
+        private static final Logger logger = LoggerFactory.getLogger(CustomErrorHandler.class);
+
+        @Override
+        public void handleError(Throwable t) {
+
+            logger.error("Scheduled task threw an exception: {}", t.getMessage(), t);
+        }
+
+    }
+
+}