From 75432e263f73a89baed5dc4c4cccbe2ca7d6d446 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 03 三月 2025 10:05:54 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOnHourReportHistory.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOnHourReportHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOnHourReportHistory.java
index e5f3beb..36b719e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOnHourReportHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmOnHourReportHistory.java
@@ -5,8 +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.DataCdC0Vo;
+import com.dy.common.mw.protocol.p206V1.DataV1;
+import com.dy.common.mw.protocol.p206V2.DataV2;
import com.dy.common.po.BaseEntity;
import com.dy.common.util.DateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -73,32 +73,32 @@
/**
* 鐬椂娴侀噺,鍗曚綅涓簃3/h
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double instantAmount;
/**
* 绱娴侀噺,鍗曚綅涓簃3
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double totalAmount;
/**
* 鎹熷け娴侀噺(浠�0鏃跺埌褰撳墠鐨勬紡鎹熺疮璁℃祦閲忥紝24鏃朵竴涓懆鏈燂紝0鏃跺綊0)鍗曚綅涓簃3銆�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double lossAmount;
/**
* 姘村帇,鍗曚綅涓篕Pa
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterPress;
/**
* 钃勭數姹犵數鍘嬶紝鍗曚綅涓篤
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double batteryVolt;
-
- /**
- * 澶槼鑳界數鍘嬶紝鍗曚綅涓篤
- */
- public Double sunVolt;
/**
* 淇″彿寮哄害锛屽彇鍊艰寖鍥�0~99
@@ -108,16 +108,32 @@
/**
* 姘翠环锛屽崟浣嶄负鍏�
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
public Double waterPrice;
- public void valueFrom(DataV1_0_1 dV1_0_1, DataCdC0Vo cdData) throws Exception{
- this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
+
+
+ public void valueFrom(DataV1 dV1, com.dy.common.mw.protocol.p206V1.upVos.DataCdC0Vo cdData) throws Exception{
+ this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);
this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
this.instantAmount = cdData.instantAmount; //鐬椂娴侀噺,鍗曚綅涓簃3/h
this.totalAmount = cdData.totalAmount ;//绱娴侀噺,鍗曚綅涓簃3
this.lossAmount = cdData.lossAmount ;// 鎹熷け娴侀噺(浠�0鏃跺埌褰撳墠鐨勬紡鎹熺疮璁℃祦閲忥紝24鏃朵竴涓懆鏈燂紝0鏃跺綊0)鍗曚綅涓簃3銆�
this.waterPress = cdData.waterPress ;// 姘村帇,鍗曚綅涓篕Pa
this.batteryVolt = cdData.batteryVolt ;// 钃勭數姹犵數鍘嬶紝鍗曚綅涓篤
- this.sunVolt = cdData.sunVolt ;// 澶槼鑳界數鍘嬶紝鍗曚綅涓篤
+ this.signalValue = cdData.signalValue ;// 淇″彿寮哄害锛屽彇鍊艰寖鍥�0~99
+ this.waterPrice = cdData.waterPrice ;// 姘翠环锛屽崟浣嶄负鍏冦��
+ }
+
+
+
+ public void valueFrom(DataV2 dV2, com.dy.common.mw.protocol.p206V2.upVos.DataCdC0Vo cdData) throws Exception{
+ this.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV2.dt);
+ this.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
+ this.instantAmount = cdData.instantAmount; //鐬椂娴侀噺,鍗曚綅涓簃3/h
+ this.totalAmount = cdData.totalAmount ;//绱娴侀噺,鍗曚綅涓簃3
+ this.lossAmount = cdData.lossAmount ;// 鎹熷け娴侀噺(浠�0鏃跺埌褰撳墠鐨勬紡鎹熺疮璁℃祦閲忥紝24鏃朵竴涓懆鏈燂紝0鏃跺綊0)鍗曚綅涓簃3銆�
+ this.waterPress = cdData.waterPress ;// 姘村帇,鍗曚綅涓篕Pa
+ this.batteryVolt = cdData.batteryVolt ;// 钃勭數姹犵數鍘嬶紝鍗曚綅涓篤
this.signalValue = cdData.signalValue ;// 淇″彿寮哄害锛屽彇鍊艰寖鍥�0~99
this.waterPrice = cdData.waterPrice ;// 姘翠环锛屽崟浣嶄负鍏冦��
}
--
Gitblit v1.8.0