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/pojoBa/BaDistrict.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
index 9a0eb2c..dcfa310 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
@@ -6,33 +6,92 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.mybatis.envm.Deleted;
import com.dy.common.po.BaseEntity;
import com.dy.pipIrrGlobal.util.DistrictLevel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
import lombok.*;
+import org.hibernate.validator.constraints.Length;
import java.util.List;
+/**
+ * 琛屾斂鍖哄垝瀹炰綋
+ */
@TableName(value="ba_district", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
+@Schema(name = "琛屾斂鍖哄垝瀹炰綋")
public class BaDistrict implements BaseEntity {
public static final long serialVersionUID = 202311081046001L;
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Long id ;
- public Long supperId;//涓婄骇琛屾斂鍖篒D
+ /**
+ * 涓婄骇琛屼笅鍖篒D
+ */
+ @Schema(description = "涓婄骇瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long supperId;
+ /**
+ * 琛屾斂鍖哄悕绉�
+ */
+ @Schema(description = "琛屾斂鍖哄悕绉�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "琛屾斂鍖哄悕绉颁笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ @Length(message = "琛屾斂鍖哄悕绉颁笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
public String name;
+ /**
+ * 琛屾斂鍖虹紪鍙�
+ */
+ @Schema(description = "琛屾斂鍖虹紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "琛屾斂鍖虹紪鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ @Max(message = "琛屾斂鍖虹紪鍙蜂笉澶т簬99", value = 99)
+ @Min(message = "琛屾斂鍖虹紪鍙蜂笉灏忎簬0",value = 0)
+ public String num;
+
+ /**
+ * 琛屾斂鍖虹骇鍒�
+ */
+ @Schema(description = "琛屾斂鍖虹骇鍒�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @NotNull(message = "琛屾斂鍖虹骇鍒笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ @Max(message = "琛屾斂鍖虹骇鍒笉澶т簬10", value = 10)
+ @Min(message = "琛屾斂鍖虹骇鍒笉灏忎簬0",value = 0)
public DistrictLevel level;
+ /**
+ * 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄� 1琛ㄧず鍒犻櫎.
+ */
+ @Schema(description = "鍒犻櫎鏍囪瘑锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Deleted deleted;
+
+ /**
+ * 涓嬬骇琛屾斂鍖洪泦鍚�
+ */
@TableField(exist = false)
public List<BaDistrict> subDistricts ;
+ /**
+ * 涓嬬骇琛屾斂鍖洪泦鍚�
+ */
+ @Schema(description = "鏄惁鍙互娣讳笅绾э紝琛ㄥ崟涓嶇敤濉啓锛屽彧鍦ㄦ煡璇㈠垪琛ㄦ椂鏈夋晥", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @TableField(exist = false)
+ public boolean canAdd ;
+
+ @Schema(description = "鏄惁鍙互鍒犻櫎锛岃〃鍗曚笉鐢ㄥ～鍐欙紝鍙湪鏌ヨ鍒楄〃鏃舵湁鏁�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @TableField(exist = false)
+ public boolean canDelete ;
+
}
\ No newline at end of file
--
Gitblit v1.8.0