抄表

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceMapper.xml

@@ -715,7 +715,7 @@
       <if test="lastReceiveTime != null">
         last_receive_time = #{lastReceiveTime},
       </if>
-      `offline_date` = #{lastAlarmDate},
+      `offline_date` = null,
       <if test="updateBy != null">
         update_by = #{updateBy},
       </if>

zoniot-rmcp/zoniot-rmcp-dap/src/main/java/com/bz/rmcp/dap/service/impl/DeviceDataServiceImpl.java

@@ -105,7 +105,7 @@ public class DeviceDataServiceImpl implements DeviceDataService {
         //更新数据项
         Query updateQuery = new Query();
         updateQuery.addCriteria(Criteria.where("deviceId").is(meterData.getDeviceId()));
-        updateQuery.addCriteria(Criteria.where("data.readDate").is(DateUtil.getDate(new Date())));
+        //updateQuery.addCriteria(Criteria.where("data.readDate").is(DateUtil.getDate(new Date())));
         Update update = new Update();
         update.set("data.$.readTime",meterData.getReceiveDate().getTime());
         update.set("data.$.readData",meterData.getReadData());

zoniot-rmcp/zoniot-xxljob-client/src/main/java/com/zcxk/xxljob/service/impl/MeterReadRecordServiceImpl.java

@@ -72,10 +72,10 @@ public class MeterReadRecordServiceImpl implements MeterReadRecordService {
     private void batchCreateMeterUnReadRecord(List<WaterMeterDto> waterMeterList, int readDay) {
         if(waterMeterList.isEmpty())return;
 
-        //更新抄表记录
+        // 1、更新抄表记录
         updateReadingData(waterMeterList,readDay);
 
-        //保存未抄记录
+        // 2、保存未抄记录
         saveUnReadingData(readDay);
     }