抄表

zoniot-rmcp/zoniot-rmcp-alarm/src/test/java/com/bz/rmcp/alarm/AlarmTests.java

@@ -1,5 +1,7 @@
 package com.bz.rmcp.alarm;
 import java.util.Date;
+
+import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Maps;
 
 import com.bz.rmcp.alarm.service.impl.DeviceAlarmServiceImpl;
@@ -33,12 +35,11 @@ public class AlarmTests {
 
     @Test
     public void alarm(){
-        Map<String,Object> map = new HashMap<>();
-        map.put("WSV",90);
-        map.put("VALVE","01");
+        String json = "{\"VOL\":3.56,\"ALARM\":\"0\",\"VOL_STATUS\":\"0\",\"VALVE\":\"01\",\"WSV\":110,\"FORCED\":\"1\",\"DISTURB\":\"1\",\"OVERDRAFT\":\"1\"}";
+        Map<String,Object> map  = JSON.parseObject(json, HashMap.class);
 
         MeasureDataDto measureDataDto = new MeasureDataDto();
-        measureDataDto.setDeviceId(870001919702208512L);
+        measureDataDto.setDeviceId(880829562492162048L);
         measureDataDto.setReceiveDate(new Date());
         measureDataDto.setMeasureMap(map);
 

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

@@ -234,7 +234,7 @@ public class DeviceDataServiceImpl implements DeviceDataService {
         readRecord.setDeviceNo(vo.getDeviceNo());
         readRecord.setLocation(vo.getDeviceNo());
         readRecord.setProductId(vo.getProductId());
-        readRecord.setDeviceModel(vo.getProductModel());
+        readRecord.setDeviceModel(vo.getManufacturerName()+"/"+vo.getProductName()+"/"+vo.getProductModel());
         readRecord.setMeterNo(vo.getMeterNo());
         readRecord.setFileNo(vo.getFileNo());
         readRecord.setCreateTime(new Date());