调整落库逻辑

src/main/java/com/isu/gaswellwatch/modbus/data/PersistenceHandler.java

@@ -7,7 +7,10 @@ package com.isu.gaswellwatch.modbus.data;
  * 2024/11/23 11:53
  */
 public interface PersistenceHandler {
-    public static final String MODBUS_DEVICE_TYPE = "KNPCV1";
+    String KNPCV1_MODBUS_TYPE = "knpc";
+    String ETC_MODBUS_TYPE = "etc";
+    String SCSS_MODBUS_TYPE = "scss";
+    String DEVICE_INFO_CACHE = "info:device:";
     String DEVICE_DATA_CACHE = "data:device:";
 
     void createTable(String tableName, Long deviceId);

src/main/java/com/isu/gaswellwatch/modbus/data/Redis2DBPersistenceService.java

@@ -1,8 +1,7 @@
-package com.isu.gaswellwatch.modbus.data.impl;
+package com.isu.gaswellwatch.modbus.data;
 
 import cn.hutool.core.map.MapUtil;
 import com.isu.gaswellwatch.entity.Response;
-import com.isu.gaswellwatch.modbus.data.PersistenceHandler;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -34,8 +33,9 @@ import java.util.stream.Collectors;
 @SuppressWarnings("all")
 public class Redis2DBPersistenceService {
 
-    private static final String EXISTS_TABLE_SQL = "SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA" +
+    private static final String EXISTS_TABLE_SQL = "SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA"
-            " IN ('gaswellwatch', 'gas_well_watch') AND TABLE_NAME='$TableName$'";
+            + " IN ('gaswellwatch', 'gas_well_watch') AND TABLE_NAME='$TableName$'";
+    private static final String DEVICE_INFO_SQL = "SELECT * from device where id = ";
     @Resource
     private JdbcTemplate jdbcTemplate;
     @Resource(name = "stringRedisTemplate")
@@ -65,10 +65,19 @@ public class Redis2DBPersistenceService {
                     continue;
                 }
                 if (Objects.nonNull(idGatewayMappingMap)) {
-                    operations.put(PersistenceHandler.DEVICE_DATA_CACHE + deviceId,
+                    operations.put(PersistenceHandler.DEVICE_DATA_CACHE + deviceId, "online",
-                            "online", String.valueOf(idGatewayMappingMap.containsKey(deviceId)));
+                            String.valueOf(idGatewayMappingMap.containsKey(deviceId)));
                 }
-                persistenceHandler = persistenceHandlerMap.get("KNPCV1");
+                String modbusDeviceType = (String) operations.get(PersistenceHandler.DEVICE_INFO_CACHE + deviceId, "product");
+                if (StringUtils.isEmpty(modbusDeviceType)) {
+                    Map<String, Object> deviceInfo = this.jdbcTemplate.queryForMap(DEVICE_INFO_SQL + deviceId);
+                    Map<String, Object> cacheDeviceInfo = new HashMap<>(deviceInfo.size());
+                    deviceInfo.forEach((key, value) -> cacheDeviceInfo.put(key, Objects.isNull(value) ? null : String.valueOf(value)));
+                    modbusDeviceType = (String) cacheDeviceInfo.get("product");
+                    operations.putAll(PersistenceHandler.DEVICE_INFO_CACHE + deviceId, cacheDeviceInfo);
+                }
+
+                persistenceHandler = persistenceHandlerMap.get(PersistenceHandler.KNPCV1_MODBUS_TYPE);
                 tableName = "t_device_data_" + deviceId;
                 existsTableList = this.jdbcTemplate.queryForList(StringUtils.replace(EXISTS_TABLE_SQL, "$TableName$", tableName));
                 if (ObjectUtils.isEmpty(existsTableList)
@@ -84,18 +93,14 @@ public class Redis2DBPersistenceService {
     private Map<Long, String> getOnlineGateway() {
         try {
             RequestEntity request = RequestEntity.get("http://127.0.0.1:9999/modbus-tcp/online").build();
-            ResponseEntity<Response<List<String>>> response = this.restTemplate.exchange(request,
+            ResponseEntity<Response<List<String>>> response = this.restTemplate.exchange(request, new ParameterizedTypeReference<Response<List<String>>>() {
-                    new ParameterizedTypeReference<Response<List<String>>>() {
             });
-            if (Objects.isNull(response)
+            if (Objects.isNull(response) || Objects.isNull(response.getBody()) || ObjectUtils.isEmpty(response.getBody().getData())) {
-                    || Objects.isNull(response.getBody())
-                    || ObjectUtils.isEmpty(response.getBody().getData())) {
                 return null;
             }
-            List<Map<String, Object>> idGatewayMappingList = this.jdbcTemplate
+            List<Map<String, Object>> idGatewayMappingList = this.jdbcTemplate.queryForList("select id, gateway_sn" +
-                    .queryForList("select id, gateway_sn from devices where gateway_sn in (" +
+                    " from device where gateway_sn in (" +
-                            response.getBody().getData().stream().map(value -> "'" + value + "'")
+                    response.getBody().getData().stream().map(value -> "'" + value + "'").collect(Collectors.joining(",")) + ")");
-                                    .collect(Collectors.joining(",")) + ")");
             if (ObjectUtils.isEmpty(idGatewayMappingList)) {
                 return null;
             }

src/main/java/com/isu/gaswellwatch/modbus/data/decode/DecodeHandler.java

@@ -13,6 +13,7 @@ import java.util.Map;
  * 2024/11/23 11:20
  */
 public interface DecodeHandler {
+    String DECODE_NAME = "DecodeHandler";
 
     Logger logger = LoggerFactory.getLogger("com.isu.gaswellwatch.decode");
 

src/main/java/com/isu/gaswellwatch/modbus/data/decode/impl/ComposeDecodeHandler.java

@@ -0,0 +1,35 @@
+package com.isu.gaswellwatch.modbus.data.decode.impl;
+
+import com.isu.gaswellwatch.modbus.data.ModbusMessage;
+import com.isu.gaswellwatch.modbus.data.decode.DecodeHandler;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:shilong.wang@alpha-ess.com">王仕龙</a>
+ * 2024/11/25 16:31
+ */
+public class ComposeDecodeHandler implements DecodeHandler {
+
+    public final Collection<DecodeHandler> collection;
+
+    public ComposeDecodeHandler(Collection<DecodeHandler> collection) {
+        this.collection = collection;
+    }
+
+    @Override
+    public String decode(Map<String, Object> commandPointMap, String value) {
+        for (DecodeHandler handler : this.collection) {
+            value = handler.decode(commandPointMap, value);
+        }
+        return value;
+    }
+
+    @Override
+    public void decode(Map<String, Object> commandPointMap, ModbusMessage.MessagePoint point) {
+        for (DecodeHandler handler : this.collection) {
+            handler.decode(commandPointMap, point);
+        }
+    }
+}

src/main/java/com/isu/gaswellwatch/modbus/data/decode/impl/FactorDecodeHandler.java

@@ -3,7 +3,6 @@ package com.isu.gaswellwatch.modbus.data.decode.impl;
 import cn.hutool.core.map.MapUtil;
 import com.isu.gaswellwatch.modbus.data.ModbusMessage;
 import com.isu.gaswellwatch.modbus.data.decode.DecodeHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -23,10 +22,10 @@ import java.util.Map;
  * @author <a href="mailto:shilong.wang@alpha-ess.com">王仕龙</a>
  * 2024/11/24 21:23
  */
-@Slf4j
+@Component(FactorDecodeHandler.NAME + DecodeHandler.DECODE_NAME)
-@SuppressWarnings("all")
-@Component("factorDecodeHandler")
 public class FactorDecodeHandler implements DecodeHandler {
+    public static final String NAME = "factor";
+
 
     @Override
     public String decode(Map<String, Object> commandPointMap, String value) {
@@ -35,11 +34,11 @@ public class FactorDecodeHandler implements DecodeHandler {
 
     @Override
     public void decode(Map<String, Object> commandPointMap, ModbusMessage.MessagePoint point) {
-        point.setValue(decode(commandPointMap, point.getParseValue()));
+        point.setValue(this.decode(commandPointMap, point.getParseValue()));
         String factorStr = MapUtil.getStr(commandPointMap, "factor");
         if (StringUtils.isNotBlank(factorStr) && StringUtils.isNotBlank(point.getParseValue())) {
             BigDecimal factor = new BigDecimal(factorStr);
-            BigDecimal value = new BigDecimal(point.getParseValue());
+            BigDecimal value = new BigDecimal(point.getValue());
             int precision = MapUtil.getInt(commandPointMap, "precision", 0);
             switch (factor.compareTo(BigDecimal.ZERO)) {
                 case -1 -> point.setValue(value.multiply(factor.abs()).toString());

src/main/java/com/isu/gaswellwatch/modbus/data/decode/impl/HighLowBinDecodeHandler.java

@@ -0,0 +1,32 @@
+package com.isu.gaswellwatch.modbus.data.decode.impl;
+
+import com.isu.gaswellwatch.modbus.data.ModbusMessage;
+import com.isu.gaswellwatch.modbus.data.decode.DecodeHandler;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 高低位4字节解析器
+ *
+ * @author <a href="mailto:shilong.wang@alpha-ess.com">王仕龙</a>
+ * 2024/11/25 16:36
+ */
+@Component(HighLowBinDecodeHandler.NAME + DecodeHandler.DECODE_NAME)
+public class HighLowBinDecodeHandler implements DecodeHandler {
+
+    public static final String NAME = "highLowBin";
+
+    @Override
+    public String decode(Map<String, Object> commandPointMap, String value) {
+        return StringUtils.isBlank(value) ? value : NumberUtils.createLong(value).toString();
+    }
+
+    @Override
+    public void decode(Map<String, Object> commandPointMap, ModbusMessage.MessagePoint point) {
+        point.setValue(this.decode(commandPointMap, point.getValue()));
+    }
+
+}

src/main/java/com/isu/gaswellwatch/modbus/data/decode/impl/LocalDateDecodeHandler.java

@@ -2,7 +2,6 @@ package com.isu.gaswellwatch.modbus.data.decode.impl;
 
 import com.isu.gaswellwatch.modbus.data.ModbusMessage;
 import com.isu.gaswellwatch.modbus.data.decode.DecodeHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDate;
@@ -15,10 +14,10 @@ import java.util.Map;
  * @author <a href="mailto:shilong.wang@alpha-ess.com">王仕龙</a>
  * 2024/11/25 11:51
  */
-@Slf4j
+@Component(LocalDateDecodeHandler.NAME + DecodeHandler.DECODE_NAME)
-@SuppressWarnings("all")
-@Component("localDateDecodeHandler")
 public class LocalDateDecodeHandler implements DecodeHandler {
+    public static final String NAME = "localDate";
+
     public static final DateTimeFormatter IN_FORMATTER = DateTimeFormatter.ofPattern("yyyy-M-d");
     public static final DateTimeFormatter OUT_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
@@ -30,7 +29,7 @@ public class LocalDateDecodeHandler implements DecodeHandler {
 
     @Override
     public void decode(Map<String, Object> commandPointMap, ModbusMessage.MessagePoint point) {
-        point.setValue(decode(commandPointMap, point.getParseValue()));
+        point.setValue(this.decode(commandPointMap, point.getValue()));
     }
 
 }

src/main/java/com/isu/gaswellwatch/modbus/data/decode/impl/LocalDateTimeDecodeHandler.java

@@ -2,7 +2,6 @@ package com.isu.gaswellwatch.modbus.data.decode.impl;
 
 import com.isu.gaswellwatch.modbus.data.ModbusMessage;
 import com.isu.gaswellwatch.modbus.data.decode.DecodeHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -15,10 +14,10 @@ import java.util.Map;
  * @author <a href="mailto:shilong.wang@alpha-ess.com">王仕龙</a>
  * 2024/11/24 21:34
  */
-@Slf4j
+@Component(LocalDateTimeDecodeHandler.NAME + DecodeHandler.DECODE_NAME)
-@SuppressWarnings("all")
-@Component("localDateTimeDecodeHandler")
 public class LocalDateTimeDecodeHandler implements DecodeHandler {
+    public static final String NAME = "localDateTime";
+
     public static final DateTimeFormatter IN_FORMATTER = DateTimeFormatter.ofPattern("yyyy-M-d H:m:s");
     public static final DateTimeFormatter OUT_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
@@ -30,7 +29,7 @@ public class LocalDateTimeDecodeHandler implements DecodeHandler {
 
     @Override
     public void decode(Map<String, Object> commandPointMap, ModbusMessage.MessagePoint point) {
-        point.setValue(decode(commandPointMap, point.getParseValue()));
+        point.setValue(this.decode(commandPointMap, point.getValue()));
     }
 
 }

src/main/java/com/isu/gaswellwatch/modbus/data/decode/impl/LocalTimeDecodeHandler.java

@@ -2,7 +2,6 @@ package com.isu.gaswellwatch.modbus.data.decode.impl;
 
 import com.isu.gaswellwatch.modbus.data.ModbusMessage;
 import com.isu.gaswellwatch.modbus.data.decode.DecodeHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalTime;
@@ -15,10 +14,9 @@ import java.util.Map;
  * @author <a href="mailto:shilong.wang@alpha-ess.com">王仕龙</a>
  * 2024/11/25 11:58
  */
-@Slf4j
+@Component(LocalTimeDecodeHandler.NAME + DecodeHandler.DECODE_NAME)
-@SuppressWarnings("all")
-@Component("localTimeDecodeHandler")
 public class LocalTimeDecodeHandler implements DecodeHandler {
+    public static final String NAME = "localTime";
     public static final DateTimeFormatter IN_FORMATTER = DateTimeFormatter.ofPattern("H:m:s");
     public static final DateTimeFormatter OUT_FORMATTER = DateTimeFormatter.ofPattern("HH:mm:ss");
 
@@ -30,7 +28,7 @@ public class LocalTimeDecodeHandler implements DecodeHandler {
 
     @Override
     public void decode(Map<String, Object> commandPointMap, ModbusMessage.MessagePoint point) {
-        point.setValue(decode(commandPointMap, point.getParseValue()));
+        point.setValue(this.decode(commandPointMap, point.getValue()));
     }
 
 }

src/main/java/com/isu/gaswellwatch/modbus/data/decode/impl/SignedNumberDecodeHandler.java

@@ -0,0 +1,34 @@
+package com.isu.gaswellwatch.modbus.data.decode.impl;
+
+import com.isu.gaswellwatch.modbus.data.ModbusMessage;
+import com.isu.gaswellwatch.modbus.data.decode.DecodeHandler;
+import com.isu.gaswellwatch.utils.ReverseComplementCodeUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 有符号整数转换
+ *
+ * @author <a href="mailto:shilong.wang@alpha-ess.com">王仕龙</a>
+ * 2024/11/25 16:24
+ */
+@Component(SignedNumberDecodeHandler.NAME + DecodeHandler.DECODE_NAME)
+public class SignedNumberDecodeHandler implements DecodeHandler {
+    public static final String NAME = "signedNumber";
+
+    @Override
+    public String decode(Map<String, Object> commandPointMap, String value) {
+        int decimalNumber = Integer.parseInt(value, 16);
+        String binaryNumber = Integer.toBinaryString(decimalNumber);
+        binaryNumber = ReverseComplementCodeUtils.binOriginalToReverse(binaryNumber);
+        binaryNumber = ReverseComplementCodeUtils.binReverseToComplement(binaryNumber, "1");
+        return ReverseComplementCodeUtils.binComplementToDec(binaryNumber);
+    }
+
+    @Override
+    public void decode(Map<String, Object> commandPointMap, ModbusMessage.MessagePoint point) {
+        point.setValue(this.decode(commandPointMap, point.getParseValue()));
+    }
+
+}

src/main/java/com/isu/gaswellwatch/modbus/data/decode/impl/StringTimeDecodeHandler.java

@@ -2,7 +2,6 @@ package com.isu.gaswellwatch.modbus.data.decode.impl;
 
 import com.isu.gaswellwatch.modbus.data.ModbusMessage;
 import com.isu.gaswellwatch.modbus.data.decode.DecodeHandler;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -17,10 +16,9 @@ import java.util.stream.Collectors;
  * @author <a href="mailto:shilong.wang@alpha-ess.com">王仕龙</a>
  * 2024/11/24 21:38
  */
-@Slf4j
+@Component(StringTimeDecodeHandler.NAME + DecodeHandler.DECODE_NAME)
-@SuppressWarnings("all")
-@Component("stringTimeDecodeHandler")
 public class StringTimeDecodeHandler implements DecodeHandler {
+    public static final String NAME = "stringTime";
 
     @Override
     public String decode(Map<String, Object> commandPointMap, String value) {
@@ -34,7 +32,7 @@ public class StringTimeDecodeHandler implements DecodeHandler {
 
     @Override
     public void decode(Map<String, Object> commandPointMap, ModbusMessage.MessagePoint point) {
-        point.setValue(decode(commandPointMap, point.getParseValue()));
+        point.setValue(this.decode(commandPointMap, point.getValue()));
     }
 
 }

src/main/java/com/isu/gaswellwatch/modbus/data/impl/Knpcv1PersistenceHandler.java

@@ -26,7 +26,7 @@ import java.util.Objects;
  * @author <a href="mailto:shilong.wang@alpha-ess.com">王仕龙</a>
  * 2024/11/24 17:33
  */
-@Component(PersistenceHandler.MODBUS_DEVICE_TYPE)
+@Component(PersistenceHandler.KNPCV1_MODBUS_TYPE)
 public class Knpcv1PersistenceHandler implements PersistenceHandler {
 
     @Resource

src/main/java/com/isu/gaswellwatch/modbus/data/listener/ComposeModbusMessageListener.java

@@ -1,4 +1,4 @@
-package com.isu.gaswellwatch.modbus.data.decode.listener;
+package com.isu.gaswellwatch.modbus.data.listener;
 
 import com.isu.gaswellwatch.utils.SpringUtil;
 import org.springframework.amqp.core.BatchMessageListener;

src/main/java/com/isu/gaswellwatch/modbus/data/listener/DynamicRabbitListener.java

@@ -1,4 +1,4 @@
-package com.isu.gaswellwatch.modbus.data.decode.listener;
+package com.isu.gaswellwatch.modbus.data.listener;
 
 /**
  * @author <a href="mailto:shilong.wang@alpha-ess.com">王仕龙</a>

src/main/java/com/isu/gaswellwatch/modbus/data/listener/ModbusMessageBackupListener.java

@@ -1,4 +1,4 @@
-package com.isu.gaswellwatch.modbus.data.decode.listener;
+package com.isu.gaswellwatch.modbus.data.listener;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.IOUtils;

src/main/java/com/isu/gaswellwatch/modbus/data/listener/ModbusMessagePersistListener.java

@@ -1,10 +1,12 @@
-package com.isu.gaswellwatch.modbus.data.decode.listener;
+package com.isu.gaswellwatch.modbus.data.listener;
 
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.json.JSONUtil;
 import com.isu.gaswellwatch.modbus.data.ModbusMessage;
 import com.isu.gaswellwatch.modbus.data.PersistenceHandler;
 import com.isu.gaswellwatch.modbus.data.decode.DecodeHandler;
+import com.isu.gaswellwatch.modbus.data.decode.impl.ComposeDecodeHandler;
+import com.isu.gaswellwatch.modbus.data.decode.impl.HighLowBinDecodeHandler;
 import com.isu.gaswellwatch.modbus.data.decode.impl.LocalDateTimeDecodeHandler;
 import com.serotonin.modbus4j.code.FunctionCode;
 import com.serotonin.modbus4j.msg.*;
@@ -27,10 +29,7 @@ import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 /**
  * @author <a href="mailto:shilong.wang@alpha-ess.com">王仕龙</a>
@@ -49,6 +48,9 @@ public class ModbusMessagePersistListener implements BatchMessageListener {
     private JdbcTemplate jdbcTemplate;
     @Resource(name = "stringRedisTemplate")
     private RedisTemplate redisTemplate;
+
+    @Resource(name = HighLowBinDecodeHandler.NAME + DecodeHandler.DECODE_NAME)
+    private DecodeHandler highLowBinDecodeHandler;
     @Resource
     private Map<String, DecodeHandler> decodeHandlerMap;
 
@@ -85,8 +87,7 @@ public class ModbusMessagePersistListener implements BatchMessageListener {
                     log.error("指令[{}]不存在，数据: {}", commandId, messageString);
                     continue;
                 }
-                this.redisTemplate.opsForValue()
+                this.redisTemplate.opsForValue().setIfAbsent(COMMAND_CACHE + commandId, JSONUtil.toJsonStr(commandMap), Duration.ofDays(1));
-                        .setIfAbsent(COMMAND_CACHE + commandId, JSONUtil.toJsonStr(commandMap), Duration.ofDays(1));
             }
             try {
                 String address;
@@ -110,9 +111,9 @@ public class ModbusMessagePersistListener implements BatchMessageListener {
                     case FunctionCode.READ_HOLDING_REGISTERS -> {
                         values = ((ReadHoldingRegistersResponse) modbusResponse).getShortData();
                     }
-//                    case FunctionCode.READ_EXCEPTION_STATUS -> {
+                    case FunctionCode.READ_EXCEPTION_STATUS -> {
-//                        values = new short[]{((ReadExceptionStatusResponse) modbusResponse).getExceptionStatus()};
+                        values = new short[]{((ReadExceptionStatusResponse) modbusResponse).getExceptionStatus()};
-//                    }
+                    }
                     default -> {
                         throw new RuntimeException("Funcetion code not supported: " + modbusResponse.getFunctionCode());
                     }
@@ -168,11 +169,11 @@ public class ModbusMessagePersistListener implements BatchMessageListener {
         String deviceDataCacheName = PersistenceHandler.DEVICE_DATA_CACHE + modbusMessage.getDeviceId();
         HashOperations<String, Object, Object> hashOperations = this.redisTemplate.opsForHash();
         hashOperations.put(deviceDataCacheName, "deviceId", String.valueOf(modbusMessage.getDeviceId()));
-        hashOperations.put(deviceDataCacheName, "receiveTime", LocalDateTime.ofInstant(Instant
+        hashOperations.put(deviceDataCacheName, "receiveTime", LocalDateTime
-                        .ofEpochMilli(modbusMessage.getReceiveTime()), ZoneOffset.systemDefault())
+                .ofInstant(Instant.ofEpochMilli(modbusMessage.getReceiveTime()), ZoneOffset.systemDefault())
                 .format(LocalDateTimeDecodeHandler.OUT_FORMATTER));
-        hashOperations.put(deviceDataCacheName, "collectionTime", LocalDateTime.ofInstant(Instant
+        hashOperations.put(deviceDataCacheName, "collectionTime", LocalDateTime
-                        .ofEpochMilli(modbusMessage.getCollectionTime()), ZoneOffset.systemDefault())
+                .ofInstant(Instant.ofEpochMilli(modbusMessage.getCollectionTime()), ZoneOffset.systemDefault())
                 .format(LocalDateTimeDecodeHandler.OUT_FORMATTER));
         for (Map<String, Object> point : commandPointList) {
             fieldName = MapUtil.getStr(point, "field");
@@ -180,13 +181,17 @@ public class ModbusMessagePersistListener implements BatchMessageListener {
             decodeName = MapUtil.getStr(point, "decode_name");
             startAddress = MapUtil.getInt(point, "start_address");
             String value;
-            if (stepSize <= 1) {
+            if (StringUtils.startsWith(decodeName, HighLowBinDecodeHandler.NAME)) {
+                value = decodeHighLowCommandPoint(modbusMessage.getMessagePointMap(), decodeName, point, startAddress);
+            } else if (StringUtils.startsWith(decodeName, HighLowBinDecodeHandler.NAME)) {
+                value = decodeHighLowStepCommandPoint(modbusMessage.getMessagePointMap(), decodeName, point, startAddress, stepSize);
+            } else if (stepSize <= 1) {
                 messagePoint = modbusMessage.getMessagePointMap()
                         .get(StringUtils.leftPad(String.valueOf(startAddress), 4, '0'));
                 decodeMessage(decodeName, point, messagePoint);
                 value = messagePoint.getValue();
             } else {
-                value = decodeCommandPoint(modbusMessage.getMessagePointMap(), decodeName, point, startAddress, stepSize);
+                value = decodeStepCommandPoint(modbusMessage.getMessagePointMap(), decodeName, point, startAddress, stepSize);
             }
             hashOperations.put(deviceDataCacheName, fieldName, value);
         }
@@ -194,14 +199,44 @@ public class ModbusMessagePersistListener implements BatchMessageListener {
 
     private void decodeMessage(String decodeName, Map<String, Object> commandPointMap, ModbusMessage.MessagePoint messagePoint) {
         if (StringUtils.isNotBlank(decodeName)) {
-            DecodeHandler decodeHandler = this.decodeHandlerMap.get(decodeName + "DecodeHandler");
+            DecodeHandler decodeHandler;
+            if (StringUtils.contains(decodeName, ",")) {
+                decodeHandler = new ComposeDecodeHandler(Arrays.stream(StringUtils.split(decodeName, ","))
+                        .map(name -> this.decodeHandlerMap.get(name + DecodeHandler.DECODE_NAME)).filter(Objects::nonNull).toList());
+            } else {
+                decodeHandler = this.decodeHandlerMap.get(decodeName + DecodeHandler.DECODE_NAME);
+            }
             if (Objects.nonNull(decodeHandler)) {
                 decodeHandler.decode(commandPointMap, messagePoint);
             }
         }
     }
 
-    private String decodeCommandPoint(Map<String, ModbusMessage.MessagePoint> pointMap, String decodeName,
+    private String decodeMessage(String decodeName, Map<String, Object> commandPointMap, String value) {
+        if (StringUtils.isNotBlank(decodeName)) {
+            DecodeHandler decodeHandler;
+            if (StringUtils.contains(decodeName, ",")) {
+                List<DecodeHandler> handlers = Arrays.stream(StringUtils.split(decodeName, ","))
+                        .filter(name -> !StringUtils.equals(name, HighLowBinDecodeHandler.NAME))
+                        .map(name -> this.decodeHandlerMap.get(name + DecodeHandler.DECODE_NAME))
+                        .filter(Objects::nonNull)
+                        .toList();
+                if (handlers.size() == 1) {
+                    decodeHandler = handlers.get(0);
+                } else {
+                    decodeHandler = new ComposeDecodeHandler(handlers);
+                }
+            } else {
+                decodeHandler = this.decodeHandlerMap.get(decodeName + DecodeHandler.DECODE_NAME);
+            }
+            if (Objects.nonNull(decodeHandler)) {
+                return decodeHandler.decode(commandPointMap, value);
+            }
+        }
+        return value;
+    }
+
+    private String decodeStepCommandPoint(Map<String, ModbusMessage.MessagePoint> pointMap, String decodeName,
                                           Map<String, Object> commandPointMap, int startAddress, int stepSize) {
         String[] values = new String[stepSize];
         ModbusMessage.MessagePoint messagePoint;
@@ -210,14 +245,37 @@ public class ModbusMessagePersistListener implements BatchMessageListener {
             values[i] = messagePoint.getValue();
         }
         String format = MapUtil.getStr(commandPointMap, "format");
-        String result = StringUtils.isBlank(format) ? StringUtils.join(values) : String.format(format, values);
+        return decodeMessage(decodeName, commandPointMap,
-        if (StringUtils.isNotBlank(decodeName)) {
+                StringUtils.isBlank(format) ? StringUtils.join(values) : String.format(format, values));
-            DecodeHandler decodeHandler = this.decodeHandlerMap.get(decodeName + "DecodeHandler");
-            if (Objects.nonNull(decodeHandler)) {
-                return decodeHandler.decode(commandPointMap, result);
-            }
-        }
-        return result;
     }
 
+    private String decodeHighLowCommandPoint(Map<String, ModbusMessage.MessagePoint> pointMap, String decodeName,
+                                             Map<String, Object> commandPointMap, int startAddress) {
+        String[] values = new String[2];
+        ModbusMessage.MessagePoint messagePoint;
+        for (int i = 0; i < 2; i++) {
+            messagePoint = pointMap.get(StringUtils.leftPad(String.valueOf(startAddress + i), 4, '0'));
+            values[i] = messagePoint.getValue();
+        }
+        String result = highLowBinDecodeHandler.decode(commandPointMap, StringUtils.join(values));
+        return decodeMessage(decodeName, commandPointMap, result);
+    }
+
+    private String decodeHighLowStepCommandPoint(Map<String, ModbusMessage.MessagePoint> pointMap, String decodeName,
+                                                 Map<String, Object> commandPointMap, int startAddress, int stepSize) {
+        String[] values = new String[stepSize];
+        ModbusMessage.MessagePoint highPoint;
+        ModbusMessage.MessagePoint lowPoint;
+        for (int i = 0; i < stepSize; i = i + 2) {
+            highPoint = pointMap.get(StringUtils.leftPad(String.valueOf(startAddress + i), 4, '0'));
+            lowPoint = pointMap.get(StringUtils.leftPad(String.valueOf(startAddress + i + 1), 4, '0'));
+            values[i] = highLowBinDecodeHandler.decode(commandPointMap, highPoint.getValue() + lowPoint.getValue());
+        }
+
+        String format = MapUtil.getStr(commandPointMap, "format");
+        return decodeMessage(decodeName, commandPointMap,
+                StringUtils.isBlank(format) ? StringUtils.join(values) : String.format(format, values));
+    }
+
+
 }

src/main/java/com/isu/gaswellwatch/utils/ReverseComplementCodeUtils.java

@@ -0,0 +1,102 @@
+package com.isu.gaswellwatch.utils;
+
+/**
+ * @author <a href="mailto:shilong.wang@alpha-ess.com">王仕龙</a>
+ * 2024/11/25 16:07
+ */
+public class ReverseComplementCodeUtils {
+
+    /**
+     * 原码转反码
+     *
+     * @param source 二进制原码
+     * @return
+     */
+    public static String binOriginalToReverse(String source) {
+        if (source.startsWith("0")) {
+            return source;
+        } else {
+            StringBuffer sbf = new StringBuffer();
+            sbf.append("1");
+            String f_str = source.substring(1);
+            for (int i = 0; i < f_str.length(); i++) {
+                String s_str = String.valueOf(f_str.charAt(i));
+                if (s_str.equals("0")) {
+                    sbf.append("1");
+                } else if (s_str.equals("1")) {
+                    sbf.append("0");
+                }
+            }
+            return sbf.toString();
+        }
+    }
+
+    /**
+     * 反码转补码, 默认补1
+     *
+     * @param reverse 二进制反码字符串
+     * @return
+     */
+    public static String binReverseToComplement(String reverse) {
+        return binReverseToComplement(reverse, "1");
+    }
+
+    /**
+     * 反码转补码
+     *
+     * @param reverse    二进制反码字符串
+     * @param complement 二进制补数字符串
+     * @return
+     */
+    public static String binReverseToComplement(String reverse, String complement) {
+        if (reverse.startsWith("0")) {
+            return reverse;
+        }
+        StringBuilder sb = new StringBuilder();
+        int x = 0;
+        int y = 0;
+        int pre = 0;//进位
+        int sum = 0;//存储进位和另两个位的和
+        while (reverse.length() != complement.length()) {//将两个二进制的数位数补齐,在短的前面添0
+            if (reverse.length() > complement.length()) {
+                complement = "0" + complement;
+            } else {
+                reverse = "0" + reverse;
+            }
+        }
+        for (int i = reverse.length() - 1; i >= 0; i--) {
+            x = reverse.charAt(i) - '0';
+            y = complement.charAt(i) - '0';
+            sum = x + y + pre;//从低位做加法
+            if (sum >= 2) {
+                pre = 1;//进位
+                sb.append(sum - 2);
+            } else {
+                pre = 0;
+                sb.append(sum);
+            }
+        }
+        if (pre == 1) {
+            sb.append("1");
+        }
+        // 翻转返回
+        return sb.reverse().toString();
+    }
+
+    /**
+     * 补码转十进制
+     *
+     * @param
+     * @return
+     */
+
+    public static String binComplementToDec(String complement) {
+        String h_number = complement.substring(1);
+        if (complement.startsWith("0")) {
+            return "" + Long.valueOf(h_number, 2);
+        } else if (complement.startsWith("1")) {
+            return "-" + Long.valueOf(h_number, 2);
+        }
+        return null;
+    }
+}