|
|
@ -473,9 +473,8 @@ public class MessageHandler { |
|
|
|
value += modBusData[CCModBusEntity.POSITION_DATA + CCModBusEntity.SIZE_DATA_SINGLE * i + j]; |
|
|
|
} |
|
|
|
if (origin == null || origin.longValue() != value) { |
|
|
|
register.put(String.valueOf(startAddr), value); |
|
|
|
register.put(String.valueOf(startAddr + i), value); |
|
|
|
logger.info("寄存器数据:{}", register); |
|
|
|
|
|
|
|
} |
|
|
|
// 放到消息队列里
|
|
|
|
Register register1 = new Register(); |
|
|
@ -485,7 +484,7 @@ public class MessageHandler { |
|
|
|
OutMessage outMessage1 = new OutMessage(JacksonUtil.beanToJson(register1)); |
|
|
|
set.add(outMessage1); |
|
|
|
} |
|
|
|
if (CollectionUtil.isEmpty(set.getMessageSet())) { |
|
|
|
if (CollectionUtil.isNotEmpty(set.getMessageSet())) { |
|
|
|
messageHandler.rabbitTemplate.convertAndSend("wisdom_car", |
|
|
|
JacksonUtil.beanToJson(set)); |
|
|
|
logger.info("modbus通知mq:{}", set); |
|
|
|