From 0d9deb18ad450dfc8939193c549ec27fd7915698 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 27 二月 2023 19:11:20 +0800
Subject: [PATCH] return fee comment

---
 java110-bean/src/main/java/com/java110/dto/meterMachine/MeterMachineDto.java |  206 ++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 163 insertions(+), 43 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/meterMachine/MeterMachineDto.java b/java110-bean/src/main/java/com/java110/dto/meterMachine/MeterMachineDto.java
index cf45687..79331ef 100644
--- a/java110-bean/src/main/java/com/java110/dto/meterMachine/MeterMachineDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/meterMachine/MeterMachineDto.java
@@ -1,8 +1,11 @@
 package com.java110.dto.meterMachine;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.meterMachineSpec.MeterMachineSpecDto;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -14,116 +17,161 @@
  **/
 public class MeterMachineDto extends PageDto implements Serializable {
 
+    public static final String MACHINE_MODEL_RECHARGE  ="1001";//閲嶇疆妯″紡
+    public static final String MACHINE_MODEL_READ  ="2002";//璇昏〃妯″紡
+
     private String heartbeatTime;
-private String implBean;
-private String address;
-private String prestoreDegrees;
-private String machineName;
-private String roomId;
-private String roomName;
-private String curReadingTime;
-private String machineModel;
-private String curDegrees;
-private String machineId;
-private String meterType;
-private String feeConfigName;
-private String communityId;
-private String feeConfigId;
+    private String implBean;
+    private String implBeanName;
+    private String address;
+    private String prestoreDegrees;
+    private String machineName;
+    private String machineNameLike;
+    private String roomId;
+    private String roomName;
+    private String roomNameLike;
+    private String curReadingTime;
+    private String machineModel;
+    private String curDegrees;
+    private String machineId;
+    private String meterType;
+    private String feeConfigName;
+    private String feeConfigNameLike;
+    private String communityId;
+    private String feeConfigId;
+
+    private double rechargeDegree;
+    private double rechargeMoney;
+
+    private List<MeterMachineSpecDto> specs;
 
 
     private Date createTime;
 
     private String statusCd = "0";
 
+    private int readDay ;
+
+    private int readHours;
+
 
     public String getHeartbeatTime() {
         return heartbeatTime;
     }
-public void setHeartbeatTime(String heartbeatTime) {
+
+    public void setHeartbeatTime(String heartbeatTime) {
         this.heartbeatTime = heartbeatTime;
     }
-public String getImplBean() {
+
+    public String getImplBean() {
         return implBean;
     }
-public void setImplBean(String implBean) {
+
+    public void setImplBean(String implBean) {
         this.implBean = implBean;
     }
-public String getAddress() {
+
+    public String getAddress() {
         return address;
     }
-public void setAddress(String address) {
+
+    public void setAddress(String address) {
         this.address = address;
     }
-public String getPrestoreDegrees() {
+
+    public String getPrestoreDegrees() {
         return prestoreDegrees;
     }
-public void setPrestoreDegrees(String prestoreDegrees) {
+
+    public void setPrestoreDegrees(String prestoreDegrees) {
         this.prestoreDegrees = prestoreDegrees;
     }
-public String getMachineName() {
+
+    public String getMachineName() {
         return machineName;
     }
-public void setMachineName(String machineName) {
+
+    public void setMachineName(String machineName) {
         this.machineName = machineName;
     }
-public String getRoomId() {
+
+    public String getRoomId() {
         return roomId;
     }
-public void setRoomId(String roomId) {
+
+    public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
-public String getRoomName() {
+
+    public String getRoomName() {
         return roomName;
     }
-public void setRoomName(String roomName) {
+
+    public void setRoomName(String roomName) {
         this.roomName = roomName;
     }
-public String getCurReadingTime() {
+
+    public String getCurReadingTime() {
         return curReadingTime;
     }
-public void setCurReadingTime(String curReadingTime) {
+
+    public void setCurReadingTime(String curReadingTime) {
         this.curReadingTime = curReadingTime;
     }
-public String getMachineModel() {
+
+    public String getMachineModel() {
         return machineModel;
     }
-public void setMachineModel(String machineModel) {
+
+    public void setMachineModel(String machineModel) {
         this.machineModel = machineModel;
     }
-public String getCurDegrees() {
+
+    public String getCurDegrees() {
         return curDegrees;
     }
-public void setCurDegrees(String curDegrees) {
+
+    public void setCurDegrees(String curDegrees) {
         this.curDegrees = curDegrees;
     }
-public String getMachineId() {
+
+    public String getMachineId() {
         return machineId;
     }
-public void setMachineId(String machineId) {
+
+    public void setMachineId(String machineId) {
         this.machineId = machineId;
     }
-public String getMeterType() {
+
+    public String getMeterType() {
         return meterType;
     }
-public void setMeterType(String meterType) {
+
+    public void setMeterType(String meterType) {
         this.meterType = meterType;
     }
-public String getFeeConfigName() {
+
+    public String getFeeConfigName() {
         return feeConfigName;
     }
-public void setFeeConfigName(String feeConfigName) {
+
+    public void setFeeConfigName(String feeConfigName) {
         this.feeConfigName = feeConfigName;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getFeeConfigId() {
+
+    public String getFeeConfigId() {
         return feeConfigId;
     }
-public void setFeeConfigId(String feeConfigId) {
+
+    public void setFeeConfigId(String feeConfigId) {
         this.feeConfigId = feeConfigId;
     }
 
@@ -143,4 +191,76 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public List<MeterMachineSpecDto> getSpecs() {
+        return specs;
+    }
+
+    public void setSpecs(List<MeterMachineSpecDto> specs) {
+        this.specs = specs;
+    }
+
+    public String getImplBeanName() {
+        return implBeanName;
+    }
+
+    public void setImplBeanName(String implBeanName) {
+        this.implBeanName = implBeanName;
+    }
+
+    public String getMachineNameLike() {
+        return machineNameLike;
+    }
+
+    public void setMachineNameLike(String machineNameLike) {
+        this.machineNameLike = machineNameLike;
+    }
+
+    public String getRoomNameLike() {
+        return roomNameLike;
+    }
+
+    public void setRoomNameLike(String roomNameLike) {
+        this.roomNameLike = roomNameLike;
+    }
+
+    public String getFeeConfigNameLike() {
+        return feeConfigNameLike;
+    }
+
+    public void setFeeConfigNameLike(String feeConfigNameLike) {
+        this.feeConfigNameLike = feeConfigNameLike;
+    }
+
+    public double getRechargeDegree() {
+        return rechargeDegree;
+    }
+
+    public void setRechargeDegree(double rechargeDegree) {
+        this.rechargeDegree = rechargeDegree;
+    }
+
+    public int getReadDay() {
+        return readDay;
+    }
+
+    public void setReadDay(int readDay) {
+        this.readDay = readDay;
+    }
+
+    public int getReadHours() {
+        return readHours;
+    }
+
+    public void setReadHours(int readHours) {
+        this.readHours = readHours;
+    }
+
+    public double getRechargeMoney() {
+        return rechargeMoney;
+    }
+
+    public void setRechargeMoney(double rechargeMoney) {
+        this.rechargeMoney = rechargeMoney;
+    }
 }

--
Gitblit v1.8.0