From b09534d85ab2344151f570fd51889aca4da396b3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 05 六月 2025 09:10:12 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseRequest.java | 28 ++++------------------------
1 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseRequest.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseRequest.java
index d2a11da..e40e4fc 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseRequest.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseRequest.java
@@ -1,5 +1,6 @@
package com.ruoyi.integration.drainage.model;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@@ -10,32 +11,11 @@
* @Date 2025/1/21 17:08
*/
@Data
-public class BaseRequest<T> {
- /**
- * 运营商标识
- */
- @NotNull
- private String OperatorID;
- /**
- * 参数内容
- */
- @NotNull
- private T Data;
- /**
- * 时间戳
- * yyyyMMddHHmmss
- */
- @NotNull
- private Long TimeStamp;
- /**
- * 自增序列
- * 4位自增序列取自时间戳，同一秒内按序列自增长，新秒重计。如 0001
- */
- @NotNull
- private String Seq;
+public class BaseRequest extends BaseModel {
/**
* 数字签名
*/
@NotNull
- private String Sig;
+ @JsonProperty("Sig")
+ private String sig;
}
--
Gitblit v1.7.1