From a73593d70d59af01bc6afcd55ba817e319d228df Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期一, 09 一月 2023 17:26:18 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- 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