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/voPr/VoIntake.java | 83 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
index 89a2e92..3626863 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
@@ -3,8 +3,11 @@
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
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.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;
@@ -19,43 +22,97 @@
*/
@Data
-@Schema(title = "鍙栨按鍙ｈ鍥惧璞�")
+@JsonPropertyOrder({ "intakeId", "intakeName", "divideId", "divideName", "blockId", "blockName", "isBind", "address", "lng", "lat", "operator", "operateDt", "remarks", "controllerId", "rtuAddr", "protocol", "findDt", "isOnLine", "bindNumber"})
+@HeadRowHeight(30)
+@ContentRowHeight(20)
public class VoIntake implements BaseEntity {
private static final long serialVersionUID = 202312261049001L;
- @Schema(title = "ID")
- @ExcelProperty("ID")
- @ColumnWidth(10)
- private Long id;
+ @Schema(title = "鍙栨按鍙D")
+ @ExcelIgnore
+ private String intakeId;
@Schema(title = "鍙栨按鍙ｅ悕绉�")
- @ExcelProperty("鍙栨按鍙ｅ悕绉�")
+ @ExcelProperty(value = {"${title}", "鍙栨按鍙ｇ紪鍙�"})
@ColumnWidth(15)
private String intakeName;
+ @Schema(title = "鍒嗘按鎴縄D")
+ @ExcelIgnore
+ private String divideId;
+
@Schema(title = "鎵�灞炲垎姘存埧")
- @ExcelProperty("鎵�灞炲垎姘存埧")
+ @ExcelProperty(value = {"${title}", "鎵�灞炲垎姘存埧"})
@ColumnWidth(15)
private String divideName;
+ @Schema(title = "鐗囧尯ID")
+ @ExcelIgnore
+ private String blockId;
+
@Schema(title = "鎵�灞炵墖鍖�")
- @ExcelProperty("鎵�灞炵墖鍖�")
+ @ExcelProperty(value = {"${title}", "鎵�灞炵墖鍖�"})
@ColumnWidth(15)
private String blockName;
- @Schema(title = "缁戝畾璁惧")
- @ExcelProperty("缁戝畾璁惧")
- @ColumnWidth(6)
+ @Schema(title = "鏄惁缁戝畾璁惧")
+ @ExcelProperty(value = {"${title}", "鏄惁缁戝畾璁惧"})
+ @ColumnWidth(10)
private String isBind;
@Schema(title = "鍦板潃")
- @ExcelProperty("鍦板潃")
- @ColumnWidth(25)
+ @ExcelProperty(value = {"${title}", "鍦板潃"})
+ @ColumnWidth(30)
private String address;
+
+ @Schema(title = "缁忓害")
+ @ExcelProperty(value = {"${title}", "缁忓害"})
+ @ColumnWidth(20)
+ private String lng;
+
+ @Schema(title = "绾害")
+ @ExcelProperty(value = {"${title}", "绾害"})
+ @ColumnWidth(20)
+ private String lat;
+
+ @Schema(title = "鎿嶄綔浜�")
+ @ExcelIgnore
+ @ColumnWidth(25)
+ private String operator;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(title = "鎿嶄綔鏃堕棿")
@ExcelIgnore
private Date operateDt;
+
+ @Schema(title = "澶囨敞")
+ @ExcelIgnore
+ private String remarks;
+
+ @Schema(title = "鎺у埗鍣↖D")
+ @ExcelIgnore
+ private String controllerId;
+
+ @Schema(title = "鎺у埗鍣ㄥ湴鍧�")
+ @ExcelProperty(value = {"${title}", "鎺у埗鍣ㄥ湴鍧�"})
+ @ColumnWidth(15)
+ private String rtuAddr;
+
+ @Schema(title = "閫氳鍗忚")
+ @ExcelIgnore
+ private String protocol;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Schema(title = "鍙戠幇鏃ユ湡鏃堕棿")
+ @ExcelProperty(value = {"${title}", "鍙戠幇鏃堕棿"})
+ @ColumnWidth(20)
+ private Date findDt;
+
+ @Schema(title = "缁戝畾娆℃暟")
+ @ExcelProperty(value = {"${title}", "缁戝畾娆℃暟"})
+ @ColumnWidth(10)
+ private Integer bindNumber;
+
}
--
Gitblit v1.8.0