From f8cb69b9e1b0e8443942e13bbd3f46b9d4203269 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 28 四月 2024 08:54:08 +0800
Subject: [PATCH] 靳总离职前，应元谋二期项目要求（慧图），做了通信协议修改，在他离职后，从韩月处得到最新协议，并做了部分协议软件实现修改，发现新协议中有一些协议定义有重复，也有错误的，所以这版本协议未全部实现，但实现的部分可以用来测试测控一体阀（与段志强一起测试过）。目前情况下，这版本协议实现不能应用于实际项目中，如果必须实现，还需要结合硬件协议具体实现内容再实现通信中间件的协议解析与构造部分，还需要实现上行数据处理任务树部分。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountHistory.java | 90 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountHistory.java
new file mode 100644
index 0000000..a8e6cff
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountHistory.java
@@ -0,0 +1,90 @@
+package com.dy.pipIrrGlobal.pojoRm;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.util.Date;
+
+/**
+ * @Author liurunyu
+ * @Date 2024/1/17 9:07
+ * @LastEditTime 2024/1/17 9:07
+ * @Description 鍙栨按鍙ｅ彇姘撮噺
+ */
+@TableName(value="rm_intake_amount", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "鍙栨按鍙ｅ彇姘撮噺")
+public class RmIntakeAmountHistory implements BaseEntity {
+
+ public static final long serialVersionUID = 202401170908001L;
+ /**
+ * 涓婚敭
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ public Long id;
+
+ /**
+ * 鍙栨按鍙D锛堝閿級
+ */
+ @Schema(description = "鍙栨按鍙ｅ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long intakeid;
+
+ /**
+ * 绱鍙栨按閲忥紙涓嶅寘鎷紡鎹熸按閲忥級
+ */
+ @Schema(description = "绱鍙栨按閲忥紙涓嶅寘鎷紡鎹熸按閲忥級", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double amount;
+
+ /**
+ * 绱婕忔崯姘撮噺
+ */
+ @Schema(description = "绱婕忔崯姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double loss;
+
+ /**
+ * 鏈�鍚庤姘撮噺鐨勬帶鍒跺櫒ID锛堝閿級
+ */
+ @Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long controlleridlast;
+
+ /**
+ * 鏈�鍚庤姘撮噺鏃ユ湡
+ */
+ @Schema(description = "鏈�鍚庤姘撮噺鏃ユ湡", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ public Date dtlast;
+
+ /**
+ * 鏈�鍚庤姘撮噺鏃舵帶鍒跺櫒鍙栨按閲�
+ */
+ @Schema(description = "鏈�鍚庤姘撮噺鏃舵帶鍒跺櫒鍙栨按閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double amountlast;
+
+ /**
+ * 鏈�鍚庤姘撮噺鏃舵帶鍒跺櫒绱姘撮噺
+ */
+ @Schema(description = "鏈�鍚庤姘撮噺鏃舵帶鍒跺櫒绱姘撮噺", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double totalamountlast;
+
+ /**
+ * 鏈�鍚庤姘撮噺鏉ユ簮锛�1寮�闃�宸ヤ綔鎶ワ紝2鍏抽榾鎶ワ紝3鑷姤锛�
+ */
+ @Schema(description = "鏈�鍚庤姘撮噺鏉ユ簮锛�1寮�闃�宸ヤ綔鎶ワ紝2鍏抽榾鎶ワ紝3鑷姤锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Byte resourcetypelast;
+
+
+}
\ No newline at end of file
--
Gitblit v1.8.0