From b1dc9988b9587add132a01faa6bc09e162fe1491 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 七月 2024 21:39:38 +0800
Subject: [PATCH] 1、开关阀报中增加农户关联； 2、工作报中增加农户关联； 3、取水口损失流量完善； 4、实现取水日取水量统计。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java
index 8e6f9ee..4419eac 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmWorkReportHistory.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd84Vo;
import com.dy.common.mw.protocol.p206V202404.DataV202404;
import com.dy.common.mw.protocol.p206V202404.upVos.DataCd80_5BVo;
import com.dy.common.po.BaseEntity;
@@ -38,6 +40,18 @@
@TableId(type = IdType.INPUT)
public Long id;
+ /**
+ * 鍐滄埛瀹炰綋ID锛堝閿級
+ */
+ @Schema(description = "鍐滄埛瀹炰綋澶栭敭", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long clientId;
+
+ /**
+ * 鍐滄埛濮撳悕
+ */
+ @Schema(description = "鍐滄埛濮撳悕", requiredMode = Schema.RequiredMode.REQUIRED)
+ public String clientName;
/**
* 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
*/
@@ -252,4 +266,35 @@
this.waterMeterTransVolt = cdData.waterMeterTransVolt ;
this.waterMeterWorkVolt = cdData.waterMeterWorkVolt ;
}
+
+
+ public void valueFrom(DataV1_0_1 dV1_0_1, DataCd84Vo cdData) throws Exception{
+ this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
+ this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
+ //this.orderNo = cdData.orderNo ;
+ this.icCardAddr = cdData.cardAddr ;
+ this.icCardNo = cdData.cardNo ;
+ //this.waterLevel = cdData.waterLevel ;
+ //this.waterPress = cdData.waterPress ;
+ this.waterInstant = cdData.instantAmount ;
+ this.waterTotal = cdData.totalAmount ;
+ //this.eleTotal = cdData.eleTotal ;
+ this.moneyRemain = cdData.remainMoney ;
+ //this.waterRemain = cdData.waterRemain ;
+ //this.thisEle = cdData.thisEle ;
+ //this.thisWater = cdData.thisWater ;
+ //this.thisMoney = cdData.thisMoney ;
+ //this.thisDuration = cdData.thisDuration ;
+ //this.waterPrice = cdData.waterPrice ;
+ //this.elePrice = cdData.elePrice ;
+ //this.aVolt = cdData.aVolt ;
+ //this.bVolt = cdData.bVolt ;
+ //this.cVolt = cdData.cVolt ;
+ //this.aCurrent = cdData.aCurrent ;
+ //this.bCurrent = cdData.bCurrent ;
+ //this.cCurrent = cdData.cCurrent ;
+ //this.batteryVolt = cdData.batteryVolt ;
+ //this.waterMeterTransVolt = cdData.waterMeterTransVolt ;
+ //this.waterMeterWorkVolt = cdData.waterMeterWorkVolt ;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0