From 61cfa0d30461a8020f4e54330ea049ac6efb07c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 17 七月 2024 16:21:41 +0800
Subject: [PATCH] 1、完善代码； 2、修改上行命令结果匹配命令的bug;
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 6f97065..e880f90 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
@@ -16,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.*;
@@ -39,7 +40,7 @@
*/
@JSONField(serializeUsing = ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
- private Long id;
+ private Long comId;
/**
* 鍔熻兘鐮�
@@ -54,10 +55,17 @@
private String commandName;
/**
+ * 鍙栨按鍙D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @NotNull(message = "鍙栨按鍙D涓嶈兘涓虹┖")
+ private Long intakeId;
+
+ /**
* 闃�鎺у櫒鍦板潃
*/
@NotBlank(message = "闃�鎺у櫒鍦板潃涓嶈兘涓虹┖")
- private String rtuaddr;
+ private String rtuAddr;
/**
* 閫氳鍗忚
@@ -75,6 +83,7 @@
* 鍙戦�佸懡浠ゆ椂闂�
*/
@NotNull(message = "鍙戦�佸懡浠ゆ椂闂翠笉鑳戒负绌�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
/**
--
Gitblit v1.8.0