From 7f5af45919cbda45e8be3b82d613708fad93718b Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期一, 15 七月 2024 21:00:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java index 14e33c1..f30909a 100644 --- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java +++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java @@ -27,6 +27,7 @@ import java.io.File; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -166,7 +167,8 @@ @ApiModelProperty("/鏁伴噰") @GetMapping("/text") public Result<?> text(HttpServletRequest request) { - return Result.success(DataAcquisition.dataAcquisitionEntrance(request, new Device())); + List<DataConfig> list = new ArrayList<>(); + return Result.success(DataAcquisition.dataAcquisitionEntrance(request,list)); } @ValueClassify("璁惧") -- Gitblit v1.9.3