调整

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

@@ -24,49 +24,35 @@ import lombok.Setter;
 @Table(name = "MANAGEW_DEVICE_QUERY_RECORD")
 public class DeviceQueryRecord extends StringPropertyUUIDEntity {
 
-	@NotNull
 	@Column(name = "OPEN_ID")
 	private String openId;//openId
-	@NotNull
 	@Column(name = "QUERY_TIME")
 	private LocalDateTime queryTime;//查询时间;
-	@NotNull
 	@Column(name = "SOURCE_TYPE")
 	@Enumerated(EnumType.STRING)
 	private SourceType sourceType;//来源
 	// 卡信息
-	@NotBlank
 	@Size(max = 20)
 	@Column(name = "CARD_ID")
 	private String cardId;//卡号;
-	@NotBlank
 	@Column(name = "CUSTOMER_NAME")
 	private String customerName;// 用户姓名
-	@NotBlank
 	@Column(name = "CUSTOMER_IDNUM")
 	private String customerIdNum;// 身份证号
-	@NotBlank
 	@Column(name = "CARD_VEHICLE_TYPE")
 	private String cardVehicleType;// 行驶证车辆类型
-	@NotBlank
 	@Column(name = "CARD_VEHICLE_PLATE")
 	private String cardVehiclePlate;// 车牌号码
-	@NotNull
 	@Column(name = "CARD_VEHICLE_PLATE_COLOR")
 	private String cardVehiclePlateColor;// 车牌颜色
-	@NotNull
 	@Column(name = "CARD_ENABLE_TIME")
 	private String cardEnableTime;//卡启用时间;
-	@NotNull
 	@Column(name = "CARD_EXPIRE_TIME")
 	private String cardExpireTime;//卡过期时间;
-	@NotBlank
 	@Column(name = "CHECK_SUMS")
 	private String checksums;// 校验值
-	@NotBlank
 	@Column(name = "CARD_VERSION")
 	private String cardVersion;//卡版本号;
-	@NotBlank
 	@Column(name = "BINDING_FINISH_STATUS")
 	private String bindingFinishStatus;//卡签绑定完成状态;
 	@Column(name = "CARD_STATUS")
@@ -76,56 +62,39 @@ public class DeviceQueryRecord extends StringPropertyUUIDEntity {
 	@Column(name = "CARD_BALANCE")
 	private Long cardBalance;
 	// 签信息
-	@NotBlank
 	@Size(max = 16)
 	@Column(name = "OBU_ID")
 	private String obuId;//obu编号;
-	@NotBlank
 	@Column(name = "OBU_VEHICLE_TYPE")
 	private String obuVehicleType;//行驶证车辆类型
-	@NotNull
 	@Column(name = "OBU_VEHICLE_CUSTOMER_TYPE")
 	private String obuVehicleCustomerType;// 车辆用户类型不能为空
-	@NotBlank
 	@Column(name = "OBU_VEHICLE_PLATE")
 	private String obuVehiclePlate;// 车牌号码
-	@NotNull
 	@Column(name = "OBU_VEHICLE_PLATE_COLOR")
 	private String obuVehiclePlateColor;// 车牌颜色
-	@NotNull
 	@Column(name = "APPROVED_COUNT")
 	private Integer approvedCount;// 核定载人数
-	@NotBlank
 	@Column(name = "VIN")
 	private String vin;// 车辆识别代号
-	@NotBlank
 	@Column(name = "VEHICLE_ENGINE_NUM")
 	private String vehicleEngineNum;// 发动机号码
-	@NotNull
 	@Column(name = "WHEEL_COUNT")
 	private Integer wheelCount;// 车轮数
-	@NotNull
 	@Column(name = "AXLE_COUNT")
 	private Integer axleCount;// 车轴数
-	@NotNull
 	@Column(name = "AXLE_DISTANCE")
 	private Integer axleDistance; // 轴距
-	@NotBlank
 	@Column(name = "VEHICLE_DIMENSIONS")
 	private String vehicleDimensions;// 外廓尺寸
-	@NotNull
 	@Column(name = "OBU_ENABLE_TIME")
 	private String obuEnableTime;//启用时间;
-	@NotNull
 	@Column(name = "OBU_EXPIRE_TIME")
 	private String obuExpireTime;//到期时间;
-	@NotNull
 	@Column(name = "IS_ACTIVE")
 	private String isActive;// 是否激活
-	@NotNull
 	@Column(name = "LOAD_STATUS")
 	private String loadStatus; // 拆卸状态
-	@NotBlank
 	@Column(name = "OBU_VERSION")
 	private String obuVersion;// obu版本号;
 	@Column(name = "OBU_STATUS")

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

@@ -23,93 +23,66 @@ import lombok.experimental.Accessors;
 @Validated
 public class DeviceQueryRequestDTO extends AbstractBizRequestDTO {
     // 卡信息
-    @NotBlank
     @Size(max = 20)
     @ApiModelProperty(value = "卡号")
     private String cardId;//卡号;
-    @NotBlank
     @ApiModelProperty(value = "用户姓名")
     private String customerName;// 用户姓名
-    @NotBlank
     @ApiModelProperty(value = "身份证号")
     private String customerIdNum;// 身份证号
-//    @NotBlank
     @ApiModelProperty(value = "行驶证车辆类型")
     private String cardVehicleType;// 行驶证车辆类型
-    @NotBlank
     @ApiModelProperty(value = "车牌号码")
     private String cardVehiclePlate;// 车牌号码
-    @NotNull
     @ApiModelProperty(value = "车牌颜色")
     private String cardVehiclePlateColor;// 车牌颜色
-    @NotNull
     @ApiModelProperty(value = "卡启用时间")
     private String cardEnableTime;//卡启用时间;
-    @NotNull
     @ApiModelProperty(value = "卡过期时间")
     private String cardExpireTime;//卡过期时间;
-    @NotBlank
     @ApiModelProperty(value = "校验值")
     private String checksums;// 校验值
-    @NotBlank
     @ApiModelProperty(value = "卡版本号")
     private String cardVersion;//卡版本号;
-    @NotBlank
     @ApiModelProperty(value = "卡签绑定完成状态")
     private String bindingFinishStatus;//卡签绑定完成状态;
     @ApiModelProperty(value = "卡余额")
     private Long cardBalance;
     // 签信息
-    @NotBlank
     @Size(max = 16)
     @ApiModelProperty(value = "obu编号")
     private String obuId;//obu编号;
 //    @NotBlank
     @ApiModelProperty(value = "行驶证车辆类型")
     private String obuVehicleType;//行驶证车辆类型
-    @NotNull
     @ApiModelProperty(value = "车辆用户类型不能为空")
     private String obuVehicleCustomerType;// 车辆用户类型不能为空
-    @NotBlank
     @ApiModelProperty(value = "车牌号码")
     private String obuVehiclePlate;// 车牌号码
-    @NotNull
     @ApiModelProperty(value = "车牌颜色")
     private String obuVehiclePlateColor;// 车牌颜色
-    @NotNull
     @ApiModelProperty(value = "核定载人数")
     private Integer approvedCount;// 核定载人数
-    @NotBlank
     @ApiModelProperty(value = "车辆识别代号")
     private String vin;// 车辆识别代号
-    @NotBlank
     @ApiModelProperty(value = "发动机号码")
     private String vehicleEngineNum;// 发动机号码
-    @NotNull
     @ApiModelProperty(value = "车轮数")
     private Integer wheelCount;// 车轮数
-    @NotNull
     @ApiModelProperty(value = "车轴数")
     private Integer axleCount;// 车轴数
-    @NotNull
     @ApiModelProperty(value = "轴距")
     private Integer axleDistance; // 轴距
-    @NotBlank
     @ApiModelProperty(value = "外廓尺寸")
     private String vehicleDimensions;// 外廓尺寸
-    @NotNull
     @ApiModelProperty(value = "启用时间")
     private String obuEnableTime;//启用时间;
-    @NotNull
     @ApiModelProperty(value = "到期时间")
     private String obuExpireTime;//到期时间;
-    @NotNull
     @ApiModelProperty(value = "是否激活")
     private String isActive;// 是否激活
-    @NotNull
     @ApiModelProperty(value = "拆卸状态")
     private String loadStatus; // 拆卸状态
-    @NotBlank
     @ApiModelProperty(value = "obu版本号")
     private String obuVersion;// obu版本号;
 }