finish smart meter

java110-bean/src/main/java/com/java110/dto/meterMachine/MeterMachineDto.java

@@ -17,6 +17,9 @@ import java.util.List;
  **/
 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 implBeanName;
@@ -46,6 +49,10 @@ public class MeterMachineDto extends PageDto implements Serializable {
 
     private String statusCd = "0";
 
+    private int readDay ;
+
+    private int readHours;
+
 
     public String getHeartbeatTime() {
         return heartbeatTime;
@@ -231,4 +238,20 @@ public class MeterMachineDto extends PageDto implements Serializable {
     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;
+    }
 }

java110-bean/src/main/java/com/java110/po/meterMachine/MeterMachinePo.java

@@ -17,6 +17,7 @@ package com.java110.po.meterMachine;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2023-02-22 22:32:13 mail: 928255095@qq.com
@@ -28,118 +29,167 @@ import java.util.Date;
 public class MeterMachinePo implements Serializable {
 
     private String heartbeatTime;
-private String implBean;
-private String address;
-private String prestoreDegrees;
-private String statusCd = "0";
-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;
-public String getHeartbeatTime() {
+    private String implBean;
+    private String address;
+    private String prestoreDegrees;
+    private String statusCd = "0";
+    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 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 getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-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;
     }
 
+    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;
+    }
 }

java110-db/src/main/resources/mapper/common/MeterMachineV1ServiceDaoImplMapper.xml

@@ -8,9 +8,11 @@
     <!-- 保存智能水电表信息 add by wuxw 2018-07-03 -->
     <insert id="saveMeterMachineInfo" parameterType="Map">
         insert into meter_machine(
-        heartbeat_time,impl_bean,address,prestore_degrees,machine_name,room_id,room_name,cur_reading_time,machine_model,cur_degrees,machine_id,meter_type,fee_config_name,community_id,fee_config_id
+        heartbeat_time,impl_bean,address,prestore_degrees,machine_name,room_id,room_name,cur_reading_time,machine_model,
+        cur_degrees,machine_id,meter_type,fee_config_name,community_id,fee_config_id,read_day,read_hours
         ) values (
-        #{heartbeatTime},#{implBean},#{address},#{prestoreDegrees},#{machineName},#{roomId},#{roomName},#{curReadingTime},#{machineModel},#{curDegrees},#{machineId},#{meterType},#{feeConfigName},#{communityId},#{feeConfigId}
+        #{heartbeatTime},#{implBean},#{address},#{prestoreDegrees},#{machineName},#{roomId},#{roomName},#{curReadingTime},
+        #{machineModel},#{curDegrees},#{machineId},#{meterType},#{feeConfigName},#{communityId},#{feeConfigId},#{readDay},#{readHours}
         )
     </insert>
 
@@ -24,7 +26,7 @@
         machineModel,t.cur_degrees,t.cur_degrees curDegrees,t.machine_id,t.machine_id
         machineId,t.meter_type,t.meter_type meterType,t.fee_config_name,t.fee_config_name
         feeConfigName,t.community_id,t.community_id communityId,t.fee_config_id,t.fee_config_id feeConfigId,
-        mmf.factory_name implBeanName,t.create_time createTime
+        mmf.factory_name implBeanName,t.create_time createTime,t.read_day readDay,t.read_hours readHours
         from meter_machine t
         left join meter_machine_factory mmf on t.impl_bean = mmf.factory_id and mmf.status_cd='0'
         where 1 =1
@@ -138,16 +140,23 @@
         <if test="feeConfigName !=null and feeConfigName != ''">
             , t.fee_config_name= #{feeConfigName}
         </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
-        </if>
+
         <if test="feeConfigId !=null and feeConfigId != ''">
             , t.fee_config_id= #{feeConfigId}
         </if>
+        <if test="readDay !=null and readDay != ''">
+            , t.read_day= #{readDay}
+        </if>
+        <if test="readHours !=null and readHours != ''">
+            , t.read_hours = #{readHours}
+        </if>
         where 1=1
         <if test="machineId !=null and machineId != ''">
             and t.machine_id= #{machineId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </update>
 

service-common/src/main/java/com/java110/common/cmd/meterMachine/SaveMeterMachineCmd.java

@@ -24,6 +24,7 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.meterMachine.MeterMachineDto;
 import com.java110.intf.common.IMeterMachineSpecV1InnerServiceSMO;
 import com.java110.intf.common.IMeterMachineV1InnerServiceSMO;
 import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
@@ -116,6 +117,10 @@ public class SaveMeterMachineCmd extends Cmd {
         meterMachinePo.setCurReadingTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         meterMachinePo.setPrestoreDegrees("0");
         meterMachinePo.setHeartbeatTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        if(MeterMachineDto.MACHINE_MODEL_RECHARGE.equals(meterMachinePo.getMachineModel())){
+            meterMachinePo.setReadDay(1);
+            meterMachinePo.setReadHours(1);
+        }
         int flag = meterMachineV1InnerServiceSMOImpl.saveMeterMachine(meterMachinePo);
 
         if (flag < 1) {