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/SeGeneral.java | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java
index 7504a19..1580c2a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeGeneral.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.Max;
import jakarta.validation.constraints.Min;
@@ -33,51 +34,61 @@
public static final long serialVersionUID = 202401241912001L;
/**
- * 涓婚敭
- */
+ * 涓婚敭
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
@Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long id;
/**
- * 鏀堕摱鍛樺鍚�
- */
+ * 鏀堕摱鍛業D
+ */
+ @Schema(description = "鏀堕摱鍛業D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "鏀堕摱鍛業D涓嶈兘涓虹┖")
+ private Long cashierId;
+
+ /**
+ * 鏀堕摱鍛樺鍚�
+ */
@Schema(description = "鏀堕摱鍛樺鍚�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotBlank(message = "鏀堕摱鍛樺鍚嶄笉鑳戒负绌�")
private String cashierName;
/**
- * 瀹炴敹閲戦
- */
+ * 瀹炴敹閲戦
+ */
@Schema(description = "瀹炴敹閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotNull(message = "瀹炴敹閲戦涓嶈兘涓虹┖")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double tradeAmount;
/**
- * 璧犻�侀噾棰�
- */
+ * 璧犻�侀噾棰�
+ */
@Schema(description = "璧犻�侀噾棰�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotNull(message = "璧犻�侀噾棰濅笉鑳戒负绌�")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double gift;
/**
- * 鎬婚
- */
- @Schema(description = "鎬婚", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotNull(message = "鎬婚涓嶈兘涓虹┖")
- private Double totalAmount;
+ * 杩旇繕閲戦
+ */
+ @Schema(description = "杩旇繕閲戦", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "杩旇繕閲戦涓嶈兘涓虹┖")
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double refundAmount;
/**
- * 浜ゆ槗鏃ユ湡
- */
+ * 浜ゆ槗鏃ユ湡
+ */
@Schema(description = "浜ゆ槗鏃ユ湡", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@NotNull(message = "浜ゆ槗鏃ユ湡涓嶈兘涓虹┖")
private Date operateDate;
/**
- * 瀹℃牳鐘舵��;1-鏈鏍革紝2-鍚屾剰锛�3-椹冲洖
- */
+ * 瀹℃牳鐘舵��;1-鏈鏍革紝2-鍚屾剰锛�3-椹冲洖
+ */
@Schema(description = "瀹℃牳鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@Max(message = "瀹℃牳鐘舵�佹渶澶т负3", value = 3)
@Min(message = "瀹℃牳鐘舵�佹渶灏忎负1",value = 1)
--
Gitblit v1.8.0