From 936fb552a30c05fc7a60c20f47bf6fccbc2dc1c1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 27 十二月 2023 16:17:23 +0800
Subject: [PATCH] 备份一下代码
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseInfoBean.java | 60 ++++++++++++++++++++++++++----------------------------------
1 files changed, 26 insertions(+), 34 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseInfoBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseInfoBean.java
index 891580d..eb572d2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseInfoBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseInfoBean.java
@@ -1,31 +1,23 @@
package com.hdl.photovoltaic.ui.bean;
-public class HouseInfoBean {
- private String homeId;//鐢电珯id
+/**
+ * 鐢电珯璇︽儏瀹炰綋绫�
+ */
+public class HouseInfoBean extends HouseIdBean {
private Location location;//鐢电珯鍦板潃
private String address;//璇︾粏鍦板潃
private String latitude;//绾害
private String longitude;//缁忓害
- private String homeName;//鐢电珯鍚嶇О
private String timezone;//鏃跺尯
- private int powerStationType;//鐢电珯绫诲瀷(DOMESTIC_ROOF:瀹剁敤灞嬮《,COMMERCIAL_ROOF:鍟嗕笟鐢ㄥ眿椤�,INDUSTRIAL_ROOF:宸ヤ笟鐢ㄥ眿椤�,SURFACE_POWER_STATION:鍦伴潰鐢电珯)
- private int workMode;//宸ヤ綔妯″紡(self_use:鑷彂鑷敤,peak_load_shifting:鍓婂嘲濉胺,battery_priority:鐢垫睜浼樺厛,auto:鏅鸿兘妯″紡)
- private String installedCapacity;//瑁呮満瀹归噺
+ private String powerStationType;//鐢电珯绫诲瀷(DOMESTIC_ROOF:瀹剁敤灞嬮《,COMMERCIAL_ROOF:鍟嗕笟鐢ㄥ眿椤�,INDUSTRIAL_ROOF:宸ヤ笟鐢ㄥ眿椤�,SURFACE_POWER_STATION:鍦伴潰鐢电珯)
+ private String workMode;//宸ヤ綔妯″紡(self_use:鑷彂鑷敤,peak_load_shifting:鍓婂嘲濉胺,battery_priority:鐢垫睜浼樺厛,auto:鏅鸿兘妯″紡)
private long productionTime;//鎶曚骇鏃ュ織
private String monetaryUnit;//璐у竵鍗曚綅
private String electrovalence;//鐢典环
private String totalCost;//鎬绘垚鏈�
-
private String zoneType;//鍖哄煙
- public String getHomeId() {
- return homeId == null ? "" : homeId;
- }
-
- public void setHomeId(String homeId) {
- this.homeId = homeId;
- }
public Location getLocation() {
return location == null ? new Location() : location;
@@ -59,13 +51,6 @@
this.longitude = longitude;
}
- public String getHomeName() {
- return homeName == null ? "" : homeName;
- }
-
- public void setHomeName(String homeName) {
- this.homeName = homeName;
- }
public String getTimezone() {
return timezone == null ? "" : timezone;
@@ -75,29 +60,22 @@
this.timezone = timezone;
}
- public int getPowerStationType() {
- return powerStationType;
+ public String getPowerStationType() {
+ return powerStationType == null ? "" : powerStationType;
}
- public void setPowerStationType(int powerStationType) {
+ public void setPowerStationType(String powerStationType) {
this.powerStationType = powerStationType;
}
- public int getWorkMode() {
- return workMode;
+ public String getWorkMode() {
+ return workMode == null ? "" : workMode;
}
- public void setWorkMode(int workMode) {
+ public void setWorkMode(String workMode) {
this.workMode = workMode;
}
- public String getInstalledCapacity() {
- return installedCapacity == null ? "" : installedCapacity;
- }
-
- public void setInstalledCapacity(String installedCapacity) {
- this.installedCapacity = installedCapacity;
- }
public long getProductionTime() {
return productionTime;
@@ -138,6 +116,7 @@
public void setZoneType(String zoneType) {
this.zoneType = zoneType;
}
+
public static class Location {
private String nationCode;//鍥藉缂栫爜
@@ -196,4 +175,17 @@
}
}
+
+
+ /**
+ * 鎷间綇瀹呭湴鍧�
+ *
+ * @return 浣忓畢鍦板潃
+ */
+ public String getHomeAddress() {
+ if (this.location == null) {
+ return this.address;
+ }
+ return this.location.nationName + this.location.provinceName + this.location.cityName + this.address;
+ }
}
--
Gitblit v1.8.0