修复BUG

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

@@ -40,11 +40,11 @@ public enum VfjServiceCmd implements SignServiceCommand {
     QUERYSCOBUS("单片OBU一发列表查询", "QueryScobus", VfjQueryScobusRequest.class),
     QUERYTRIDESOBUS("DESOBU一发列表查询", "QueryTriDesObus", VfjQueryTriDesObusRequest.class),
 
-    APPLY4UPGRADE("升级类OBU", "Apply4Upgrade", VfjQueryTriDesObusRequest.class),
-    GETCOMMANDS("获取发行脚本指令", "GetCommands", VfjQueryTriDesObusRequest.class),
-    EXCHANGEKEY("密钥置换", "ExchangeKey", VfjQueryTriDesObusRequest.class),
-    UPGRADEDONE("升级成功确认", "UpgradeDone", VfjQueryTriDesObusRequest.class),
-    EXTAUTH4ISS("外部认证指令", "ExtAuth4Iss", VfjQueryTriDesObusRequest.class),
+    APPLY4UPGRADE("升级类OBU", "Apply4Upgrade", VfjApply4UpgradeRequest.class),
+    GETCOMMANDS("获取发行脚本指令", "GetCommands", VfjGetCommandsRequest.class),
+    EXCHANGEKEY("密钥置换", "ExchangeKey", VfjExchangeKeyRequest.class),
+    UPGRADEDONE("升级成功确认", "UpgradeDone", VfjUpgradeDoneRequest.class),
+    EXTAUTH4ISS("外部认证指令", "ExtAuth4Iss", VfjExtAuth4IssRequest.class),
 
 
     ;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/vfj/VfjApply4UpgradeRequestDTO.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.iaw.dto.vfj;
 
-import cn.com.taiji.core.dto.AbstractBizRequestDTO;
+import cn.com.taiji.common.valid.BaseValidDTO;
+import cn.com.taiji.common.valid.ViolationValidator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -11,7 +12,7 @@ import javax.validation.constraints.NotBlank;
 @Getter
 @Setter
 @Accessors(chain = true)
-public class VfjApply4UpgradeRequestDTO extends AbstractBizRequestDTO {
+public class VfjApply4UpgradeRequestDTO extends BaseValidDTO {
     private String obuMac;
     @NotBlank(message = "请指定obu合同序列号")
     @JsonProperty(value = "contractSN")
@@ -26,4 +27,9 @@ public class VfjApply4UpgradeRequestDTO extends AbstractBizRequestDTO {
     private String cardVersion;
     @NotBlank(message = "请指定obu版本号")
     private String obuVersion;
+
+    @Override
+    protected void validate(ViolationValidator validator) {
+
+    }
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/vfj/VfjExchangeKeyRequestDTO.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.iaw.dto.vfj;
 
-import cn.com.taiji.core.dto.AbstractBizRequestDTO;
+import cn.com.taiji.common.valid.BaseValidDTO;
+import cn.com.taiji.common.valid.ViolationValidator;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -10,11 +11,16 @@ import javax.validation.constraints.NotBlank;
 @Getter
 @Setter
 @Accessors(chain = true)
-public class VfjExchangeKeyRequestDTO extends AbstractBizRequestDTO {
+public class VfjExchangeKeyRequestDTO extends BaseValidDTO {
     @NotBlank(message = "请指定订单号")
     private String issueSerialNo;
     @NotBlank(message = "请指定密钥类型")
     private String key;
     @NotBlank(message = "请指定随机数")
     private String random;
+
+    @Override
+    protected void validate(ViolationValidator validator) {
+
+    }
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/vfj/VfjExtAuth4IssRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.iaw.dto.vfj;
 
-import cn.com.taiji.core.dto.AbstractBizRequestDTO;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import cn.com.taiji.common.valid.BaseValidDTO;
+import cn.com.taiji.common.valid.ViolationValidator;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -11,11 +11,16 @@ import javax.validation.constraints.NotBlank;
 @Getter
 @Setter
 @Accessors(chain = true)
-public class VfjExtAuth4IssRequestDTO extends AbstractBizRequestDTO {
+public class VfjExtAuth4IssRequestDTO extends BaseValidDTO {
     @NotBlank(message = "请指定密钥类型")
     private String keyType;
     @NotBlank(message = "请指定随机数")
     private String random;
     @NotBlank(message = "请指定订单号")
     private String issueSerialNo;
+
+    @Override
+    protected void validate(ViolationValidator validator) {
+
+    }
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/vfj/VfjGetCommandsRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.iaw.dto.vfj;
 
-import cn.com.taiji.core.dto.AbstractBizRequestDTO;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import cn.com.taiji.common.valid.BaseValidDTO;
+import cn.com.taiji.common.valid.ViolationValidator;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -11,11 +11,16 @@ import javax.validation.constraints.NotBlank;
 @Getter
 @Setter
 @Accessors(chain = true)
-public class VfjGetCommandsRequestDTO extends AbstractBizRequestDTO {
+public class VfjGetCommandsRequestDTO extends BaseValidDTO {
     @NotBlank(message = "请指定卡片序列号")
     private String cardNo;
     @NotBlank(message = "请指定obu物料代码")
     private String wareId;
     @NotBlank(message = "请指定发行订单")
     private String issueSerialNo;
+
+    @Override
+    protected void validate(ViolationValidator validator) {
+
+    }
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/vfj/VfjUpgradeDoneRequestDTO.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.iaw.dto.vfj;
 
-import cn.com.taiji.core.dto.AbstractBizRequestDTO;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import cn.com.taiji.common.valid.BaseValidDTO;
+import cn.com.taiji.common.valid.ViolationValidator;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -11,8 +11,13 @@ import javax.validation.constraints.NotBlank;
 @Getter
 @Setter
 @Accessors(chain = true)
-public class VfjUpgradeDoneRequestDTO extends AbstractBizRequestDTO {
+public class VfjUpgradeDoneRequestDTO extends BaseValidDTO {
     private String batchNo;
     @NotBlank(message = "请指定发行订单号")
     private String issueSerialNo;
+
+    @Override
+    protected void validate(ViolationValidator validator) {
+
+    }
 }