From b397edee2be2dfcc3f28eeac50298b4de26b1afa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 十二月 2024 16:53:45 +0800
Subject: [PATCH] 取水口日取水量表中,出现一些大数,明显不正确,发析系统日志,发现一些阀控器会上报一些累计流量为0的数据,且无规律,推测是其不能从水表读取到累计流量时会上报0值。如果间歇上报0值,间歇上报一些非0值,非0值减去0值,就会出现大数,一天中出现几次那么会大数进行累加,数值将更大。为此变更算法,规避这种情况,但也会丢失一些流量值。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
index d9600e3..075c426 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeClientCard.java
@@ -6,6 +6,7 @@
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 jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Positive;
@@ -44,6 +45,9 @@
@Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long id;
+ @NotBlank(message = "閫氳鍗忚涓嶈兘涓虹┖")
+ private String protocol;
+
/**
* 姘村崱鍦板潃
*/
@@ -69,6 +73,7 @@
* 浣欓
*/
@Schema(description = "浣欓", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float money;
/**
@@ -78,6 +83,13 @@
@Positive(message = "鍗$墖鐘舵�佸繀椤讳负1鎴�2鎴�3")
@Size(min = 1, max = 3)
private Byte state;
+
+ /**
+ * 鍘熸寕澶卞崱ID
+ */
+ @Schema(description = "鍗$墖鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Positive(message = "鍘熸寕澶卞崱ID蹇呴』涓烘鏁�")
+ private Long originalCardId;
/**
* 寮�鍗℃椂闂�
@@ -122,6 +134,12 @@
private Date reversaldt;
/**
+ * 琛ユ墸鏃堕棿
+ */
+ @Schema(description = "琛ユ墸鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ private Date refunddt;
+
+ /**
* 娑堣垂鏃堕棿
*/
@Schema(description = "娑堣垂鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
--
Gitblit v1.8.0