diff --git a/src/main/java/com/iot/modbus_rtcp/jobs/AutoCollectJobs.java b/src/main/java/com/iot/modbus_rtcp/jobs/AutoCollectJobs.java
index 6906a25..4e2ff2d 100644
--- a/src/main/java/com/iot/modbus_rtcp/jobs/AutoCollectJobs.java
+++ b/src/main/java/com/iot/modbus_rtcp/jobs/AutoCollectJobs.java
@@ -93,7 +93,7 @@ public class AutoCollectJobs {
             }
             resultList.stream()
                     .filter(item -> {
-                        String gatewaySn = MapUtil.getStr(item, "identifier");
+                        String gatewaySn = StringUtils.trim(MapUtil.getStr(item, "identifier"));
                         String gatewayIdentifier = this.equipmentIPProperties.put(gatewaySn);
                         if (Objects.nonNull(ModbusTCPController.nettyServer.getGroup()
                                 .get(gatewayIdentifier))) {
@@ -103,7 +103,7 @@ public class AutoCollectJobs {
                         log.warn("Gateway {} is disconnected and does not collect data", gatewaySn);
                         return false;
                     })
-                    .collect(Collectors.groupingBy(item -> MapUtil.getStr(item, "deviceId")))
+                    .collect(Collectors.groupingBy(item -> StringUtils.trim(MapUtil.getStr(item, "deviceId"))))
                     .forEach((deviceId, commandList) -> {
                         Map<String, List<Map<String, Object>>> refTypeCommandListMap = commandList.stream()
                                 .collect(Collectors.groupingBy(item -> MapUtil.getStr(item, "refType")));
@@ -114,15 +114,15 @@ public class AutoCollectJobs {
                         if (ObjectUtils.isNotEmpty(deviceCommandList)) {
                             List<ModbusCommandDto> collectCommondList = deviceCommandList.stream()
                                     .map(item -> {
-                                        String identifier = MapUtil.getStr(item, "identifier");
+                                        String identifier = StringUtils.trim(MapUtil.getStr(item, "identifier"));
                                         return ModbusCommandDto.builder()
-                                                .command(MapUtil.getStr(item, "command"))
+                                                .command(StringUtils.trim(MapUtil.getStr(item, "command")))
                                                 .identifier(identifier)
                                                 .length(MapUtil.getInt(item, "messageLength"))
                                                 .type(CommandTypeComparable.CommandType.COLLECTION)
                                                 .key(StringUtils.joinWith("/", identifier,
-                                                        MapUtil.getStr(item, "deviceId"),
-                                                        MapUtil.getStr(item, "commandId"),
+                                                        StringUtils.trim(MapUtil.getStr(item, "deviceId")),
+                                                        StringUtils.trim(MapUtil.getStr(item, "commandId")),
                                                         timestamp))
                                                 .build();
                                     })