dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated test expression endpoint

Browse Source
This commit is contained in:
IrynaMatveieva 2025-02-07 14:01:02 +02:00
parent f376dc70db
commit c27c82b80d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
application/src/main/java/org/thingsboard/server/controller/CalculatedFieldController.java
View File

@ -48,7 +48,7 @@ import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldTbelScriptEngi
import org.thingsboard.server.service.entitiy.cf.TbCalculatedFieldService; import org.thingsboard.server.service.entitiy.cf.TbCalculatedFieldService;
import org.thingsboard.server.service.security.permission.Operation; import org.thingsboard.server.service.security.permission.Operation;
import java.util.Arrays; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
@ -85,7 +85,6 @@ public class CalculatedFieldController extends BaseController {
+ MARKDOWN_CODE_BLOCK_START + MARKDOWN_CODE_BLOCK_START
+ "{\n" + + "{\n" +
" \"expression\": \"var temp = 0; foreach(element: temperature.entrySet()) { temp += element.getValue(); } var avgTemperature = temp / temperature.size(); var adjustedTemperature = avgTemperature + 0.1 * humidity; return { \\\"adjustedTemperature\\\": adjustedTemperature };\",\n" + " \"expression\": \"var temp = 0; foreach(element: temperature.entrySet()) { temp += element.getValue(); } var avgTemperature = temp / temperature.size(); var adjustedTemperature = avgTemperature + 0.1 * humidity; return { \\\"adjustedTemperature\\\": adjustedTemperature };\",\n" +
" \"argNames\": [\"temperature\", \"humidity\"],\n" +
" \"arguments\": {\n" + " \"arguments\": {\n" +
" \"temperature\": {\n" + " \"temperature\": {\n" +
" \"14327856345\": 22.4,\n" + " \"14327856345\": 22.4,\n" +
@ -173,12 +172,12 @@ public class CalculatedFieldController extends BaseController {
@io.swagger.v3.oas.annotations.parameters.RequestBody(description = "Test calculated field TBEL expression.") @io.swagger.v3.oas.annotations.parameters.RequestBody(description = "Test calculated field TBEL expression.")
@RequestBody JsonNode inputParams) { @RequestBody JsonNode inputParams) {
String expression = inputParams.get("expression").asText(); String expression = inputParams.get("expression").asText();
String[] argNames = JacksonUtil.treeToValue(inputParams.get("argNames"), String[].class);
Map<String, Object> arguments = Objects.requireNonNullElse( Map<String, Object> arguments = Objects.requireNonNullElse(
JacksonUtil.convertValue(inputParams.get("arguments"), new TypeReference<Map<String, Object>>() { JacksonUtil.convertValue(inputParams.get("arguments"), new TypeReference<Map<String, Object>>() {
}), }),
Collections.emptyMap() Collections.emptyMap()
); );
ArrayList<String> argNames = new ArrayList<>(arguments.keySet());
String output = ""; String output = "";
String errorText = ""; String errorText = "";
@ -192,10 +191,10 @@ public class CalculatedFieldController extends BaseController {
getTenantId(), getTenantId(),
tbelInvokeService, tbelInvokeService,
expression, expression,
argNames argNames.toArray(String[]::new)
); );
Object[] args = Arrays.stream(argNames) Object[] args = argNames.stream()
.map(arguments::get) .map(arguments::get)
.toArray(); .toArray();