From 22fc1505575c253732e04305c983f204f0b5375b Mon Sep 17 00:00:00 2001 From: ALEX <2604434353@qq.com> Date: Mon, 18 Aug 2025 16:49:26 +0800 Subject: [PATCH] fix: remove the fields: contactEmail,contactPhone,contactPhoneCountry from the DriverConvertDTO --- .../ProEldMqttCompareApplication.java | 2 +- .../pro_eld_mqtt_compare/StartupCompareRunner.java | 2 +- .../response/DriverConvertDTO.java | 6 +++--- .../pro_eld_mqtt_compare/service/CompareService.java | 10 +++++----- .../java/com/ctgu/pro_eld_mqtt_compare/utils/TAG.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/ctgu/pro_eld_mqtt_compare/ProEldMqttCompareApplication.java b/src/main/java/com/ctgu/pro_eld_mqtt_compare/ProEldMqttCompareApplication.java index f6d91fd..a2d2189 100644 --- a/src/main/java/com/ctgu/pro_eld_mqtt_compare/ProEldMqttCompareApplication.java +++ b/src/main/java/com/ctgu/pro_eld_mqtt_compare/ProEldMqttCompareApplication.java @@ -9,4 +9,4 @@ public class ProEldMqttCompareApplication { public static void main(String[] args) { SpringApplication.run(ProEldMqttCompareApplication.class, args); } -} +} \ No newline at end of file diff --git a/src/main/java/com/ctgu/pro_eld_mqtt_compare/StartupCompareRunner.java b/src/main/java/com/ctgu/pro_eld_mqtt_compare/StartupCompareRunner.java index c5d08b6..9a1a448 100644 --- a/src/main/java/com/ctgu/pro_eld_mqtt_compare/StartupCompareRunner.java +++ b/src/main/java/com/ctgu/pro_eld_mqtt_compare/StartupCompareRunner.java @@ -24,7 +24,7 @@ public class StartupCompareRunner implements ApplicationRunner { // compareService.compare(5, "vehicle"); // compareService.compare(5, "device"); // compareService.compare(5, "business"); -// compareService.compare(5, "driver"); + compareService.compare(5, "driver"); // compareService.compare(5, "vehicle_device"); // compareService.compare(5, "driver_vehicle"); // compareService.compare(5, "business_driver"); diff --git a/src/main/java/com/ctgu/pro_eld_mqtt_compare/response/DriverConvertDTO.java b/src/main/java/com/ctgu/pro_eld_mqtt_compare/response/DriverConvertDTO.java index 6d77f23..37b13ac 100644 --- a/src/main/java/com/ctgu/pro_eld_mqtt_compare/response/DriverConvertDTO.java +++ b/src/main/java/com/ctgu/pro_eld_mqtt_compare/response/DriverConvertDTO.java @@ -16,9 +16,9 @@ public class DriverConvertDTO { private String phone; private String firstName; private String lastName; - private String contactEmail; - private String contactPhone; - private String contactPhoneCountry; +// private String contactEmail; +// private String contactPhone; +// private String contactPhoneCountry; private Integer isDelete; private Integer customerId; } diff --git a/src/main/java/com/ctgu/pro_eld_mqtt_compare/service/CompareService.java b/src/main/java/com/ctgu/pro_eld_mqtt_compare/service/CompareService.java index 854afb9..cd4b98e 100644 --- a/src/main/java/com/ctgu/pro_eld_mqtt_compare/service/CompareService.java +++ b/src/main/java/com/ctgu/pro_eld_mqtt_compare/service/CompareService.java @@ -146,12 +146,12 @@ public class CompareService { if (driverDTO.getContent() != null) { dto.setFirstName(driverDTO.getContent().getFirstName()); dto.setLastName(driverDTO.getContent().getLastName()); - dto.setContactEmail(driverDTO.getContent().getContactEmail()); +// dto.setContactEmail(driverDTO.getContent().getContactEmail()); - if (driverDTO.getContent().getContactPhone() != null) { - dto.setContactPhone(driverDTO.getContent().getContactPhone().getValue()); - dto.setContactPhoneCountry(driverDTO.getContent().getContactPhone().getCountry()); - } +// if (driverDTO.getContent().getContactPhone() != null) { +// dto.setContactPhone(driverDTO.getContent().getContactPhone().getValue()); +// dto.setContactPhoneCountry(driverDTO.getContent().getContactPhone().getCountry()); +// } } driverConvertDTOS.add(dto); diff --git a/src/main/java/com/ctgu/pro_eld_mqtt_compare/utils/TAG.java b/src/main/java/com/ctgu/pro_eld_mqtt_compare/utils/TAG.java index 4a4d742..bd981c5 100644 --- a/src/main/java/com/ctgu/pro_eld_mqtt_compare/utils/TAG.java +++ b/src/main/java/com/ctgu/pro_eld_mqtt_compare/utils/TAG.java @@ -20,7 +20,7 @@ public abstract class TAG { public static final List VEHICLE_FIELDS = Arrays.asList("id", "name", "isDelete", "customerId"); public static final List DEVICE_FIELDS = Arrays.asList("id", "userPackageId", "isDelete", "synTime", "customerId"); public static final List BUSINESS_FIELDS = Arrays.asList("id", "name", "isDelete", "customerId"); - public static final List DRIVER_FIELDS = Arrays.asList("id", "name", "firstName","lastName","contactEmail", "contactPhone", "contactPhoneCountry", "isDelete", "email", "phone", "customerId"); + public static final List DRIVER_FIELDS = Arrays.asList("id", "name", "firstName", "lastName", "isDelete", "email", "phone", "customerId"); public static final List VEHICLE_DEVICE_FIELDS = Arrays.asList("id", "vehicleId", "deviceId", "isDelete", "customerId"); public static final List DRIVER_VEHICLE_FIELDS = Arrays.asList("id", "driverId", "vehicleId", "isDelete", "customerId"); public static final List BUSINESS_DRIVER_FIELDS = Arrays.asList("id", "businessId", "driverId", "isDelete", "customerId");