更改判断条件

src/main/java/com/zoniot/ccrc/entity/MeterReadRecord.java

@@ -107,4 +107,6 @@ public class MeterReadRecord {
 
     @ApiModelProperty(value="告警信息")
     private String meterStatusInfo;
+    private Integer valveState;
+
 }

src/main/java/com/zoniot/ccrc/scheduled/SyncData.java

@@ -27,6 +27,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
@@ -240,13 +241,14 @@ public class SyncData {
         if(meterRecord!=null){
             String reading=meterRecord.getMeterReading()+"";
             meterReadRecord.setLastValid(reading);
-            //meterReadRecord.setReadTime(meterRecord.getReadingTime());
+            meterReadRecord.setReadTime(meterRecord.getReadingTime().
+                    toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
             meterReadRecord.setReadData(reading);
             Double todayCost = new BigDecimal(calculateTodayCost(reading,
                     new Double(meterReadRecord.getLastValid()),
                     meterReadRecord)).setScale(3,BigDecimal.ROUND_HALF_UP).doubleValue();
-           // meterReadRecord.setLastCost(todayCost);
-           // meterReadRecord.setValveState(meterRecord.getValveStatus());
+           meterReadRecord.setLastCost(BigDecimal.valueOf(todayCost));
+            meterReadRecord.setValveState(meterRecord.getValveStatus());
             meterReadRecord.setMeterStatusInfo(meterRecord.getMeterStatusInfo());
             meterReadRecord.setReadStatus(meterRecord.getMeterStatus()+"");
             setMeterLastDataToCache(meterReadRecord.getDeviceId(),reading);