From 7b3586d48c253ef5385821f1ce38df34361cbb4a Mon Sep 17 00:00:00 2001
From: luyya <luya0519>
Date: Wed, 15 Apr 2026 17:47:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A8=E9=80=81=E5=88=B0=E7=9C=81=E5=8E=85=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=20=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AF=B9=E5=9B=BD?=
 =?UTF-8?q?=E6=A0=87=E7=BC=96=E7=A0=81=E8=AE=BE=E7=BD=AE=E5=80=BC=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/basetost/service/DeviceSyncService.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/service/DeviceSyncService.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/service/DeviceSyncService.java
index e906fd71..8f0935cf 100644
--- a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/service/DeviceSyncService.java
+++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/service/DeviceSyncService.java
@@ -194,7 +194,11 @@ public class DeviceSyncService {
 
                 // 转换为目标设备
                 Device targetDevice = FieldMapper.mapToTargetDevice(sourceDevice, deviceSyncConfig.getInfoSource());
-
+                if ("05".equals(targetDevice.getDeviceType()) && targetDevice.getDeviceCode().length()!=20){
+                    targetDevice.setGbbm(targetDevice.getRemark1());
+                }else if ("05".equals(targetDevice.getDeviceType())){
+                    targetDevice.setGbbm(targetDevice.getDeviceCode());
+                }
                 if (existingDevice != null) {
                     // 更新现有设备
                     targetDevice.setId(existingDevice.getId());