Merge remote-tracking branch 'origin/20200908' into 20200908

meter-reading-common/src/main/java/com/huaxu/zoniot/service/impl/MeterReadRecordServiceImpl.java

@@ -397,6 +397,7 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService {
             setMeterLastDataToCache(waterMeter.getDeviceId(),measuringData);
         }catch (Exception e){
             if(e instanceof  ServiceException){
+                e.printStackTrace();
                 log.error("抄表失败",e);
             }
             else{
@@ -432,8 +433,11 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService {
      * @return
      */
     protected String getReadingFromMeterData(WaterMeter waterMeter, Map<String, MeasuringData> measuringData){
+        String readingValue = "" ;
         MeasuringData readingData = measuringData.get(waterMeter.getReadingMeasuringCode());
-        String readingValue = readingData.getMeasuringVaule();
+        if(readingData != null ){
+            readingValue = readingData.getMeasuringVaule();
+        }
         return readingValue ;
     }
     protected  BigDecimal calculateTodayCost(String currentReading,BigDecimal lastValid,MeterReadRecord record){