From e29ff6ff2de584854531e443ed4d8da0347e08bd Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 16 十二月 2024 10:40:59 +0800
Subject: [PATCH] 优化接口 小程序下的获得全部取水口接口与项目管理下的获得全部取水口接口同步
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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..163416d 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,4 @@
package com.dy.pipIrrGlobal.pojoRm;
-
/**
* @author ZhuBaoMin
* @date 2024-05-24 10:46
@@ -16,6 +15,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.*;
@@ -23,8 +23,8 @@
import java.util.Date;
/**
- * 鍛戒护鏃ュ織琛�
- */
+ * 鍛戒护鏃ュ織琛�
+ */
@TableName(value = "rm_command_history", autoResultMap = true)
@Data
@Builder
@@ -39,7 +39,7 @@
*/
@JSONField(serializeUsing = ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
- private Long id;
+ private Long comId;
/**
* 鍔熻兘鐮�
@@ -54,10 +54,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 +82,7 @@
* 鍙戦�佸懡浠ゆ椂闂�
*/
@NotNull(message = "鍙戦�佸懡浠ゆ椂闂翠笉鑳戒负绌�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
/**
@@ -98,7 +106,6 @@
/**
* 鍛戒护缁撴灉鍐呭
*/
- @TableField(typeHandler = JacksonTypeHandler.class)
- private JSONObject resultText;
+ private String resultText;
}
\ No newline at end of file
--
Gitblit v1.8.0