修改年份切换字段不为必填

huliguo

9 天以前 a70919b4f7baab856125f36e5bd41f5ee81be680

修改年份切换字段不为必填

 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));
    }
    /**

 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));