Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-admin/src/main/resources/application-test.yml

@@ -188,10 +188,10 @@ sms:
 
 dsk:
   open:
-    endPoint: pre-openapi.jiansheku.com
-    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
-    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    protocol: https
+#    endPoint: pre-openapi.jiansheku.com
+#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+#    protocol: https
 #    endPoint: openapi.jiansheku.com
 #    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
 #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b

dsk-common/src/main/java/com/dsk/common/config/DskOpenApiConfig.java

@@ -9,8 +9,8 @@ import org.springframework.stereotype.Component;
 *@Author: zhangyi
 *@date: 2023/5/15 15:31
 */
-@Component
-@ConfigurationProperties(prefix = "dsk.open")
+//@Component
+//@ConfigurationProperties(prefix = "dsk.open")
 public class DskOpenApiConfig {
     public String accessKeyId;
     public String accessKeySecret;

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

-package com.dsk.common.utils;
-
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONUtil;
-import com.dsk.acc.openapi.api.AccClient;
-import com.dsk.acc.openapi.client.Config;
-import com.dsk.acc.openapi.client.util.CommonUtils;
-import com.dsk.common.config.DskOpenApiConfig;
-import com.dsk.common.core.page.TableDataInfo;
-import org.apache.commons.collections4.MapUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-@Component
-public class DskOpenApiUtil {
-	@Autowired
-	private DskOpenApiConfig dskOpenApiConfig;
-
-	/**
-	 * <b>application/json请求</b>
-	 * @param path 请求路径
-	 * @param bodyMap 参数体
-	 * @return
-	 */
-	public Map<String, Object> requestBody(String path, Map<String, Object> bodyMap){
-		return request(path, bodyMap, "json");
-	}
-
-	public Map<String, Object> requestBodyLocal(String path, Map<String, Object> bodyMap){
-		String post = HttpUtil.post("http://127.0.0.1:8766" + path, JSONUtil.toJsonStr(bodyMap));
-		return CommonUtils.assertAsMap(CommonUtils.parseJSON(post));
-	}
-
-	public Map<String, Object> requestBodyWithHeader(String path, Map<String, Object> bodyMap, Map<String, String> headerMap){
-		return requestWithHeader(path, bodyMap, "json", headerMap);
-	}
-
-	/**
-	 * <b>application/x-www-form-urlencoded请求</b>
-	 * @param path 请求路径
-	 * @param bodyMap 参数体
-	 * @return
-	 */
-	public Map<String, Object> requestForm(String path, Map<String, Object> bodyMap){
-		return request(path, bodyMap, "form");
-	}
-
-	/**
-	 * <b>开放平台统一请求</b>
-	 * @param path 请求路径
-	 * @param bodyMap 参数体
-	 * @param reqBodyType 请求格式
-	 * @return
-	 */
-	public Map<String, Object> request(String path, Map<String, Object> bodyMap, String reqBodyType){
-		try {
-			AccClient.init(new Config(dskOpenApiConfig.accessKeyId, dskOpenApiConfig.accessKeySecret)
-					.setEndpoint(dskOpenApiConfig.endPoint).setProtocol(dskOpenApiConfig.protocol));
-			Map<String, ?> res = AccClient.request(reqBodyType, path, bodyMap);
-			if(!res.containsKey("headers") || !res.containsKey("body")) {
-				throw new RuntimeException(String.format("请求无返回:path=%s",path));
-			}
-			Object resBody = res.get("body");
-			if(resBody == null) {
-				return null;
-			}
-			return CommonUtils.assertAsMap(resBody);
-		} catch (Exception e) {
-			throw new RuntimeException(String.format("请求异常:path=%s,err=%s",path,e.getMessage()));
-		}
-	}
-
-	/**
-	 * <b>开放平台统一请求</b>
-	 * @param path 请求路径
-	 * @param bodyMap 参数体
-	 * @param reqBodyType 请求格式
-	 * @return
-	 */
-	public Map<String, Object> requestWithHeader(String path, Map<String, Object> bodyMap, String reqBodyType, Map<String, String> headerMap){
-		try {
-			AccClient.init(new Config(dskOpenApiConfig.accessKeyId, dskOpenApiConfig.accessKeySecret)
-					.setEndpoint(dskOpenApiConfig.endPoint));
-			Map<String, ?> res = AccClient.request(reqBodyType, path, bodyMap, headerMap);
-			if(!res.containsKey("headers") || !res.containsKey("body")) {
-				throw new RuntimeException(String.format("请求无返回:path=%s",path));
-			}
-			Object resBody = res.get("body");
-			if(resBody == null) {
-				return null;
-			}
-			return CommonUtils.assertAsMap(resBody);
-		} catch (Exception e) {
-			throw new RuntimeException(String.format("请求异常:path=%s,err=%s",path,e.getMessage()));
-		}
-	}
-
-
-	public TableDataInfo responsePage(Map<String, Object> resMap) throws Exception {
-		Integer code = MapUtils.getInteger(resMap, "code", 300);
-		Map data = MapUtils.getMap(resMap, "data", null);
-		if (200 != code) throw new RuntimeException();
-		Integer count = MapUtils.getInteger(data, "totalCount", 0);
-		Object list = MapUtils.getObject(data, "list", "");
-		return new TableDataInfo((List<?>) list, count);
-	}
-
-}

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/service/impl/BusinessInfoServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dsk.biz.domain.*;
 import com.dsk.biz.domain.bo.BusinessAddDto;
 import com.dsk.biz.domain.bo.BusinessExcelDto;
@@ -13,8 +12,6 @@ import com.dsk.biz.domain.bo.CustomerBusinessSearchDto;
 import com.dsk.biz.domain.vo.*;
 import com.dsk.biz.utils.ExcelUtils;
 import com.dsk.biz.utils.OldFileUtils;
-import com.dsk.common.annotation.DataColumn;
-import com.dsk.common.annotation.DataPermission;
 import com.dsk.common.utils.file.FileUploadUtils;
 import com.dsk.jsk.service.EnterpriseService;
 import com.dsk.biz.mapper.BusinessInfoMapper;
@@ -30,7 +27,7 @@ import com.dsk.common.exception.ServiceException;
 import com.dsk.common.exception.base.BaseException;
 import com.dsk.common.helper.LoginHelper;
 import com.dsk.common.utils.CheckUtils;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import com.dsk.common.utils.JsonUtils;
 import com.dsk.common.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;

dsk-module/dsk-biz-api/src/main/java/com/dsk/biz/service/impl/BusinessOverviewServiceImpl.java

@@ -5,10 +5,8 @@ import com.dsk.biz.domain.bo.BusinessSearchDto;
 import com.dsk.biz.domain.vo.BusinessAnalyzeVo;
 import com.dsk.biz.mapper.BusinessInfoMapper;
 import com.dsk.biz.service.IBusinessOverviewService;
-import com.dsk.common.annotation.DataColumn;
-import com.dsk.common.annotation.DataPermission;
 import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/vo/UrbanInvestmentExportVo.java

@@ -32,7 +32,7 @@ public class UrbanInvestmentExportVo implements Serializable {
     @Excel(name = "供应商",  width = 10)
     private Integer supplierCount;
 
-    @Excel(name = "债卷余额" , suffix = "亿元")
+    @Excel(name = "债券余额" , suffix = "亿元")
     private Double creditBalance;
 
     @Excel(name = "主体评级",  width = 15)

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/BusinessOpportunityRadarService.java

@@ -3,7 +3,7 @@
 //import cn.hutool.core.bean.BeanUtil;
 //import cn.hutool.json.JSONObject;
 //import com.dsk.common.core.domain.AjaxResult;
-//import com.dsk.common.utils.DskOpenApiUtil;
+//import com.dsk.system.utils.DskOpenApiUtil;
 //import com.dsk.jsk.domain.bo.ComposeQueryDto;
 //import org.springframework.beans.factory.annotation.Autowired;
 //import org.springframework.stereotype.Service;

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseBussinessService.java

@@ -6,7 +6,7 @@ import cn.hutool.json.JSONUtil;
 import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import com.dsk.jsk.domain.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseCommonService.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.dsk.common.core.domain.R;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseCreditService.java

@@ -3,7 +3,7 @@ package com.dsk.jsk.service;
 import cn.hutool.core.bean.BeanUtil;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import com.dsk.jsk.domain.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseProjectService.java

@@ -7,7 +7,7 @@ import cn.hutool.json.JSONUtil;
 import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import com.dsk.jsk.domain.*;
 import com.dsk.jsk.domain.bo.EnterpriseProjectImportantListDto;
 import org.apache.commons.collections4.CollectionUtils;

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseService.java

@@ -6,18 +6,14 @@ import cn.hutool.core.util.ObjectUtil;
 import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.biz.domain.vo.CustomerStatusListVo;
 import com.dsk.biz.service.ICustomerService;
-import com.dsk.biz.utils.ExcelUtils;
 import com.dsk.common.constant.CacheConstants;
-import com.dsk.common.constant.Constants;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import com.dsk.common.utils.EncodeIdUtil;
 import com.dsk.common.utils.redis.RedisUtils;
 import com.dsk.component.UploadComponent;
 import com.dsk.jsk.domain.*;
-import com.dsk.jsk.domain.bo.UrbanInvestmentPlatformDto;
-import com.dsk.jsk.domain.vo.UrbanInvestmentExportVo;
 import com.dsk.search.service.BusinessOpportunityRadarService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -25,11 +21,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.io.ByteArrayOutputStream;
 import java.time.Duration;
 import java.util.*;
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/IndexService.java

@@ -7,7 +7,7 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.utils.DateUtils;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/JskCombineInfoService.java

@@ -2,43 +2,30 @@ package com.dsk.jsk.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
-import com.dsk.acc.openapi.client.util.CommonUtils;
-import com.dsk.biz.utils.ExcelUtils;
 import com.dsk.common.constant.CacheConstants;
-import com.dsk.common.constant.Constants;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
-import com.dsk.common.exception.ServiceException;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import com.dsk.common.utils.JsonUtils;
-import com.dsk.common.utils.StringUtils;
 import com.dsk.component.UploadComponent;
 import com.dsk.jsk.domain.JskCombineBidPageDto;
 import com.dsk.jsk.domain.JskCombineCertificateDto;
 import com.dsk.jsk.domain.JskCombineCountDto;
 import com.dsk.jsk.domain.JskCombineSearchDto;
-import com.dsk.jsk.domain.vo.JskCombineBidProjectExportVo;
-import com.dsk.jsk.domain.vo.JskCombineWinBidProjectExportVo;
-import com.dsk.jsk.domain.vo.UrbanInvestmentExportVo;
 import com.dsk.jsk.util.RedisCache;
-import com.dsk.system.domain.SysUserFileRecord;
 import com.dsk.system.service.ISysUserFileRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/service/impl/EconomicServiceImpl.java

@@ -2,14 +2,12 @@ package com.dsk.jsk.service.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.constant.CacheConstants;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.helper.LoginHelper;
 import com.dsk.common.utils.DateUtils;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import com.dsk.common.utils.JsonUtils;
-import com.dsk.jsk.domain.*;
 import com.dsk.jsk.domain.bo.*;
 import com.dsk.jsk.service.service.EconomicService;
 import com.dsk.jsk.util.RedisCache;
@@ -18,7 +16,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 import java.util.Map;
 
 /**

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/service/impl/RegionalEnterprisesServiceImpl.java

@@ -5,8 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.utils.DskOpenApiUtil;
-import com.dsk.jsk.domain.bo.ComposeQueryDto;
+import com.dsk.system.utils.DskOpenApiUtil;
 import com.dsk.jsk.service.service.RegionalEnterprisesService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/service/impl/SpecialPurposeBondsServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import com.dsk.jsk.domain.bo.SpecialBondInformationDetailsDto;
 import com.dsk.jsk.domain.bo.SpecialBondInformationPageDto;
 import com.dsk.jsk.domain.bo.SpecialPurposeBondsDto;

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/service/impl/UrbanInvestmentPlatformServiceImpl.java

 package com.dsk.jsk.service.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.biz.domain.vo.CustomerStatusListVo;
 import com.dsk.biz.service.ICustomerService;
-import com.dsk.biz.utils.ExcelUtils;
-import com.dsk.common.constant.Constants;
 import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import com.dsk.component.UploadComponent;
 import com.dsk.jsk.domain.bo.UrbanInvestmentPlatformDto;
-import com.dsk.jsk.domain.vo.ImportantProjectExportVo;
-import com.dsk.jsk.domain.vo.UrbanInvestmentExportVo;
 import com.dsk.jsk.service.service.UrbanInvestmentPlatformService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import java.io.ByteArrayOutputStream;
 import java.util.*;
 
 /**

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/ExportController.java

@@ -59,6 +59,7 @@ public class ExportController {
         if (StringUtils.isEmpty(compose.getExportExeclName())){
             object.put("exportExeclName","企业基本信息导出");
         }
+        object.put("exportTemplateName","szh-enterprise-info.xlsx");
         return exportService.enterpriseInfoExport(object);
     }
 
@@ -76,6 +77,7 @@ public class ExportController {
         if (StringUtils.isEmpty(compose.getExportExeclName())){
             object.put("exportExeclName","企业资质信息导出");
         }
+        object.put("exportTemplateName","szh-cert-info.xlsx");
         return exportService.enterpriseAptitudeExport(object);
     }
 
@@ -124,7 +126,7 @@ public class ExportController {
     }
 
     //市场经济  城投平台导出
-    @PostMapping("/urbanInvestmentPlatform")
+    @PostMapping("/urbanInvestment")
     public AjaxResult export(@RequestBody UrbanInvestmentPlatformDto dto) {
         return exportService.export(dto);
     }

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/BusinessOpportunityRadarService.java

 package com.dsk.search.service;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
@@ -9,21 +8,17 @@ import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.biz.domain.vo.CustomerStatusListVo;
 import com.dsk.biz.service.ICustomerService;
 import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.exception.ServiceException;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import com.dsk.common.utils.StringUtils;
 import com.dsk.jsk.domain.vo.ImportantProjectExportVo;
 import com.dsk.jsk.service.EnterpriseService;
-import com.dsk.system.domain.SysUserFileRecord;
 import com.dsk.system.service.ISysUserFileRecordService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/ExportService.java

@@ -7,7 +7,7 @@ import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.biz.utils.ExcelUtils;
 import com.dsk.common.constant.Constants;
 import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import com.dsk.component.UploadComponent;
 import com.dsk.jsk.domain.EnterpriseUipSearchBody;
 import com.dsk.jsk.domain.JskCombineSearchDto;
@@ -139,8 +139,6 @@ public class ExportService {
         return AjaxResult.success();
     }
 
-
-    @Async
     public AjaxResult uipSerachExport(EnterpriseUipSearchBody pageDto) {
         // 分页参数
         pageDto.setPageNum(1);
@@ -153,7 +151,7 @@ public class ExportService {
             throw new RuntimeException();
         }
         List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(map, "data", ""));
-        int i = 0;
+        int i = 1;
         List<UrbanInvestmentExportVo> resultList = new ArrayList<>();
         for (Object obj : list) {
             UrbanInvestmentExportVo vo = new UrbanInvestmentExportVo();
@@ -214,7 +212,6 @@ public class ExportService {
         return AjaxResult.success();
     }
 
-    @Async
     public AjaxResult export(UrbanInvestmentPlatformDto pageDto) {
         // 分页参数
         pageDto.setPageNum(1);
@@ -228,7 +225,7 @@ public class ExportService {
             throw new RuntimeException();
         }
         List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(map, "data", ""));
-        int i = 0;
+        int i = 1;
         List<UrbanInvestmentExportVo> resultList = new ArrayList<>();
         for (Object obj : list) {
             UrbanInvestmentExportVo vo = new UrbanInvestmentExportVo();

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/MarketAnalysisService.java

@@ -3,7 +3,7 @@ package com.dsk.search.service;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.system.utils.DskOpenApiUtil;
 import com.dsk.jsk.service.EnterpriseService;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;

dsk-system/src/main/java/com/dsk/system/utils/DskOpenApiUtil.java

+package com.dsk.system.utils;
+
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsk.acc.openapi.api.AccClient;
+import com.dsk.acc.openapi.client.Config;
+import com.dsk.acc.openapi.client.util.CommonUtils;
+import com.dsk.common.config.DskOpenApiConfig;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.exception.ServiceException;
+import com.dsk.system.domain.SysConfig;
+import com.dsk.system.mapper.SysConfigMapper;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class DskOpenApiUtil {
+
+
+    private static Config config;
+
+    @Resource
+    private SysConfigMapper sysConfigMapper;
+
+
+    /**
+     * <b>application/json请求</b>
+     *
+     * @param path    请求路径
+     * @param bodyMap 参数体
+     * @return
+     */
+    public Map<String, Object> requestBody(String path, Map<String, Object> bodyMap) {
+        return request(path, bodyMap, "json");
+    }
+
+    public Map<String, Object> requestBodyLocal(String path, Map<String, Object> bodyMap) {
+        String post = HttpUtil.post("http://127.0.0.1:8766" + path, JSONUtil.toJsonStr(bodyMap));
+        return CommonUtils.assertAsMap(CommonUtils.parseJSON(post));
+    }
+
+    public Map<String, Object> requestBodyWithHeader(String path, Map<String, Object> bodyMap, Map<String, String> headerMap) {
+        return requestWithHeader(path, bodyMap, "json", headerMap);
+    }
+
+    /**
+     * <b>application/x-www-form-urlencoded请求</b>
+     *
+     * @param path    请求路径
+     * @param bodyMap 参数体
+     * @return
+     */
+    public Map<String, Object> requestForm(String path, Map<String, Object> bodyMap) {
+        return request(path, bodyMap, "form");
+    }
+
+    /**
+     * <b>开放平台统一请求</b>
+     *
+     * @param path        请求路径
+     * @param bodyMap     参数体
+     * @param reqBodyType 请求格式
+     * @return
+     */
+    public Map<String, Object> request(String path, Map<String, Object> bodyMap, String reqBodyType) {
+        try {
+            if (ObjectUtils.isEmpty(config)) initApiConfig();
+            AccClient.init(config);
+            Map<String, ?> res = AccClient.request(reqBodyType, path, bodyMap);
+            if (!res.containsKey("headers") || !res.containsKey("body")) {
+                throw new RuntimeException(String.format("请求无返回:path=%s", path));
+            }
+            Object resBody = res.get("body");
+            if (resBody == null) {
+                return null;
+            }
+            return CommonUtils.assertAsMap(resBody);
+        } catch (Exception e) {
+            throw new RuntimeException(String.format("请求异常:path=%s,err=%s", path, e.getMessage()));
+        }
+    }
+
+    /**
+     * <b>开放平台统一请求</b>
+     *
+     * @param path        请求路径
+     * @param bodyMap     参数体
+     * @param reqBodyType 请求格式
+     * @return
+     */
+    public Map<String, Object> requestWithHeader(String path, Map<String, Object> bodyMap, String reqBodyType, Map<String, String> headerMap) {
+        try {
+            if (ObjectUtils.isEmpty(config)) initApiConfig();
+            AccClient.init(config);
+            Map<String, ?> res = AccClient.request(reqBodyType, path, bodyMap, headerMap);
+            if (!res.containsKey("headers") || !res.containsKey("body")) {
+                throw new RuntimeException(String.format("请求无返回:path=%s", path));
+            }
+            Object resBody = res.get("body");
+            if (resBody == null) {
+                return null;
+            }
+            return CommonUtils.assertAsMap(resBody);
+        } catch (Exception e) {
+            throw new RuntimeException(String.format("请求异常:path=%s,err=%s", path, e.getMessage()));
+        }
+    }
+
+
+    public TableDataInfo responsePage(Map<String, Object> resMap) throws Exception {
+        Integer code = MapUtils.getInteger(resMap, "code", 300);
+        Map data = MapUtils.getMap(resMap, "data", null);
+        if (200 != code) throw new RuntimeException();
+        Integer count = MapUtils.getInteger(data, "totalCount", 0);
+        Object list = MapUtils.getObject(data, "list", "");
+        return new TableDataInfo((List<?>) list, count);
+    }
+
+    private void initApiConfig() throws Exception {
+        DskOpenApiConfig dskOpenApiConfig = new DskOpenApiConfig();
+        Class<DskOpenApiConfig> clazz = DskOpenApiConfig.class;
+        Field[] fields = clazz.getDeclaredFields();
+        for (int i = 0; i < fields.length; i++) {
+            fields[i].setAccessible(true);
+            SysConfig config = sysConfigMapper.selectOne(Wrappers.<SysConfig>lambdaQuery().eq(SysConfig::getConfigKey, "plugIn-".concat(fields[i].getName())));
+            fields[i].set(dskOpenApiConfig, config.getConfigValue());
+        }
+        if (ObjectUtils.isEmpty(dskOpenApiConfig)) {
+            throw new ServiceException("DskOpenApiConfig 初始化失败！");
+        }
+        config = new Config(dskOpenApiConfig.accessKeyId, dskOpenApiConfig.accessKeySecret)
+                .setEndpoint(dskOpenApiConfig.endPoint);
+    }
+
+}