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/VoTradeDetails.java | 126 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 109 insertions(+), 17 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
index 559f77e..ef1acfa 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
@@ -5,9 +5,11 @@
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+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;
@@ -21,67 +23,157 @@
*/
@Data
-@JsonPropertyOrder({ "cashierId", "villageId", "clientNum", "districtTitle", "clientName", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "paymentName", "tradeTime"})
+@JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cashierName", "cardState", "districtTitle", "villageId"})
@HeadRowHeight(30)
@ContentRowHeight(20)
public class VoTradeDetails implements BaseEntity {
private static final long serialVersionUID = 202402012040001L;
- @Schema(title = "鏀堕摱鍛業D")
- @ExcelIgnore
- private String cashierId;
+ /**
+ * 璁㈠崟鍙�
+ */
+ @ExcelProperty(value = {"${title}", "璁㈠崟鍙�"})
+ @ColumnWidth(25)
+ private String orderNumber;
- @Schema(title = "鏉戝簞ID")
- @ExcelIgnore
- private String villageId;
-
- @Schema(title = "鍐滄埛缂栧彿")
- @ExcelIgnore
- private String clientNum;
-
- @ExcelProperty(value = {"${title}", "鏉戝簞鍚嶇О"})
- @ColumnWidth(20)
- private String districtTitle;
-
+ /**
+ * 鍐滄埛濮撳悕
+ */
@ExcelProperty(value = {"${title}", "鍐滄埛濮撳悕"})
@ColumnWidth(15)
private String clientName;
+ /**
+ * 姘村崱缂栧彿
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @ExcelProperty(value = {"${title}", "姘村崱缂栧彿"})
+ @ColumnWidth(20)
+ private String cardNum;
+
+ /**
+ * 韬唤璇佸彿
+ */
+ @ExcelProperty(value = {"${title}", "韬唤璇佸彿"})
+ @ColumnWidth(15)
+ private String idCard;
+
+ /**
+ * 鍐滄埛缂栧彿
+ */
+ @ExcelProperty(value = {"${title}", "鍐滄埛缂栧彿"})
+ @ColumnWidth(15)
+ private String clientNum;
+
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
@ExcelProperty(value = {"${title}", "鑱旂郴鐢佃瘽"})
@ColumnWidth(15)
private String phone;
+ /**
+ * 涓氬姟绫诲瀷
+ */
@ExcelProperty(value = {"${title}", "涓氬姟绫诲瀷"})
@ColumnWidth(15)
private String operateType;
+ /**
+ * 浜ゆ槗閲戦
+ */
@ExcelProperty(value = {"${title}", "浜ゆ槗閲戦"})
@ColumnWidth(15)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double tradeAmount;
+ /**
+ * 璐按閲戦
+ */
@ExcelProperty(value = {"${title}", "璐按閲戦"})
@ColumnWidth(15)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double waterCost;
+ /**
+ * 璐崱閲戦
+ */
@ExcelProperty(value = {"${title}", "璐崱閲戦"})
@ColumnWidth(15)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double cardCost;
+ /**
+ * 璧犻�侀噾棰�
+ */
@ExcelProperty(value = {"${title}", "璧犻�侀噾棰�"})
@ColumnWidth(15)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double gift;
+ /**
+ * 杩旇繕閲戦
+ */
@ExcelProperty(value = {"${title}", "杩旇繕閲戦"})
@ColumnWidth(15)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double refundAmount;
+ /**
+ * 浣欓
+ */
+ @ExcelProperty(value = {"${title}", "浣欓"})
+ @ColumnWidth(15)
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double money;
+
+ /**
+ * 浠樻鏂瑰紡
+ */
@ExcelProperty(value = {"${title}", "浠樻鏂瑰紡"})
@ColumnWidth(15)
private String paymentName;
+ /**
+ * 浜ゆ槗鏃堕棿
+ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = {"${title}", "浜ゆ槗鏃堕棿"})
@ColumnWidth(20)
private Date tradeTime;
+ /**
+ * 鏀堕摱鍛業D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @ExcelIgnore
+ private Long cashierId;
+
+ /**
+ * 鏀堕摱鍛樺鍚�
+ */
+ @ExcelProperty(value = {"${title}", "鏀堕摱鍛樺鍚�"})
+ @ColumnWidth(15)
+ private String cashierName;
+
+ /**
+ * 鍗＄墖鐘舵��
+ */
+ @ExcelProperty(value = {"${title}", "鍗＄墖鐘舵��"})
+ @ColumnWidth(15)
+ private String cardState;
+
+ /**
+ * 鏉戝簞鍚嶇О
+ */
+ @ExcelProperty(value = {"${title}", "鏉戝簞鍚嶇О"})
+ @ColumnWidth(35)
+ private String districtTitle;
+
+ /**
+ * 鏉戝簞ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @ExcelIgnore
+ private Long villageId;
}
--
Gitblit v1.8.0