|
@@ -249,8 +249,8 @@ public class BusDeviceRunningEntity extends CommonDeviceParam<String,String> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//设置阻塞
|
|
//设置阻塞
|
|
|
- this.setBlock1(items.getInteger(PumpParams.maxFlow));
|
|
|
|
|
- this.setBlock2(items.getInteger(PumpParams.maxFlow));
|
|
|
|
|
|
|
+ this.setBlock1(items.getInteger(PumpParams.block1));
|
|
|
|
|
+ this.setBlock2(items.getInteger(PumpParams.block2));
|
|
|
|
|
|
|
|
if(ObjectUtil.isNotNull(this.getBlock1())&&ObjectUtil.isNotNull(this.getBlock2())){
|
|
if(ObjectUtil.isNotNull(this.getBlock1())&&ObjectUtil.isNotNull(this.getBlock2())){
|
|
|
int abs = Math.abs(this.getBlock1() - this.getBlock2());
|
|
int abs = Math.abs(this.getBlock1() - this.getBlock2());
|