From 139e2eff46751a348b068990ab7db42e1eec6941 Mon Sep 17 00:00:00 2001
From: sdy <mhy_ad1929@163.com>
Date: Tue, 9 Jun 2026 11:29:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=BA=93=E6=B3=A8=E5=86=8C=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E8=9B=99=E8=B7=B3=E6=9C=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/handler/RequestsHandler.java      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/admin/src/main/java/com/multictrl/modules/business/handler/RequestsHandler.java b/admin/src/main/java/com/multictrl/modules/business/handler/RequestsHandler.java
index 4eeafcf..ed5bf84 100644
--- a/admin/src/main/java/com/multictrl/modules/business/handler/RequestsHandler.java
+++ b/admin/src/main/java/com/multictrl/modules/business/handler/RequestsHandler.java
@@ -76,7 +76,7 @@ public class RequestsHandler implements MessageHandler {
                         }
                         String sn = deviceJson.getStr("sn");
                         DockDeviceEntity dockDevice = dockDeviceDao.selectOne(
-                            new QueryWrapper<DockDeviceEntity>().eq("sn", sn));
+                                new QueryWrapper<DockDeviceEntity>().eq("sn", sn));
                         if (dockDevice == null) {
                             data.set("result", 1);
                             mqttPushService.pushMessageByClient1(topic + BusinessConstant._REPLY, message.toString());
@@ -103,7 +103,7 @@ public class RequestsHandler implements MessageHandler {
                 String deviceBindingCode = data.getStr("device_binding_code");
                 String organizationId = data.getStr("organization_id");
                 if (!djiConfig.getDeviceBindCode().equals(deviceBindingCode) || !djiConfig.getOrganizationId()
-                    .equals(organizationId)) {
+                        .equals(organizationId)) {
                     data.set("result", 2);
                     mqttPushService.pushMessageByClient1(topic + BusinessConstant._REPLY, message.toString());
                     log.debug("requests step3--> 查询设备绑定对应的组织信息失败，设备绑定码或组织id不匹配");
@@ -117,7 +117,7 @@ public class RequestsHandler implements MessageHandler {
                 log.debug("requests step3--> 查询设备绑定对应的组织信息成功");
             } else if (BusinessConstant.AIRPORT_ORGANIZATION_BIND.equals(method)) {//第四步 设备绑定组织信息
                 JSONArray bindDevices = data.getJSONArray("bind_devices");
-                if (bindDevices.size() == 2) {
+                if (bindDevices.size() == 2 || bindDevices.size() == 1) {//1 为了适配蛙跳机库，蛙跳机库注册没有飞机
                     List<DockDeviceEntity> bindDeviceList = new ArrayList<>();
                     for (Object bindDevice : bindDevices) {
                         JSONObject deviceJson = (JSONObject) bindDevice;
@@ -146,20 +146,20 @@ public class RequestsHandler implements MessageHandler {
                         device.setDeviceType(Integer.parseInt(split[1]));
                         device.setSubType(Integer.parseInt(split[2]));
                         DeviceDicEntity deviceDicEntity = deviceDicDao.selectOne(new QueryWrapper<DeviceDicEntity>()
-                            .eq("domain", device.getDomain())
-                            .eq("device_type", device.getDeviceType())
-                            .eq("sub_type", device.getSubType()));
+                                .eq("domain", device.getDomain())
+                                .eq("device_type", device.getDeviceType())
+                                .eq("sub_type", device.getSubType()));
                         device.setDeviceName(deviceDicEntity != null ? deviceDicEntity.getDeviceName() : "unknown");
                         bindDeviceList.add(device);
                     }
-                    if (CollUtil.isEmpty(bindDeviceList) || bindDeviceList.size() != 2) {
+                    if (CollUtil.isEmpty(bindDeviceList) /*|| bindDeviceList.size() != 2*/) {
                         data.set("result", 3);
                         mqttPushService.pushMessageByClient1(topic + BusinessConstant._REPLY, message.toString());
                         log.debug("requests step4--> 设备绑定组织信息失败，设备绑定数量不为2");
                         return;
                     }
                     dockDeviceDao.delete(new QueryWrapper<DockDeviceEntity>().eq("sn", gateway).or()
-                        .eq("parent_sn", gateway));
+                            .eq("parent_sn", gateway));
                     dockDeviceDao.insert(bindDeviceList);
                     data.set("result", 0);
                     mqttPushService.pushMessageByClient1(topic + BusinessConstant._REPLY, message.toString());
@@ -223,7 +223,7 @@ public class RequestsHandler implements MessageHandler {
                 message.remove("need_reply");
                 mqttPushService.pushMessageByClient1(topic + BusinessConstant._REPLY, message.toString());
                 log.debug("requests private_get_multi_miaosuan_psdk_status--> 检查妙算设备是否上线：{}-> status: {}",
-                    psdkSn, status);
+                        psdkSn, status);
             }
         } else {
             log.debug("requests --> payload解析失败，解析后为null");