|
|
|
@ -4991,7 +4991,7 @@ public class QcServiceImpl implements QcService { |
|
|
|
} |
|
|
|
ArrayList<SubDetailValues> abnormalRows = getAbnormalCollectorData(ip, port, unitId, data); |
|
|
|
|
|
|
|
//resetCollectorAbnormalRegisters(ip, port, unitId); |
|
|
|
resetCollectorAbnormalRegisters(ip, port, unitId); |
|
|
|
return abnormalRows; |
|
|
|
}else{ |
|
|
|
logger.info(port+","+ip+","+unitId+","+baseAddr+","+groups+","); |
|
|
|
@ -5428,7 +5428,7 @@ public class QcServiceImpl implements QcService { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 无工单异常采集复位:300/301/302 + 10 组时间(6 寄存器)与异常 float 高字寄存器(5 路×2 字取高字地址)。 |
|
|
|
* 无工单异常采集复位:301/302 + 10 组时间(6 寄存器)与异常 float 高字寄存器(5 路×2 字取高字地址) + 596。 |
|
|
|
*/ |
|
|
|
private void resetCollectorAbnormalRegisters(String ip, int port, int unitId) { |
|
|
|
List<Integer> resetAddrs = new ArrayList<>(); |
|
|
|
@ -5444,6 +5444,7 @@ public class QcServiceImpl implements QcService { |
|
|
|
resetAddrs.add(abnormalStartAddr + (i * 2)); |
|
|
|
} |
|
|
|
} |
|
|
|
resetAddrs.add(596); |
|
|
|
logger.info("开始复位, 共 {} 个寄存器", resetAddrs.size()); |
|
|
|
ModbusUtils.resetRegisters(ip, port, unitId, resetAddrs); |
|
|
|
logger.info("复位结束"); |
|
|
|
|