From 42cce7d9a859083818a0e10eb3b6c80385042e47 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 18 三月 2023 18:20:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/controller/trend/TrendAnalysisController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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..b19efa9 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
@@ -27,9 +27,15 @@
}
@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("棣栨鎶ヨ鐐逛綅鏁版嵁鏌ヨ")
+ @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