Browse Source

机构类型

TRX 1 year ago
parent
commit
6843327edb

+ 1 - 1
src/main/java/com/github/microservice/models/hxz/ConsumTransactionsResult.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 public class ConsumTransactionsResult extends HxzBaseResult {
 
     @JsonProperty("Name")
-    private String Name = "测试";
+    private String Name = "";
 
     @JsonProperty("CardNo")
     private String CardNo = "";

+ 1 - 1
src/main/java/com/github/microservice/models/hxz/ServerTimeModel.java

@@ -20,5 +20,5 @@ public class ServerTimeModel {
 
     @Schema(description = "自定义机号")
     @JsonProperty("DeviceID")
-    private Integer deviceID;
+    private String deviceID;
 }

+ 7 - 1
src/main/java/com/github/microservice/models/hxz/ServerTimeResult.java

@@ -1,5 +1,6 @@
 package com.github.microservice.models.hxz;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.microservice.models.hxz.base.HxzBaseResult;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -14,10 +15,15 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class ServerTimeResult extends HxzBaseResult {
+    @JsonProperty("Time")
     @Schema(description = "服务器时间")
-    private String Time;
+    private String Time = "";
+
+    @JsonProperty("WLUptate")
     @Schema(description = "1:有白名单更新  0:无")
     private int WLUptate;
+
+    @JsonProperty("WLPage")
     @Schema(description = "起始页数(当WLUptate为1却WLPage为0时 清除所有白名单)")
     private int WLPage;
 }

+ 18 - 0
src/main/java/com/github/microservice/models/hxz/base/BaseResultModel.java

@@ -0,0 +1,18 @@
+package com.github.microservice.models.hxz.base;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author TRX
+ * @date 2024/6/29
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BaseResultModel implements Serializable {
+    private String str;
+}

+ 4 - 1
src/main/java/com/github/microservice/models/hxz/base/HxzBaseResult.java

@@ -1,5 +1,6 @@
 package com.github.microservice.models.hxz.base;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -15,11 +16,13 @@ import java.io.Serializable;
 @NoArgsConstructor
 public class HxzBaseResult implements Serializable {
 
+    @JsonProperty("Status")
     // 1:成功; 0:失败
     private int Status = 0;
 
+    @JsonProperty("Msg")
     // 错误消息(Status为0时屏幕显示此内容,最多不超过8个汉字)
-    private String Msg;
+    private String Msg = "";
 
     public boolean isSuccess() {
         return Status == 1;