From 3f9be218d3a23b38d81a8849087f9045f44732d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com> Date: Tue, 17 Jun 2025 18:15:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E8=84=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dianxin/domain/dto/DoorRequestDataListDTO.java | 8 +++++++- .../dianxin/domain/dto/VehicleRequestDataListDTO.java | 6 ++++++ .../com/bootdo/datasend/dianxin/task/StandardTask.java | 10 +++++++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/bootdo/datasend/dianxin/domain/dto/DoorRequestDataListDTO.java b/src/main/java/com/bootdo/datasend/dianxin/domain/dto/DoorRequestDataListDTO.java index d6dae32..e1ee317 100644 --- a/src/main/java/com/bootdo/datasend/dianxin/domain/dto/DoorRequestDataListDTO.java +++ b/src/main/java/com/bootdo/datasend/dianxin/domain/dto/DoorRequestDataListDTO.java @@ -26,7 +26,7 @@ public class DoorRequestDataListDTO { private String cardNo; // 验证结果 @JSONField(name = "validResult") - private Integer validResult; + private String validResult; // 通行时间 @JSONField(name = "passTime") private String passTime; @@ -42,4 +42,10 @@ public class DoorRequestDataListDTO { // 人员姓名 @JSONField(name = "userName") private String userName; + + @JSONField(name = "personPic") + private String personPic; + + @JSONField(name = "globalPic") + private String globalPic; } diff --git a/src/main/java/com/bootdo/datasend/dianxin/domain/dto/VehicleRequestDataListDTO.java b/src/main/java/com/bootdo/datasend/dianxin/domain/dto/VehicleRequestDataListDTO.java index 2a696c8..ceb2cd3 100644 --- a/src/main/java/com/bootdo/datasend/dianxin/domain/dto/VehicleRequestDataListDTO.java +++ b/src/main/java/com/bootdo/datasend/dianxin/domain/dto/VehicleRequestDataListDTO.java @@ -18,10 +18,16 @@ public class VehicleRequestDataListDTO { @JSONField(name = "passDirection") private String passDirection; + @JSONField(name = "validResult") + private String validResult; @JSONField(name = "platePicBase64") private String platePicBase64; + + @JSONField(name = "globalPic") + private String globalPic; + @JSONField(name = "globalPicBase64") private String globalPicBase64; @JSONField(name = "userName") diff --git a/src/main/java/com/bootdo/datasend/dianxin/task/StandardTask.java b/src/main/java/com/bootdo/datasend/dianxin/task/StandardTask.java index e9dd0c1..d583491 100644 --- a/src/main/java/com/bootdo/datasend/dianxin/task/StandardTask.java +++ b/src/main/java/com/bootdo/datasend/dianxin/task/StandardTask.java @@ -258,7 +258,8 @@ public class StandardTask { requestDataListDTO.setGlobalPicBase64(Base64Util.getBase64ByUrl(h.getGlobalPic())); requestDataListDTO.setPlateNo(h.getPlateNo()); requestDataListDTO.setDeviceSN(h.getGbsChannelNo()); - + requestDataListDTO.setGlobalPic(h.getGlobalPic()); + requestDataListDTO.setUserName(h.getOwnerName()); requestDataListDTO.setPassDirection(StringKit.toString(deviceInfo.getDirection())); List list = new ArrayList<>(); list.add(requestDataListDTO); @@ -330,10 +331,13 @@ public class StandardTask { requestDataListDTO.setValidType(Integer.valueOf(h.getDirection())); requestDataListDTO.setPassTime(StringKit.toString(h.getPassTime())); requestDataListDTO.setGlobalPicBase64(Base64Util.getBase64ByUrl(h.getPersonPic())); - requestDataListDTO.setCardNo(h.getIdcard()); + requestDataListDTO.setPersonPic(h.getPersonPic()); + requestDataListDTO.setGlobalPic(h.getPersonPic()); + requestDataListDTO.setCardNo(h.getCardno()); requestDataListDTO.setDeviceSN(h.getGbsChannelNo()); + requestDataListDTO.setValidResult(h.getOpenResult()); requestDataListDTO.setUserName(h.getUserName()); - requestDataListDTO.setPassDirection(deviceInfo.getDirection()); + requestDataListDTO.setPassDirection(h.getDirection()); List list = new ArrayList<>(); list.add(requestDataListDTO); dataDTO.setRequestDataList(list);