|
@@ -73,21 +73,21 @@ public class ControlDayServiceImpl implements ControlDayService {
|
|
|
if(result != null){
|
|
|
try {
|
|
|
//最近一次阀控动作如果与当前一致则不操作
|
|
|
-/* PayControlRecord payControlRecordTemp = new PayControlRecord();
|
|
|
+ PayControlRecord payControlRecordTemp = new PayControlRecord();
|
|
|
payControlRecordTemp.setAccountId(one.getAccountId());
|
|
|
PayControlRecord payControlRecordLast = payControlRecordService.getRecord(payControlRecordTemp);
|
|
|
if(payControlRecordLast != null){
|
|
|
if(payControlRecordLast.getType().intValue() == result){
|
|
|
continue;
|
|
|
}
|
|
|
- }*/
|
|
|
+ }
|
|
|
|
|
|
//执行动作与阀门当前状态一致不操作
|
|
|
-/* Device device = payControlRuleService.findDevice(one.getWatermeterId());
|
|
|
+ Device device = payControlRuleService.findDevice(one.getWatermeterId());
|
|
|
if(device != null && device.getControlStatus() != null){
|
|
|
if(device.getControlStatus().intValue() == result)
|
|
|
continue;
|
|
|
- }*/
|
|
|
+ }
|
|
|
|
|
|
//后面规则执行动作与前面一样不发送指令,但保存记录
|
|
|
Integer getResult =0;
|