This commit is contained in:
李京通 2025-06-17 18:15:19 +08:00
parent b0925c6fb3
commit 3f9be218d3
3 changed files with 20 additions and 4 deletions

View File

@ -26,7 +26,7 @@ public class DoorRequestDataListDTO {
private String cardNo; private String cardNo;
// 验证结果 // 验证结果
@JSONField(name = "validResult") @JSONField(name = "validResult")
private Integer validResult; private String validResult;
// 通行时间 // 通行时间
@JSONField(name = "passTime") @JSONField(name = "passTime")
private String passTime; private String passTime;
@ -42,4 +42,10 @@ public class DoorRequestDataListDTO {
// 人员姓名 // 人员姓名
@JSONField(name = "userName") @JSONField(name = "userName")
private String userName; private String userName;
@JSONField(name = "personPic")
private String personPic;
@JSONField(name = "globalPic")
private String globalPic;
} }

View File

@ -18,10 +18,16 @@ public class VehicleRequestDataListDTO {
@JSONField(name = "passDirection") @JSONField(name = "passDirection")
private String passDirection; private String passDirection;
@JSONField(name = "validResult")
private String validResult;
@JSONField(name = "platePicBase64") @JSONField(name = "platePicBase64")
private String platePicBase64; private String platePicBase64;
@JSONField(name = "globalPic")
private String globalPic;
@JSONField(name = "globalPicBase64") @JSONField(name = "globalPicBase64")
private String globalPicBase64; private String globalPicBase64;
@JSONField(name = "userName") @JSONField(name = "userName")

View File

@ -258,7 +258,8 @@ public class StandardTask {
requestDataListDTO.setGlobalPicBase64(Base64Util.getBase64ByUrl(h.getGlobalPic())); requestDataListDTO.setGlobalPicBase64(Base64Util.getBase64ByUrl(h.getGlobalPic()));
requestDataListDTO.setPlateNo(h.getPlateNo()); requestDataListDTO.setPlateNo(h.getPlateNo());
requestDataListDTO.setDeviceSN(h.getGbsChannelNo()); requestDataListDTO.setDeviceSN(h.getGbsChannelNo());
requestDataListDTO.setGlobalPic(h.getGlobalPic());
requestDataListDTO.setUserName(h.getOwnerName());
requestDataListDTO.setPassDirection(StringKit.toString(deviceInfo.getDirection())); requestDataListDTO.setPassDirection(StringKit.toString(deviceInfo.getDirection()));
List<VehicleRequestDataListDTO> list = new ArrayList<>(); List<VehicleRequestDataListDTO> list = new ArrayList<>();
list.add(requestDataListDTO); list.add(requestDataListDTO);
@ -330,10 +331,13 @@ public class StandardTask {
requestDataListDTO.setValidType(Integer.valueOf(h.getDirection())); requestDataListDTO.setValidType(Integer.valueOf(h.getDirection()));
requestDataListDTO.setPassTime(StringKit.toString(h.getPassTime())); requestDataListDTO.setPassTime(StringKit.toString(h.getPassTime()));
requestDataListDTO.setGlobalPicBase64(Base64Util.getBase64ByUrl(h.getPersonPic())); 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.setDeviceSN(h.getGbsChannelNo());
requestDataListDTO.setValidResult(h.getOpenResult());
requestDataListDTO.setUserName(h.getUserName()); requestDataListDTO.setUserName(h.getUserName());
requestDataListDTO.setPassDirection(deviceInfo.getDirection()); requestDataListDTO.setPassDirection(h.getDirection());
List<DoorRequestDataListDTO> list = new ArrayList<>(); List<DoorRequestDataListDTO> list = new ArrayList<>();
list.add(requestDataListDTO); list.add(requestDataListDTO);
dataDTO.setRequestDataList(list); dataDTO.setRequestDataList(list);