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/util/MD5Generator.java | 1 +
src/main/java/com/cl/controller/DataController.java | 6 +++++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/cl/controller/DataController.java b/src/main/java/com/cl/controller/DataController.java
index 190c305..4d54e09 100644
--- a/src/main/java/com/cl/controller/DataController.java
+++ b/src/main/java/com/cl/controller/DataController.java
@@ -24,6 +24,7 @@
import javax.validation.Valid;
import java.time.LocalDateTime;
+import java.time.Year;
import java.util.Date;
import java.util.List;
@@ -102,7 +103,10 @@
@PostMapping("/screen")
@ApiOperation("大屏数据")
public Result<ScreenVO> screen(@RequestParam(value = "county",required = false)Integer county,
- @RequestParam(value = "year")Integer year) {
+ @RequestParam(value = "year",required = false)Integer year) {
+ if (year == null){
+ year = Year.now().getValue();
+ }
return Result.success( dataService.screen(county==null?0:county,year));
}
/**
diff --git a/src/main/java/com/cl/util/MD5Generator.java b/src/main/java/com/cl/util/MD5Generator.java
index f6daed2..92fcdce 100644
--- a/src/main/java/com/cl/util/MD5Generator.java
+++ b/src/main/java/com/cl/util/MD5Generator.java
@@ -26,6 +26,7 @@
}
public static void main(String[] args) {
+ System.out.println(generateMD5("123456"));
System.out.println("17912345678".substring(0, 3) + "****" + "17912345678".substring(7));
String myString = "358736";
System.err.println("MD5 of '" + myString + "' is: " + generateMD5(myString));
--
Gitblit v1.7.1