-

dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/RegionalEconomicDataController.java

@@ -2,6 +2,7 @@ package com.dsk.web.controller.search.macroMarket;
 
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
+import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
 import com.dsk.system.service.EconomicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,7 +30,7 @@ public class RegionalEconomicDataController {
      *@date: 2023/5/18 10:29
      */
     @PostMapping("/national/nationalPage")
-    public AjaxResult nationalPage(@RequestBody OpRegionalEconomicDataV1Dto dto) {
+    public AjaxResult nationalPage(@RequestBody OpRegionalEconomicDataV1PageDto dto) {
         return economicService.nationalPage(dto);
     }
 

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

 package com.dsk.common.dtos;
 
-import com.dsk.common.core.domain.model.BasePage;
 import lombok.Data;
 
 /**
@@ -11,27 +10,40 @@ import lombok.Data;
  * @Version
  */
 @Data
-public class OpRegionalEconomicDataV1Dto extends BasePage {
+public class OpRegionalEconomicDataV1Dto {
+
+    /**
+     * id
+     */
+    private Integer id;
 
     /**
      * 年份
      */
     private Integer year;
+
     /**
-     * 省
+     * 省Id
      */
-    private String provinceId;
+    private Integer provinceId;
+
     /**
-     * 市
+     * 市Id
      */
-    private String cityId;
+    private Integer cityId;
+
+    /**
+     * 区Id
+     */
+    private Integer areaId;
+
     /**
-     * 区
+     * 城市类型 1：直辖市
      */
-    private String areaId;
+    private Integer cityType;
 
     /**
-     * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3
+     * 城市类型 1：直辖市
      */
-    private Integer type;
+    private Integer provinceType;
 }

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

+package com.dsk.common.dtos;
+
+import com.dsk.common.core.domain.model.BasePage;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName OpRegionalEconomicDataV1PageDto
+ * @Description 专项债-项目类别统计
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataV1PageDto extends BasePage {
+
+    /**
+     * 年份
+     */
+    private Integer year;
+    /**
+     * 省
+     */
+    private List<String> provinceIds;
+    /**
+     * 市
+     */
+    private List<String> cityIds;
+    /**
+     * 区
+     */
+    private List<String> areaIds;
+
+    /**
+     * 全国宏观经济：1 / 辖区经济：2 / 地区对比：3
+     */
+    private Integer type;
+
+    /**
+     * 排序字段 默认gdp
+     */
+    private String field = "gdp";
+    /**
+     * 排序 (降序desc 升序asc)
+     */
+    private String order = "desc";
+}

dsk-system/src/main/java/com/dsk/system/service/EconomicService.java

@@ -2,6 +2,7 @@ package com.dsk.system.service;
 
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
+import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
 
 /**
  * @ClassName EconomicService
@@ -19,7 +20,7 @@ public interface EconomicService {
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult nationalPage(OpRegionalEconomicDataV1Dto dto);
+    AjaxResult nationalPage(OpRegionalEconomicDataV1PageDto dto);
 
     /***
      *@Description: 全国经济大全详情

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

@@ -3,6 +3,7 @@ package com.dsk.system.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
+import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.system.service.EconomicService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +26,7 @@ public class EconomicServiceImpl implements EconomicService {
     private DskOpenApiUtil dskOpenApiUtil;
 
     @Override
-    public AjaxResult nationalPage(OpRegionalEconomicDataV1Dto dto) {
+    public AjaxResult nationalPage(OpRegionalEconomicDataV1PageDto dto) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/api/economic/national/nationalPage",  BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }