建筑

src/main/java/com/zoniot/ccrc/commom/model/DeviceData.java

@@ -21,6 +21,7 @@ public class DeviceData {
     private String locDesc;
     private Double meterReading;
     private Integer valveStatus;
+    private Integer deviceStatus;
     private Integer status;
     @JSONField(format="yyyy-MM-dd HH:mm:ss")
     private Date lastReceiveTime;

src/main/java/com/zoniot/ccrc/service/impl/DeviceServiceImpl.java

@@ -166,7 +166,7 @@ public class DeviceServiceImpl implements DeviceService{
         device.setLocDesc(deviceData.getLocDesc());
         device.setMeterReading(deviceData.getMeterReading());
         device.setValveStatus(deviceData.getValveStatus());
-        device.setDeviceStatus(deviceData.getValveStatus());
+        device.setDeviceStatus(deviceData.getDeviceStatus());
         device.setLastReceiveTime(deviceData.getLastReceiveTime());
         device.setStatus(deviceData.getStatus());
         device.setCreateBy("system");