From a27ef29ee2116befc9043fb34db5d3a7fecb4094 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 02 九月 2024 16:02:26 +0800
Subject: [PATCH] 优化代码 指定时间段用水量超过指定值的农户 指定时间段用水时长超过指定值的农户 指定时间段消费金额超过指定值的农户
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmCommandHistory.java | 43 +++++++++++++++++++------------------------
1 files changed, 19 insertions(+), 24 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..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,4 +1,10 @@
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;
@@ -9,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.*;
@@ -16,22 +23,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;
/**
@@ -39,7 +39,7 @@
*/
@JSONField(serializeUsing = ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
- private Long id;
+ private Long comId;
/**
* 鍔熻兘鐮�
@@ -54,28 +54,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 +82,7 @@
* 鍙戦�佸懡浠ゆ椂闂�
*/
@NotNull(message = "鍙戦�佸懡浠ゆ椂闂翠笉鑳戒负绌�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
/**
@@ -110,7 +106,6 @@
/**
* 鍛戒护缁撴灉鍐呭
*/
- @TableField(typeHandler = JacksonTypeHandler.class)
- private JSONObject resultText;
+ private String resultText;
}
\ No newline at end of file
--
Gitblit v1.8.0