日志

ccmq/src/main/java/com/ccsens/ccmq/lowlevel/client/netty/tcphexserver/ModbusDecoder.java

@@ -63,7 +63,7 @@ public class ModbusDecoder extends ByteToMessageDecoder {
 
             CCModBusEntity ccModBusEntity = new CCModBusEntity(in);
             CCModBusEntity.Error error = ccModBusEntity.valid();
-            log.info("modbus数据检查：{}", error);
+            log.info("modBus数据检查：{}", error);
             switch (error) {
                 case ERROR_FILTER_NOT_MATCH:
                 case ERROR_LEN_EXCLUEE_MAX:
@@ -82,6 +82,10 @@ public class ModbusDecoder extends ByteToMessageDecoder {
             //交给下个handler处理
             discardNBytes(in, ccModBusEntity.getModbusLength());
 
+            for (int i = 0; i < ccModBusEntity.getModbusData().length ; i++) {
+                log.info("modBus原始数据"+i + ":" + Integer.toHexString(ccModBusEntity.getModbusData()[i]) +"------" + ccModBusEntity.getModbusData()[i]);
+            }
+
             InMessage message = ModbusConverter.convertCCModbusToMessage(ccModBusEntity);
             log.info("modBus封装成inMessage:{}", message);
             if (ObjectUtil.isNotNull(message)) {

ccmq/src/main/java/com/ccsens/ccmq/lowlevel/message/MessageHandler.java

@@ -130,6 +130,7 @@ public class MessageHandler {
         List<String> sendTimesUpLimitMessageList = null,expiredMessageList = null;
 
         while(true){
+            try {
                 logger.info("while true");
                 //从redis中或取第一个待处理用户
                 Object o = RedisUtil.sPop(RedisKeyManager.getPendingClientSetKey());
@@ -200,6 +201,9 @@ public class MessageHandler {
                     }
                     ResourceLock.freeLockObj(ackId);
                 }
+            } catch (Exception e) {
+                logger.error("循环发送消息异常", e);
+            }
             try {
                 Thread.sleep(100);
             } catch (InterruptedException e) {
@@ -476,8 +480,9 @@ public class MessageHandler {
                             // 寄存器将要修改的数据
                             long value = 0;
                             for (int j = 0; j < CCModBusEntity.SIZE_DATA_SINGLE; j++) {
+
                                 value <<= 8;
-                                value += modBusData[CCModBusEntity.POSITION_DATA + CCModBusEntity.SIZE_DATA_SINGLE * i + j];
+                                value |= modBusData[CCModBusEntity.POSITION_DATA + CCModBusEntity.SIZE_DATA_SINGLE * i + j] & 0xFF;
                             }
                             if (origin == null || origin.longValue() != value) {
                                 register.put(String.valueOf(startAddr + i), value);

ccmq/src/main/java/com/ccsens/ccmq/lowlevel/message/common/MessageConstant.java

@@ -28,8 +28,7 @@ public class MessageConstant {
         }
 
         public long getAddr(){
-            long addr = first << 8;
-            addr += second;
+            long addr = ((long)first << 8 | second) & 0xFFFF;
             return addr;
         }
 

ccmq/src/main/java/wiki/tall/ccmq/common/bean/dto/ccmodbus/CCModBusEntity.java

@@ -73,7 +73,7 @@ public class CCModBusEntity {
         int start = POSITION_REGISTER;
         for (int i = 0; i < SIZE_REGISTER_START; i++) {
             addr <<= 8;
-            addr += modBusData[start + i];
+            addr |= modBusData[start + i] & 0xFF;
         }
 
         return addr;
@@ -97,7 +97,7 @@ public class CCModBusEntity {
         int start = SIZE_FILTER + SIZE_LEN + SIZE_ADDR + SIZE_OPER + SIZE_REGISTER_START;
         for (int i = 0; i < SIZE_REGISTER_NUM; i++) {
             number <<= 8;
-            number += modBusData[start + i];
+            number |= modBusData[start + i] & 0xFF;
         }
 
         return number;