diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationChargeOrderInfo4BonusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java similarity index 97% rename from evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationChargeOrderInfo4BonusTask.java rename to evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java index a51e0f6c..4845608e 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationChargeOrderInfo4BonusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java @@ -1,10 +1,9 @@ -package com.xhpc.evcs.cd; +package com.xhpc.evcs.notification; import com.xhpc.evcs.api.CoreDispatcher; -import com.xhpc.order.domain.XhpcHistoryOrder; -import com.xhpc.evcs.domain.XhpcStatisticsTimeInterval; import com.xhpc.evcs.domain.AuthSecretToken; import com.xhpc.evcs.domain.EtOrderMapping; +import com.xhpc.evcs.domain.XhpcStatisticsTimeInterval; import com.xhpc.evcs.dto.CDChargeOrder4BonusInfoRes; import com.xhpc.evcs.dto.CDChargeOrderInfo4BonusReq; import com.xhpc.evcs.dto.CommonRequest; @@ -14,6 +13,7 @@ import com.xhpc.evcs.jpa.OrderMappingRepository; import com.xhpc.evcs.jpa.StatisticTimeIntervalRepository; import com.xhpc.evcs.jpa.XhpcHistoryOrderRepository; import com.xhpc.evcs.utils.JSONUtil; +import com.xhpc.order.domain.XhpcHistoryOrder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -24,8 +24,8 @@ import org.springframework.stereotype.Component; import java.io.IOException; import java.util.List; -import static com.xhpc.evcs.cd.NotificationEquipChargeStatusTask.transferInternetOrderNo; import static com.xhpc.evcs.domain.AuthSecretToken.SECRET_TOKEN_TYPE_OUT; +import static com.xhpc.evcs.notification.NotificationEquipChargeStatusTask.transferInternetOrderNo; @Component public class NotificationChargeOrderInfo4BonusTask extends CoreDispatcher { diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationEquipChargeStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java similarity index 99% rename from evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationEquipChargeStatusTask.java rename to evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java index f5242920..fa964a7d 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationEquipChargeStatusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java @@ -1,4 +1,4 @@ -package com.xhpc.evcs.cd; +package com.xhpc.evcs.notification; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationStationStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java similarity index 99% rename from evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationStationStatusTask.java rename to evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java index aaa5f7be..49c955c5 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationStationStatusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStationStatusTask.java @@ -1,4 +1,4 @@ -package com.xhpc.evcs.cd; +package com.xhpc.evcs.notification; import com.xhpc.common.api.dto.ChargingStationDto; import com.xhpc.evcs.api.CoreDispatcher; @@ -18,8 +18,8 @@ import java.util.Map; import java.util.Set; import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; -import static com.xhpc.evcs.dto.ConnectorStatusInfo.*; import static com.xhpc.evcs.domain.AuthSecretToken.SECRET_TOKEN_TYPE_OUT; +import static com.xhpc.evcs.dto.ConnectorStatusInfo.*; @Component public class NotificationStationStatusTask extends CoreDispatcher { diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/utils/DateUtil.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/utils/DateUtil.java index 63ac4610..00b23397 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/utils/DateUtil.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/utils/DateUtil.java @@ -10,7 +10,7 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import static com.xhpc.evcs.cd.NotificationEquipChargeStatusTask.transferInternetOrderNo; +import static com.xhpc.evcs.notification.NotificationEquipChargeStatusTask.transferInternetOrderNo; public class DateUtil {