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/voSe/VoClient.java | 121 +++++++++++++++++++++++++++++++++++-----
1 files changed, 106 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
index 64e4fed..117d665 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoClient.java
@@ -1,7 +1,10 @@
package com.dy.pipIrrGlobal.voSe;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -12,42 +15,130 @@
* @author ZhuBaoMin
* @date 2023/12/22 11:43
* @LastEditTime 2023/12/22 11:43
- * @Description
+ * @Description 鍐滄埛瑙嗗浘瀵硅薄
*/
@Data
-@Schema(title = "鍐滄埛瑙嗗浘瀵硅薄")
+@JsonPropertyOrder({"countyId","countryName","townId","townName","villageId","villageName","blockId","blockName","divideId","divideName","typeId","waterTypeName","clientId","name","clientNum","phone","idCard","area","cardCount","address","remarks","operateDt"})
public class VoClient implements BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 202410282047001L;
- @Schema(title = "ID")
- private Long id;
- @Schema(title = "鍐滄埛ID")
- private String clientId;
+ /**
+ * 鍘縄D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long countyId;
- @Schema(title = "鍐滄埛濮撳悕")
+ /**
+ * 鍘垮悕绉�
+ */
+ private String countryName;
+
+ /**
+ * 闀嘔D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long townId;
+
+ /**
+ * 闀囧悕绉�
+ */
+ private String townName;
+
+ /**
+ * 鏉慖D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long villageId;
+
+ /**
+ * 鏉戝悕绉�
+ */
+ private String villageName;
+
+ /**
+ * 鐗囧尯ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long blockId;
+
+ /**
+ * 鐗囧尯鍚嶇О
+ */
+ private String blockName;
+
+ /**
+ * 鍒嗘按鎴縄D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long divideId;
+
+ /**
+ * 鍒嗘按鎴垮悕绉�
+ */
+ private String divideName;
+
+ /**
+ * 鐢ㄦ埛绫诲瀷ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long typeId;
+
+ /**
+ * 鐢ㄦ埛绫诲瀷鍚嶇О
+ */
+ private String waterTypeName;
+
+ /**
+ * 鍐滄埛ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long clientId;
+
+ /**
+ * 鍐滄埛濮撳悕
+ */
private String name;
- @Schema(title = "鍐滄埛缂栧彿")
+ /**
+ * 鍐滄埛缂栧彿
+ */
private String clientNum;
- @Schema(title = "鎵嬫満鍙�")
+ /**
+ * 鎵嬫満鍙�
+ */
private String phone;
- @Schema(title = "韬唤璇佸彿")
+ /**
+ * 韬唤璇佸彿
+ */
private String idCard;
- @Schema(title = "鍗＄墖鏁伴噺")
+ /**
+ * 绉嶆闈㈢Н
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double area;
+
+ /**
+ * 鍗＄墖鏁伴噺
+ */
private Integer cardCount;
- @Schema(title = "鍦板潃")
+ /**
+ * 鍦板潃
+ */
private String address;
+
+ /**
+ * 澶囨敞
+ */
+ private String remarks;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(title = "娉ㄥ唽鏃堕棿")
private Date operateDt;
-
-
}
--
Gitblit v1.8.0