From 408406dff8f428e1439dbf909bc4f5d317cdaf5b Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 19 Jun 2024 16:27:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java
index d480c47..cb8305c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResBaseController.java
@@ -9,6 +9,7 @@
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.vo.AttAdBaseVO;
import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
+import cn.gistack.sm.sjztmd.vo.AttResWithRainfall;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -26,6 +27,7 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import io.swagger.annotations.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -133,4 +135,31 @@
return R.status(attResBaseService.updateIsShowStatus(ids,status));
}
+
+ /**
+ * 根据预报降雨等值面图，识别出雨量范围内的水库清单
+ * @param minRainfall 最小降雨量
+ * @param maxRainfall 最大降雨量
+ * @param dayIndex 预报的时段，0-2代表未来3天
+ * @return 水库对象列表
+ */
+ @ApiOperation(value = "根据预报降雨等值面图，识别出雨量范围内的水库清单", notes = "根据预报降雨等值面图，识别出雨量范围内的水库清单")
+ @PostMapping(value = "/getAttResByRainfall")
+ public R<List<AttResWithRainfall>> getAttResByRainfall(
+ @ApiParam(value = "最小降雨量") @RequestParam String minRainfall,
+ @ApiParam(value = "最大降雨量") @RequestParam String maxRainfall,
+ @ApiParam(value = "预报的时段，0-2代表未来3天") @RequestParam String dayIndex) {
+ return R.data(attResBaseService.getAttResByRainfall(minRainfall, maxRainfall, dayIndex));
+ }
+
+ /**
+ * 统计不同日降水量范围下的站点个数
+ * @param dayIndex 预报的时段，0-2代表未来3天
+ * @return 站点个数列表
+ */
+ @ApiOperation(value = "统计不同日降水量范围的站点个数", notes = "统计不同日降水量范围的站点个数")
+ @PostMapping(value = "/getAttResNumByRainfall")
+ public R<int[]> getAttResNumByRainfall(@ApiParam(value = "预报的时段，0-2代表未来3天") @RequestParam String dayIndex) {
+ return R.data(attResBaseService.getAttResNumByRainfall(dayIndex));
+ }
}
--
Gitblit v1.9.3