From e1310d24b502fea752afb403b080aa4eda4046b0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 15 十一月 2024 17:40:34 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/EnergyBoardVO.java |   76 ++++++--------------------------------
 1 files changed, 12 insertions(+), 64 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/EnergyBoardVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/EnergyBoardVO.java
index 13217a0..719fb55 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/EnergyBoardVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/EnergyBoardVO.java
@@ -22,76 +22,24 @@
     @ApiModelProperty(value = "纰虫帓鏀� 鍗曚綅 鍚�")
     private BigDecimal carbon;
 
-    @ApiModelProperty(value = "涓婃湀鐢ㄧ數 鍗曚綅 kw路h")
-    private Integer electricityQuantity;
-
-    @ApiModelProperty(value = "鐢ㄧ數鐜瘮")
-    private BigDecimal electricityYear;
-
-    @ApiModelProperty(value = "鐢ㄧ數鍚屾瘮")
-    private BigDecimal electricityMonth;
+    @ApiModelProperty(value = "涓婃湀鐢ㄧ數 鍗曚綅 kw路h  鎬婚噺銆佸悓姣斻�佺幆姣�")
+    private EnergyModelDataVO electricityQuantity;
 
 
-    @ApiModelProperty(value = "涓婃湀鐢ㄦ按 鍗曚綅 t")
-    private BigDecimal waterQuantity;
-
-    @ApiModelProperty(value = "鐢ㄦ按鐜瘮")
-    private BigDecimal waterYear;
-
-    @ApiModelProperty(value = "鐢ㄦ按鍚屾瘮")
-    private BigDecimal waterMonth;
+    @ApiModelProperty(value = "涓婃湀鐢ㄦ按 鍗曚綅 t 鎬婚噺銆佸悓姣斻�佺幆姣� ")
+    private EnergyModelDataVO waterQuantity;
 
 
+    @ApiModelProperty(value = "涓婃湀鐢ㄦ皵 鍗曚綅 鎬婚噺銆佸悓姣斻�佺幆姣� ")
+    private EnergyModelDataVO gasQuantity;
 
-    @ApiModelProperty(value = "涓婃湀鐢ㄦ皵 鍗曚綅 ")
-    private BigDecimal gasQuantity;
+    @ApiModelProperty(value = "浠婃棩鐢ㄧ數 鍗曚綅 kw路h锛屾�婚噺銆佸悓姣斻�佺幆姣�")
+    private EnergyModelDataVO todayElectricity;
 
-    @ApiModelProperty(value = "鐢ㄦ皵鐜瘮")
-    private BigDecimal gasYear;
+    @ApiModelProperty(value = "鏈湀鐢ㄧ數 鍗曚綅 kw路h 鎬婚噺銆佸悓姣斻�佺幆姣�")
+    private EnergyModelDataVO monthElectricity;
 
-    @ApiModelProperty(value = "鐢ㄦ皵鍚屾瘮")
-    private BigDecimal gasMonth;
+    @ApiModelProperty(value = "鏄ㄦ棩鐢ㄧ數 鍗曚綅 kw路h 鎬婚噺銆佸悓姣斻�佺幆姣�")
+    private EnergyModelDataVO yesterdayElectricity;
 
-
-    @ApiModelProperty(value = "鍔炲叕妤肩敤鐢� 鍗曚綅 kw路h")
-    private Integer officeQuantity;
-
-    @ApiModelProperty(value = "鎴愬搧搴撶敤鐢� 鍗曚綅 kw路h")
-    private Integer productHouseQuantity;
-
-    @ApiModelProperty(value = "鑱斿悎宸ユ埧鐢ㄧ數 鍗曚綅 kw路h")
-    private Integer workHouseQuantity;
-
-    @ApiModelProperty(value = "鐗╂祦鍥尯鐢ㄧ數 鍗曚綅 kw路h")
-    private Integer parkQuantity;
-
-    @ApiModelProperty(value = "鍔ㄥ姏绔欐埧鐢ㄧ數 鍗曚綅 kw路h")
-    private Integer powerQuantity;
-
-    @ApiModelProperty(value = "浠婃棩鐢ㄧ數 鍗曚綅 kw路h")
-    private Integer todayElectricity;
-
-    @ApiModelProperty(value = "鏈湀鐢ㄧ數 鍗曚綅 kw路h")
-    private Integer monthElectricity;
-
-    @ApiModelProperty(value = "鏄ㄦ棩鐢ㄧ數 鍗曚綅 kw路h")
-    private Integer yesterdayElectricity;
-
-    @ApiModelProperty(value = "瀹炴椂璐熻嵎鏇茬嚎",hidden = true)
-    private List<EnergyDataVO> loadCurveList;
-
-    @ApiModelProperty(value = "鏈堣兘鑰楀垎鏋� - 姘�",hidden = true)
-    private List<EnergyDataVO> energyDataWaterList;
-
-    @ApiModelProperty(value = "鏈堣兘鑰楀垎鏋� - 姘�",hidden = true)
-    private List<EnergyDataVO> energyDataGasList;
-
-    @ApiModelProperty(value = "鏈堣兘鑰楀垎鏋� - 鐢�",hidden = true)
-    private List<EnergyDataVO> energyDataElectricityList;
-
-    @ApiModelProperty(value = "鏈堟补鑰楀垎鏋�",hidden = true)
-    private List<EnergyDataVO> oilList;
-
-    @ApiModelProperty(value = "涓婃湀娌硅�楁帓琛�",hidden = true)
-    private List<OilDataVO> lastMonthOilList;
 }

--
Gitblit v1.9.3