1、修改推送bug
This commit is contained in:
parent
34b4cfb1e9
commit
02c4b14110
@ -87,7 +87,9 @@ public class Forwarder {
|
|||||||
record.setRb562n(record.getRb562n()-device.getB562n());
|
record.setRb562n(record.getRb562n()-device.getB562n());
|
||||||
record.setRb562d(record.getRb562d()-device.getB562d());
|
record.setRb562d(record.getRb562d()-device.getB562d());
|
||||||
}
|
}
|
||||||
if(device.getFwddeviceid()!=null) record.setDeviceid(device.getFwddeviceid());
|
if(device.getFwddeviceid()!=null && device.getFwddeviceid().trim().length()>0) {
|
||||||
|
record.setDeviceid(device.getFwddeviceid());
|
||||||
|
}
|
||||||
recordsToSend.add(record);
|
recordsToSend.add(record);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -160,8 +162,9 @@ public class Forwarder {
|
|||||||
// 推送
|
// 推送
|
||||||
lastTime = calcData.getCreatetime();
|
lastTime = calcData.getCreatetime();
|
||||||
// 替换推送名和值
|
// 替换推送名和值
|
||||||
if(device.getFwddeviceid()!=null)
|
if(device.getFwddeviceid()!=null && device.getFwddeviceid().trim().length()>0) {
|
||||||
calcData.setDeviceid(device.getFwddeviceid());
|
calcData.setDeviceid(device.getFwddeviceid());
|
||||||
|
}
|
||||||
if(device.getB562e()!=null &&
|
if(device.getB562e()!=null &&
|
||||||
device.getB562n()!=null &&
|
device.getB562n()!=null &&
|
||||||
device.getB562d()!=null){
|
device.getB562d()!=null){
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user