修复BUG

gly-base-core/src/main/java/cn/com/taiji/core/entity/managew/DeviceQueryRecord.java

@@ -55,13 +55,13 @@ public class DeviceQueryRecord extends StringPropertyUUIDEntity {
 	private String cardVehiclePlate;// 车牌号码
 	@NotNull
 	@Column(name = "CARD_VEHICLE_PLATE_COLOR")
-	private Integer cardVehiclePlateColor;// 车牌颜色
+	private String cardVehiclePlateColor;// 车牌颜色
 	@NotNull
 	@Column(name = "CARD_ENABLE_TIME")
-	private LocalDateTime cardEnableTime;//卡启用时间;
+	private String cardEnableTime;//卡启用时间;
 	@NotNull
 	@Column(name = "CARD_EXPIRE_TIME")
-	private LocalDateTime cardExpireTime;//卡过期时间;
+	private String cardExpireTime;//卡过期时间;
 	@NotBlank
 	@Column(name = "CHECK_SUMS")
 	private String checksums;// 校验值
@@ -81,13 +81,13 @@ public class DeviceQueryRecord extends StringPropertyUUIDEntity {
 	private String obuVehicleType;//行驶证车辆类型
 	@NotNull
 	@Column(name = "OBU_VEHICLE_CUSTOMER_TYPE")
-	private Integer obuVehicleCustomerType;// 车辆用户类型不能为空
+	private String obuVehicleCustomerType;// 车辆用户类型不能为空
 	@NotBlank
 	@Column(name = "OBU_VEHICLE_PLATE")
 	private String obuVehiclePlate;// 车牌号码
 	@NotNull
 	@Column(name = "OBU_VEHICLE_PLATE_COLOR")
-	private Integer obuVehiclePlateColor;// 车牌颜色
+	private String obuVehiclePlateColor;// 车牌颜色
 	@NotNull
 	@Column(name = "APPROVED_COUNT")
 	private Integer approvedCount;// 核定载人数
@@ -111,16 +111,16 @@ public class DeviceQueryRecord extends StringPropertyUUIDEntity {
 	private String vehicleDimensions;// 外廓尺寸
 	@NotNull
 	@Column(name = "OBU_ENABLE_TIME")
-	private LocalDateTime obuEnableTime;//启用时间;
+	private String obuEnableTime;//启用时间;
 	@NotNull
 	@Column(name = "OBU_EXPIRE_TIME")
-	private LocalDateTime obuExpireTime;//到期时间;
+	private String obuExpireTime;//到期时间;
 	@NotNull
 	@Column(name = "IS_ACTIVE")
-	private Boolean isActive;// 是否激活
+	private String isActive;// 是否激活
 	@NotNull
 	@Column(name = "LOAD_STATUS")
-	private Boolean loadStatus; // 拆卸状态
+	private String loadStatus; // 拆卸状态
 	@NotBlank
 	@Column(name = "OBU_VERSION")
 	private String obuVersion;// obu版本号;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/inss/inst/InstCallBackResponse.java

@@ -13,7 +13,6 @@ import javax.validation.constraints.NotNull;
 @Accessors(chain = true)
 public class InstCallBackResponse extends AbstractSignTypeResponse {
 
-    private ExcuteByVfjStep step;//步骤
     private Integer stepNo;
     private String cmd;//指令
     private String cmdType;//指令类型

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/DeviceQueryRecordRequestDTO.java

@@ -40,13 +40,13 @@ public class DeviceQueryRecordRequestDTO extends AbstractBizRequestDTO {
     private String cardVehiclePlate;// 车牌号码
     @NotNull
     @ApiModelProperty(value = "车牌颜色")
-    private Integer cardVehiclePlateColor;// 车牌颜色
+    private String cardVehiclePlateColor;// 车牌颜色
     @NotNull
     @ApiModelProperty(value = "卡启用时间")
-    private LocalDateTime cardEnableTime;//卡启用时间;
+    private String cardEnableTime;//卡启用时间;
     @NotNull
     @ApiModelProperty(value = "卡过期时间")
-    private LocalDateTime cardExpireTime;//卡过期时间;
+    private String cardExpireTime;//卡过期时间;
     @NotBlank
     @ApiModelProperty(value = "校验值")
     private String checksums;// 校验值
@@ -66,13 +66,13 @@ public class DeviceQueryRecordRequestDTO extends AbstractBizRequestDTO {
     private String obuVehicleType;//行驶证车辆类型
     @NotNull
     @ApiModelProperty(value = "车辆用户类型不能为空")
-    private Integer obuVehicleCustomerType;// 车辆用户类型不能为空
+    private String obuVehicleCustomerType;// 车辆用户类型不能为空
     @NotBlank
     @ApiModelProperty(value = "车牌号码")
     private String obuVehiclePlate;// 车牌号码
     @NotNull
     @ApiModelProperty(value = "车牌颜色")
-    private Integer obuVehiclePlateColor;// 车牌颜色
+    private String obuVehiclePlateColor;// 车牌颜色
     @NotNull
     @ApiModelProperty(value = "核定载人数")
     private Integer approvedCount;// 核定载人数
@@ -96,16 +96,16 @@ public class DeviceQueryRecordRequestDTO extends AbstractBizRequestDTO {
     private String vehicleDimensions;// 外廓尺寸
     @NotNull
     @ApiModelProperty(value = "启用时间")
-    private LocalDateTime obuEnableTime;//启用时间;
+    private String obuEnableTime;//启用时间;
     @NotNull
     @ApiModelProperty(value = "到期时间")
-    private LocalDateTime obuExpireTime;//到期时间;
+    private String obuExpireTime;//到期时间;
     @NotNull
     @ApiModelProperty(value = "是否激活")
-    private Boolean isActive;// 是否激活
+    private String isActive;// 是否激活
     @NotNull
     @ApiModelProperty(value = "拆卸状态")
-    private Boolean loadStatus; // 拆卸状态
+    private String loadStatus; // 拆卸状态
     @NotBlank
     @ApiModelProperty(value = "obu版本号")
     private String obuVersion;// obu版本号;