From 225a2d8b9ae4f4cdafae6be51c32d04a89bcfa20 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 22 十一月 2024 15:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
index affdaac..a0421b1 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java
@@ -2,8 +2,6 @@
import com.iailab.framework.apilog.core.annotation.ApiAccessLog;
import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.framework.excel.core.util.ExcelUtils;
-import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.*;
import com.iailab.module.model.common.utils.ApiSecurityUtils;
@@ -12,18 +10,14 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Date;
-import java.util.LinkedHashMap;
import java.util.List;
import static com.iailab.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -44,7 +38,6 @@
@Autowired
private McsApi mcsApi;
- @PermitAll
@GetMapping("/predict-item/tree")
@Operation(summary = "预测项树")
public CommonResult<List<PredictItemTreeDTO>> getPredictItemTree(HttpServletResponse response, HttpServletRequest
@@ -54,7 +47,6 @@
return CommonResult.success(list);
}
- @PermitAll
@PostMapping("/predict-data/charts")
@Operation(summary = "预测数据图表")
public CommonResult<PreDataBarLineRespVO> getPreDataCharts(HttpServletResponse response, HttpServletRequest
@@ -69,7 +61,6 @@
return CommonResult.success(respVO);
}
- @PermitAll
@PostMapping("/predict-data/item-chart")
@Operation(summary = "预测数据图表")
public CommonResult<PreDataItemChartRespVO> getPreDataItemChart(HttpServletResponse response, HttpServletRequest
@@ -79,13 +70,21 @@
return CommonResult.success(respVO);
}
- @PermitAll
- @GetMapping("/predict-data/single-chart")
+ @PostMapping("/predict-data/single-chart")
@Operation(summary = "预测数据图表")
- public CommonResult<PreDataItemChartRespVO> getPreDataSingleChart(HttpServletResponse response, HttpServletRequest
+ public CommonResult<PreDataSingleChartRespVO> getPreDataSingleChart(HttpServletResponse response, HttpServletRequest
request, @RequestBody PreDataSingleChartReqVO reqVO) throws Exception {
apiSecurityUtils.validate(request);
- PreDataItemChartRespVO respVO = mcsApi.getPreDataSingleChart(reqVO);
+ PreDataSingleChartRespVO respVO = mcsApi.getPreDataSingleChart(reqVO);
+ return CommonResult.success(respVO);
+ }
+
+ @PostMapping("/plan-data/single-chart")
+ @Operation(summary = "预测数据图表")
+ public CommonResult<PlanDataSingleChartRespVO> getPlanDataSingleChart(HttpServletResponse response, HttpServletRequest
+ request, @RequestBody PreDataSingleChartReqVO reqVO) throws Exception {
+ apiSecurityUtils.validate(request);
+ PlanDataSingleChartRespVO respVO = mcsApi.getPlanDataSingleChart(reqVO);
return CommonResult.success(respVO);
}
--
Gitblit v1.9.3