调整逻辑使用java端作为中转发送

2026-07-23 23:53:55 +08:00 · 2026-05-27 15:34:17 +08:00
parent ce68c83eea
commit de78e87c77
7 changed files with 166 additions and 98 deletions
@@ -197,4 +197,11 @@ public class DeviceController {
        deviceAddressBookService.saveOrUpdate(dto.getMacAddress(), dto.getTargetMac(), null, dto.getHasPermission());
        return new Result<Void>();
    }
+
+    @GetMapping("/call/forward")
+    @Operation(summary = "转发呼叫请求到网关")
+    public Result<Map<String, Object>> forwardCallRequest(String callerMac, String targetMac, String callerNickname) {
+        Map<String, Object> result = deviceService.forwardCallRequest(callerMac, targetMac, callerNickname);
+        return new Result<Map<String, Object>>().ok(result);
+    }
 }
@@ -133,4 +133,10 @@ public interface DeviceService extends BaseService<DeviceEntity> {
     */
    Object callDeviceTool(String deviceId, String toolName, Map<String, Object> arguments);

+    /**
+     * 转发呼叫请求到网关
+     * @return 网关响应 {status, message}
+     */
+    Map<String, Object> forwardCallRequest(String callerMac, String targetMac, String callerNickname);
+
 }
@@ -872,4 +872,70 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
        }
        return null;
    }
+
+    @Override
+    public Map<String, Object> forwardCallRequest(String callerMac, String targetMac, String callerNickname) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("status", "error");
+        result.put("message", "网关配置缺失");
+
+        // 从系统参数获取网关配置
+        String mqttGatewayUrl = sysParamsService.getValue("server.mqtt_manager_api", true);
+        String mqttSignatureKey = sysParamsService.getValue("server.mqtt_signature_key", true);
+
+        if (StringUtils.isBlank(mqttGatewayUrl) || "null".equals(mqttGatewayUrl)) {
+            log.error("MQTT网关地址未配置");
+            result.put("message", "MQTT网关地址未配置");
+            return result;
+        }
+        if (StringUtils.isBlank(mqttSignatureKey) || "null".equals(mqttSignatureKey)) {
+            log.error("MQTT签名密钥未配置");
+            result.put("message", "MQTT签名密钥未配置");
+            return result;
+        }
+
+        // 生成token: SHA256(date + secret)
+        String dateStr = new java.text.SimpleDateFormat("yyyy-MM-dd").format(new Date());
+        try {
+            java.security.MessageDigest md = java.security.MessageDigest.getInstance("SHA-256");
+            byte[] hash = md.digest((dateStr + mqttSignatureKey).getBytes(StandardCharsets.UTF_8));
+            StringBuilder hexString = new StringBuilder();
+            for (byte b : hash) {
+                String hex = Integer.toHexString(0xff & b);
+                if (hex.length() == 1) {
+                    hexString.append('0');
+                }
+                hexString.append(hex);
+            }
+            String token = hexString.toString();
+
+            // 构建请求体
+            Map<String, Object> body = new HashMap<>();
+            body.put("caller_mac", callerMac);
+            body.put("target_mac", targetMac);
+            body.put("caller_nickname", callerNickname);
+
+            // 发送请求并获取响应
+            String url = "http://" + mqttGatewayUrl + "/api/call/request";
+            String response = cn.hutool.http.HttpRequest.post(url)
+                    .header("Authorization", "Bearer " + token)
+                    .header("Content-Type", "application/json")
+                    .body(JSONUtil.toJsonStr(body))
+                    .timeout(5000)
+                    .execute()
+                    .body();
+
+            // 解析网关响应
+            if (StringUtils.isNotBlank(response)) {
+                Map<String, Object> gwResult = JSONUtil.parseObj(response);
+                result.put("status", gwResult.get("status"));
+                result.put("message", gwResult.get("message"));
+            }
+            return result;
+        } catch (Exception e) {
+            log.error("转发呼叫请求失败: {}", e.getMessage());
+            result.put("message", "呼叫请求转发失败: " + e.getMessage());
+            return result;
+        }
+    }
 }
@@ -88,6 +88,7 @@ public class ShiroConfig {
        // 将config路径使用server服务过滤器
        filterMap.put("/config/**", "server");
        filterMap.put("/device/address-book/lookup", "server");
+        filterMap.put("/device/call/forward", "server");
        filterMap.put("/agent/chat-history/report", "server");
        filterMap.put("/agent/chat-history/download/**", "anon");
        filterMap.put("/agent/chat-summary/**", "server");
@@ -2,8 +2,7 @@
 SET @data_exists = (SELECT COUNT(*) FROM ai_model_provider WHERE id = 'SYSTEM_PLUGIN_CALL_DEVICE');                                                   
 SET @sql = IF(@data_exists = 0,
    'INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`,
-`update_date`) VALUES (''SYSTEM_PLUGIN_CALL_DEVICE'', ''Plugin'', ''call_device'', ''呼叫设备'', ''[{"key":"gateway_url","label":"网关地址","type":
-"string","default":"http://127.0.0.1:8007"},{"key":"gateway_secret","label":"网关密钥","type":"string"}]'', 85, 1988490863118454785, ''2026-05-18     
+`update_date`) VALUES (''SYSTEM_PLUGIN_CALL_DEVICE'', ''Plugin'', ''call_device'', ''呼叫设备'', ''[]'', 85, 1988490863118454785, ''2026-05-18     
 12:00:00'', 1988490863118454785, ''2026-05-18 12:00:00'')',
    'SELECT ''data already exists, skip'' AS msg');
 PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;