-

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicDataV1PageDto.java

@@ -3,7 +3,6 @@ package com.dsk.common.dtos;
 import com.dsk.common.core.domain.model.BasePage;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -19,20 +18,19 @@ public class OpRegionalEconomicDataV1PageDto extends BasePage {
     /**
      * 年份
      */
-    @NotNull(message = "year 不能为空")
     private Integer year;
     /**
      * 省
      */
-    private List<String> provinceIds;
+    private List<Integer> provinceIds;
     /**
      * 市
      */
-    private List<String> cityIds;
+    private List<Integer> cityIds;
     /**
      * 区
      */
-    private List<String> areaIds;
+    private List<Integer> areaIds;
 
     /**
      * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3

dsk-common/src/main/java/com/dsk/common/utils/DateUtils.java

@@ -188,4 +188,17 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
     }
+
+    /***
+     *@Description: 获取当前年份
+     *@Param:
+     *@return: int
+     *@Author: Dgm
+     *@date: 2023/5/29 16:05
+     */
+    public static int getYear() {
+        LocalDate localDate = LocalDate.now();
+        int year = localDate.getYear();
+        return year;
+    }
 }

dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java

 package com.dsk.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.OpRegionalEconomicDataRegionalListDto;
 import com.dsk.common.dtos.OpRegionalEconomicDataStatisticsRegionalDto;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
+import com.dsk.common.utils.DateUtils;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.system.service.EconomicService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +31,9 @@ public class EconomicServiceImpl implements EconomicService {
 
     @Override
     public AjaxResult nationalPage(OpRegionalEconomicDataV1PageDto dto) {
+        if (ObjectUtil.isEmpty(dto.getYear())) {
+            dto.setYear(DateUtils.getYear() - 1);
+        }
         Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/national/nationalPage",  BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }