From a9b8f1075a8200acb1d6b35b1b88041a60bedabd Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 29 十月 2024 09:13:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiDataController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java
similarity index 96%
rename from iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiDataController.java
rename to iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java
index 4072571..125fedb 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiDataController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java
@@ -1,4 +1,4 @@
-package com.iailab.module.data.api.controller;
+package com.iailab.module.data.api.controller.admin;
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.util.date.DateUtils;
@@ -38,7 +38,7 @@
*/
@Slf4j
@RestController
-@RequestMapping("/api/data")
+@RequestMapping("/data/api/data")
@Tag(name = "数据")
public class ApiDataController {
@@ -60,10 +60,8 @@
@PermitAll
@PostMapping("/point/history")
@Operation(summary = "point历史数据")
- public CommonResult<Map<String, List<Map<String, Object>>>> pointHistory(HttpServletResponse response, HttpServletRequest
- request, @RequestBody ApiPointValueQueryDTO queryDto) {
+ public CommonResult<Map<String, List<Map<String, Object>>>> pointHistory(@RequestBody ApiPointValueQueryDTO queryDto) {
try {
- apiSecurityUtils.validate(request);
Map<String, List<Map<String, Object>>> data = new HashMap<>();
if (CollectionUtils.isEmpty(queryDto.getPointNos())) {
return success(data);
--
Gitblit v1.9.3