From a70919b4f7baab856125f36e5bd41f5ee81be680 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 13 五月 2025 09:41:35 +0800
Subject: [PATCH] 修改年份切换字段不为必填
---
src/main/java/com/cl/controller/DataController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/cl/controller/DataController.java b/src/main/java/com/cl/controller/DataController.java
index 409aac4..4d54e09 100644
--- a/src/main/java/com/cl/controller/DataController.java
+++ b/src/main/java/com/cl/controller/DataController.java
@@ -23,6 +23,10 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.time.Year;
+import java.util.Date;
+import java.util.List;
@RestController
@@ -98,8 +102,30 @@
*/
@PostMapping("/screen")
@ApiOperation("大屏数据")
- public Result<ScreenVO> screen(@RequestParam(value = "county",required = false)Integer county) {
- return Result.success( dataService.screen(county==null?0:county));
+ public Result<ScreenVO> screen(@RequestParam(value = "county",required = false)Integer county,
+ @RequestParam(value = "year",required = false)Integer year) {
+ if (year == null){
+ year = Year.now().getValue();
+ }
+ return Result.success( dataService.screen(county==null?0:county,year));
+ }
+ /**
+ * 补贴总人数
+ */
+ @GetMapping("/getAssistiveDeviceTotal")
+ @ApiOperation("补贴总人数")
+ public Result<Integer> getAssistiveDeviceTotal(@RequestParam(value = "county",required = false)Integer county,@RequestParam("year") Integer year) {
+
+ return Result.success( dataService.getAssistiveDeviceTotal(county==null?0:county,year));
+ }
+
+ /**
+ * 可选择年份列表
+ */
+ @GetMapping("/getYearList")
+ @ApiOperation("可选择年份列表")
+ public Result<List<Integer>> getYearList(@RequestParam(value = "county",required = false)Integer county) {
+ return Result.success( dataService.getYearList( county));
}
--
Gitblit v1.7.1