From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/controller/trend/TrendAnalysisController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/trend/TrendAnalysisController.java b/ycl-platform/src/main/java/com/ycl/controller/trend/TrendAnalysisController.java
index c0e1e4e..24cf01c 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/trend/TrendAnalysisController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/trend/TrendAnalysisController.java
@@ -5,6 +5,7 @@
import com.ycl.api.CommonResult;
import com.ycl.dto.trend.TrendAnalysisParam;
import com.ycl.service.trend.TrendAnalysisService;
+import com.ycl.vo.TrendAnalysisVo;
import com.ycl.vo.TrendVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,13 +24,27 @@
@ApiOperation("鏁版嵁鏌ヨ")
@PostMapping("/info")
public CommonResult<List<TrendVo>> list(@RequestBody TrendAnalysisParam trendAnalysisParam, Integer pageSize, Integer pageNum) {
- return CommonResult.success(trendAnalysisService.list(trendAnalysisParam,pageSize,pageNum));
+ return CommonResult.success(trendAnalysisService.list(trendAnalysisParam, pageSize, pageNum));
}
@ApiOperation("鐐逛綅鏁版嵁鏌ヨ")
- @PostMapping("/pointInfo")
- public CommonResult<List<TrendVo>> queryPointInfo(@RequestBody String id) {
- JSONObject jsonObject = JSON.parseObject(id);
- return CommonResult.success(trendAnalysisService.queryPointInfo(jsonObject.getString("id")));
+ @GetMapping("/pointInfo")
+ public CommonResult<List<TrendVo>> queryPointInfo(@RequestParam(required = false) String longitude,
+ @RequestParam(required = false) String latitude) {
+ return CommonResult.success(trendAnalysisService.queryPointInfo(longitude, latitude));
+ }
+
+ @ApiOperation("鐐逛綅鏁版嵁鏌ヨ")
+ @GetMapping("/queryPointInfoByTime")
+ public CommonResult<TrendAnalysisVo> queryPointInfoByTime(@RequestParam Long pointId,
+ @RequestParam(required = false) String startTime,
+ @RequestParam(required = false) String endTime) {
+ return CommonResult.success(trendAnalysisService.queryPointInfoByTime(pointId, startTime, endTime));
+ }
+
+ @ApiOperation("棣栨鎶ヨ鐐逛綅鏁版嵁鏌ヨ")
+ @PostMapping("/firstInfo")
+ public CommonResult<List<TrendVo>> queryListByCount(@RequestBody TrendAnalysisParam trendAnalysisParam, Integer pageSize, Integer pageNum) {
+ return CommonResult.success(trendAnalysisService.queryListByCount(trendAnalysisParam, pageSize, pageNum));
}
}
--
Gitblit v1.8.0