From b83f639362ae959de55900d14d132585cd72a90d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 08:39:41 +0800
Subject: [PATCH] p206V1.0.0协议与硬件联调，并修改完善代码。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java
index 1baa9a3..83b2a95 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java
@@ -1,5 +1,12 @@
package com.dy.pipIrrGlobal.pojoRm;
+/**
+ * @author ZhuBaoMin
+ * @date 2024-05-24 10:46
+ * @LastEditTime 2024-05-24 10:46
+ * @Description
+ */
+
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
@@ -9,6 +16,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.*;
@@ -16,22 +24,15 @@
import java.util.Date;
/**
- * @author ZhuBaoMin
- * @date 2024-05-21 16:53
- * @LastEditTime 2024-05-21 16:53
- * @Description 鍛戒护鏃ュ織瀹炰綋绫�
- */
-/**
- * 鍛戒护鏃ュ織琛�
- */
-
+ * 鍛戒护鏃ュ織琛�
+ */
@TableName(value = "rm_command_history", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
-public class RmCommandHistory implements BaseEntity{
+public class RmCommandHistory implements BaseEntity {
public static final long serialVersionUID = 202401151517005L;
/**
@@ -54,28 +55,23 @@
private String commandName;
/**
+ * 鍙栨按鍙D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @NotNull(message = "鍙栨按鍙D涓嶈兘涓虹┖")
+ private Long intakeId;
+
+ /**
* 闃�鎺у櫒鍦板潃
*/
@NotBlank(message = "闃�鎺у櫒鍦板潃涓嶈兘涓虹┖")
- private String rtuaddr;
+ private String rtuAddr;
/**
* 閫氳鍗忚
*/
@NotBlank(message = "閫氳鍗忚涓嶈兘涓虹┖")
private String protocol;
-
- /**
- * 鍛戒护绫诲瀷
- */
- @NotBlank(message = "鍛戒护绫诲瀷涓嶈兘涓虹┖")
- private String commandType;
-
- /**
- * 鍥炶皟URL
- */
- @NotBlank(message = "鍥炶皟URL涓嶈兘涓虹┖")
- private String callback;
/**
* 鍙傛暟鏁版嵁
@@ -87,6 +83,7 @@
* 鍙戦�佸懡浠ゆ椂闂�
*/
@NotNull(message = "鍙戦�佸懡浠ゆ椂闂翠笉鑳戒负绌�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
/**
--
Gitblit v1.8.0