Skip to content

Commit 6d1c013

Browse files
authored
Update IotService.java
1 parent b206b76 commit 6d1c013

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/main/java/com/xiaozhi/dialogue/service/IotService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ private void registerPropertiesFunctionTools(String sessionId, ToolsSessionHolde
195195
var propName = entry.getKey();
196196
var propInfo = entry.getValue();
197197
// 创建函数名称,格式:iot_get_{IoTName}_{PropName}
198-
var funcName = STR."iot_get_\{iotName.toLowerCase()}_\{propName.toLowerCase()}";
198+
var funcName = "iot_get_" + iotName.toLowerCase() + "_" + propName.toLowerCase();
199199
var toolCallback = FunctionToolCallback
200-
.builder(funcName, (Map<String, String> params, ToolContext _) -> {
200+
.builder(funcName, (Map<String, String> params, ToolContext toolContext) -> {
201201
Object value = getIotStatus(sessionId, iotName, propName);
202202
if (value != null) {
203203
// 获取参数
@@ -208,15 +208,15 @@ private void registerPropertiesFunctionTools(String sessionId, ToolsSessionHolde
208208
response_success = response_success.replace("{value}", String.valueOf(value));
209209
}
210210
} else {
211-
response_success = STR."当前的设置为\{value}";
211+
response_success = "当前的设置为" + value;
212212
}
213213
return response_success;
214214
} else {
215215
return "无法获取设置";
216216
}
217217
})
218218
.toolMetadata(ToolMetadata.builder().returnDirect(true).build())
219-
.description(STR."查询\{iotName}的\{propInfo.getDescription()}")
219+
.description("查询" + iotName + "的" + propInfo.getDescription())
220220
.inputSchema("""
221221
{
222222
"type": "object",
@@ -253,7 +253,7 @@ private void registerMethodFunctionTools(String sessionId, ToolsSessionHolder to
253253
var methodName = entry.getKey();
254254
var method = entry.getValue();
255255
// 创建函数名称,格式:iot_{IoTName}_{MethodName}
256-
var funcName = STR."iot_\{iotName}_\{methodName}";
256+
var funcName = "iot_" + iotName + "_" + methodName;
257257

258258
Map<String, String> valueMap = new HashMap<>();
259259
//获取iotMethod方法参数,添加到函数参数中。 iot方法都是单参数
@@ -282,7 +282,7 @@ private void registerMethodFunctionTools(String sessionId, ToolsSessionHolder to
282282
""", valueMap);
283283

284284
var toolCallback = FunctionToolCallback
285-
.builder(funcName, (Map<String, Object> params, ToolContext _) -> {
285+
.builder(funcName, (Map<String, Object> params, ToolContext toolContext) -> {
286286
String actFuncName = funcName.substring(4); // 原始方法调用,去掉iot_前缀
287287
String response_success = (String) params.get("response_success");
288288
params.remove("response_success"); // 移除response_success参数,避免传递给设备
@@ -298,7 +298,7 @@ private void registerMethodFunctionTools(String sessionId, ToolsSessionHolder to
298298
}
299299
})
300300
.toolMetadata(ToolMetadata.builder().returnDirect(true).build())
301-
.description(STR."\{iotDescriptor.getDescription()} - \{method.getDescription()}")
301+
.description(iotDescriptor.getDescription() + " - " + method.getDescription())
302302
.inputSchema(inputSchema)
303303
.inputType(Map.class)
304304
.toolCallResultConverter(ToolCallStringResultConverter.INSTANCE)

0 commit comments

Comments
 (0)