导出优化

dsk-admin/src/main/java/com/dsk/DskOperateSysApplication.java

@@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableScheduling
-@EnableAsync
+@EnableAsync(proxyTargetClass = true)
 public class DskOperateSysApplication {
 
     public static void main(String[] args) {

dsk-common/pom.xml

@@ -192,7 +192,11 @@
             <groupId>com.belerweb</groupId>
             <artifactId>pinyin4j</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.25</version>
+        </dependency>
     </dependencies>
 
 </project>

dsk-module/dsk-biz-api/pom.xml

@@ -51,11 +51,6 @@
             <artifactId>dsk-acc-open-sdk-java</artifactId>
             <version>2.1.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson2</artifactId>
-            <version>2.0.25</version>
-        </dependency>
 
 
         <!--        <dependency>-->

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/EnterpriseController.java

@@ -104,11 +104,6 @@ public class EnterpriseController {
         return enterpriseService.uipSerach(vo);
     }
 
-    @PostMapping(value = "/uipSerach/export")
-    public void uipSerachExport(@RequestBody @Valid EnterpriseUipSearchBody vo) throws Exception {
-        enterpriseService.uipSerachExport(vo);
-    }
-
     @PostMapping(value = "uipGroupData")
     public R financial() throws Exception {
         return enterpriseService.uipGroupData();

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

-package com.dsk.jsk.controller;
-
-import cn.hutool.json.JSONObject;
-import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.system.service.ISysUserFileRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author lc
- * @date 2023/11/14 14:15
- */
-@RestController
-@RequestMapping("/export")
-public class ExportController {
-
-    @Autowired
-    private ISysUserFileRecordService sysUserFileRecordService;
-
-    /**
-     * 导出回调接口
-     * @param object
-     * @return
-     */
-    @PostMapping(value = "/backUrl")
-    public AjaxResult exportBack(@RequestBody JSONObject object) {
-        return sysUserFileRecordService.exportBack(object);
-    }
-}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/JskCombineInfoController.java

@@ -46,8 +46,6 @@ public class JskCombineInfoController extends BaseController {
 
     @Autowired
     private JskCombineInfoService baseService;
-    @Autowired
-    private UploadComponent uploadComponent;
 
     /**
      * 集团成员列表
@@ -57,14 +55,6 @@ public class JskCombineInfoController extends BaseController {
         return baseService.memberList(dto);
     }
 
-    /**
-     * 集团成员列表导出
-     */
-    @PostMapping("/memberList/export")
-    public void memberListExportPre(@RequestBody JskCombineSearchDto dto) throws Exception {
-        baseService.memberListExport(dto);
-    }
-
     /**
      * 分组成员数量
      */
@@ -183,18 +173,6 @@ public class JskCombineInfoController extends BaseController {
 //        return uploadComponent.upload(title, ba, Constants.SUFFIX_XLSX, Constants.CONTENT_TYPE_XLSX);
 //    }
 
-    //集团中标业绩导出count
-    @PostMapping("/export/win/bid/pre")
-    @SaCheckPermission("combine:info:export:win:bid")
-    public AjaxResult exportWinBidPre(@RequestBody JskCombineSearchDto dto) {
-        return baseService.exportWinBidPre(dto);
-    }
-    //集团中标业绩导出
-    @PostMapping("/export/win/bid")
-    @SaCheckPermission("combine:info:export:win:bid")
-    public void exportWinBid(@RequestBody JskCombineSearchDto dto) {
-        baseService.exportWinBid(dto);
-    }
 
 //    /**
 //     * 导出招标业绩
@@ -208,12 +186,6 @@ public class JskCombineInfoController extends BaseController {
 //        ByteArrayOutputStream ba = util.exportExcel(list, "集团招标", title, true);
 //        return uploadComponent.upload(title, ba, Constants.SUFFIX_XLSX, Constants.CONTENT_TYPE_XLSX);
 //    }
-    //集团招标业绩导出
-    @PostMapping("/export/bid")
-    @SaCheckPermission("combine:info:export:win:bid")
-    public void exportBid(@RequestBody JskCombineSearchDto dto) {
-        baseService.exportBid(dto);
-    }
 
     /**
      * 集团招标分页列表

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/UrbanInvestmentPlatformController.java

@@ -62,8 +62,4 @@ public class UrbanInvestmentPlatformController {
         return urbanInvestmentPlatformService.esportPre(dto);
     }
 
-    @PostMapping("/export")
-    public void export(@RequestBody UrbanInvestmentPlatformDto dto) {
-        urbanInvestmentPlatformService.export(dto);
-    }
 }

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

@@ -369,79 +369,6 @@ public class EnterpriseService {
         return new TableDataInfo(list, MapUtils.getInteger(data, "totalCount", 0));
     }
 
-    @Async
-    public void uipSerachExport(EnterpriseUipSearchBody pageDto) {
-        // 分页参数
-        pageDto.setPageNum(1);
-        if (null==pageDto.getPageSize()||pageDto.getPageSize()>=2000){
-            pageDto.setPageSize(2000);
-        }
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/export/search/urbanInvestment", BeanUtil.beanToMap(pageDto, false, false));
-        Integer code = MapUtils.getInteger(map, "code", 300);
-        if (HttpStatus.OK.value() != code) {
-            throw new RuntimeException();
-        }
-        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(map, "data", ""));
-        int i = 0;
-        List<UrbanInvestmentExportVo> resultList = new ArrayList<>();
-        for (Object obj : list) {
-            UrbanInvestmentExportVo vo = new UrbanInvestmentExportVo();
-            Map<String, Object> dataMap = CommonUtils.assertAsMap(obj);
-            vo.setId(i++);
-            vo.setCompanyName(MapUtil.getStr(dataMap, "companyName"));
-
-            StringBuilder domicile = new StringBuilder();
-            if (null != dataMap.get("province")) {
-                domicile.append(MapUtil.getStr(dataMap,"province"));
-            }
-            if (null != dataMap.get("city")) {
-                domicile.append(MapUtil.getStr(dataMap,"city"));
-            }
-            if (null != dataMap.get("area")) {
-                domicile.append(MapUtil.getStr(dataMap,"area"));
-            }
-            if (domicile.length()>0){
-                vo.setDomicile(domicile.toString());
-            }
-            //招标数量
-            vo.setBiddingCount(MapUtil.getInt(dataMap, "biddingCount"));
-            //城投拿地
-            vo.setLandInfoCount(MapUtil.getInt(dataMap, "landInfoCount"));
-            //供应商
-            vo.setSupplierCount(MapUtil.getInt(dataMap, "supplierCount"));
-            //债卷余额
-            vo.setCreditBalance(MapUtil.getDouble(dataMap, "creditBalance"));
-            //主体评级
-            vo.setBratingSubjectLevel(MapUtil.getStr(dataMap, "bratingSubjectLevel"));
-            //行政级别
-            vo.setUipExecutiveLevel(MapUtil.getStr(dataMap, "uipExecutiveLevel"));
-            //股东背景
-            vo.setShareholderBg(MapUtil.getStr(dataMap, "shareholderBg"));
-            //股权关系
-            vo.setEquityRelationship(MapUtil.getStr(dataMap, "equityRelationship"));
-            //平台重要性
-            vo.setPlatformImportance(MapUtil.getStr(dataMap, "platformImportance"));
-            //城投业务类型
-            vo.setUipBusinessType(MapUtil.getStr(dataMap, "uipBusinessType"));
-            //实控人
-            vo.setActualController(MapUtil.getStr(dataMap, "actualController"));
-            //最新报告期
-            vo.setLatestReportPeriod(MapUtil.getDate(dataMap, "latestReportPeriod"));
-            //总资产
-            vo.setTotalAssets(MapUtil.getDouble(dataMap, "totalAssets"));
-            //归母净资产
-            vo.setBelongNetAssets(MapUtil.getDouble(dataMap, "belongNetAssets"));
-            resultList.add(vo);
-        }
-        String title = "查城投平台导出明细";
-        if (null!=pageDto.getExportExeclName()){
-            title = pageDto.getExportExeclName();
-        }
-        ExcelUtils<UrbanInvestmentExportVo> util = new ExcelUtils<>(UrbanInvestmentExportVo.class);
-        ByteArrayOutputStream ba = util.exportExcel(resultList, "查城投平台", title, true);
-        uploadComponent.upload(title, ba, Constants.SUFFIX_XLSX, Constants.CONTENT_TYPE_XLSX);
-    }
-
     public static void main(String[] args) {
         String str = String.format("%1$.2f", 0.0456);
         System.out.println(str);

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

@@ -70,21 +70,6 @@ public class JskCombineInfoService {
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
-    @Async
-    public void memberListExport(JskCombineSearchDto dto) {
-        SysUserFileRecord fileRecord = new SysUserFileRecord();
-        fileRecord.setFileName(dto.getExportExeclName());
-        fileRecord.setType(1);
-        //生成中
-        fileRecord.setStatus(2);
-        fileRecord.setRemark("集团成员列表导出");
-        Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
-        dto.setExportUniqueCode(fileId.toString());
-        //回调函数
-        dto.setExportBackUrl(EXPORT_BACK_URL);
-        dskOpenApiUtil.requestBody("/operate/export/member", BeanUtil.beanToMap(dto, false, false));
-    }
-
     public R groupMemberCount(JskCombineSearchDto dto) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/group/memberCount", BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, R.class);
@@ -308,39 +293,4 @@ public class JskCombineInfoService {
         }
         return performance;
     }
-
-    public AjaxResult exportWinBidPre(JskCombineSearchDto dto) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/count/combine/bid", BeanUtil.beanToMap(dto, false, false));
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Async
-    public void exportWinBid(JskCombineSearchDto dto) {
-        SysUserFileRecord fileRecord = new SysUserFileRecord();
-        fileRecord.setFileName(dto.getExportExeclName());
-        fileRecord.setType(1);
-        //生成中
-        fileRecord.setStatus(2);
-        fileRecord.setRemark("集团中标业绩导出");
-        Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
-        dto.setExportUniqueCode(fileId.toString());
-        //回调函数
-        dto.setExportBackUrl(EXPORT_BACK_URL);
-        dskOpenApiUtil.requestBody("/operate/export/combineBid", BeanUtil.beanToMap(dto, false, false));
-    }
-
-    @Async
-    public void exportBid(JskCombineSearchDto dto) {
-        SysUserFileRecord fileRecord = new SysUserFileRecord();
-        fileRecord.setFileName(dto.getExportExeclName());
-        fileRecord.setType(1);
-        //生成中
-        fileRecord.setStatus(2);
-        fileRecord.setRemark("集团招标业绩导出");
-        Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
-        dto.setExportUniqueCode(fileId.toString());
-        //回调函数
-        dto.setExportBackUrl(EXPORT_BACK_URL);
-        dskOpenApiUtil.requestBody("/operate/export/combineBid", BeanUtil.beanToMap(dto, false, false));
-    }
 }

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

@@ -46,10 +46,4 @@ public interface UrbanInvestmentPlatformService {
      */
     AjaxResult esportPre(UrbanInvestmentPlatformDto pageDto);
 
-    /**
-     *  城投企业导出
-     * @param pageDto
-     * @return
-     */
-    void export(UrbanInvestmentPlatformDto pageDto);
 }

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

@@ -149,78 +149,4 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
         return BeanUtil.toBean(resMap, AjaxResult.class);
     }
 
-    @Override
-    @Async
-    public void export(UrbanInvestmentPlatformDto pageDto) {
-        // 分页参数
-        pageDto.setPageNum(1);
-
-        if (null==pageDto.getPageSize()||pageDto.getPageSize()>=2000){
-            pageDto.setPageSize(2000);
-        }
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/export/urbanInvestment", BeanUtil.beanToMap(pageDto, false, false));
-        Integer code = MapUtils.getInteger(map, "code", 300);
-        if (HttpStatus.OK.value() != code) {
-            throw new RuntimeException();
-        }
-        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(map, "data", ""));
-        int i = 0;
-        List<UrbanInvestmentExportVo> resultList = new ArrayList<>();
-        for (Object obj : list) {
-            UrbanInvestmentExportVo vo = new UrbanInvestmentExportVo();
-            Map<String, Object> dataMap = CommonUtils.assertAsMap(obj);
-            vo.setId(i++);
-            vo.setCompanyName(MapUtil.getStr(dataMap, "companyName"));
-
-            StringBuilder domicile = new StringBuilder();
-            if (null != dataMap.get("province")) {
-                domicile.append(MapUtil.getStr(dataMap,"province"));
-            }
-            if (null != dataMap.get("city")) {
-                domicile.append(MapUtil.getStr(dataMap,"city"));
-            }
-            if (null != dataMap.get("area")) {
-                domicile.append(MapUtil.getStr(dataMap,"area"));
-            }
-            if (domicile.length()>0){
-                vo.setDomicile(domicile.toString());
-            }
-            //招标数量
-            vo.setBiddingCount(MapUtil.getInt(dataMap, "biddingCount"));
-            //城投拿地
-            vo.setLandInfoCount(MapUtil.getInt(dataMap, "landInfoCount"));
-            //供应商
-            vo.setSupplierCount(MapUtil.getInt(dataMap, "supplierCount"));
-            //债卷余额
-            vo.setCreditBalance(MapUtil.getDouble(dataMap, "creditBalance"));
-            //主体评级
-            vo.setBratingSubjectLevel(MapUtil.getStr(dataMap, "bratingSubjectLevel"));
-            //行政级别
-            vo.setUipExecutiveLevel(MapUtil.getStr(dataMap, "uipExecutiveLevel"));
-            //股东背景
-            vo.setShareholderBg(MapUtil.getStr(dataMap, "shareholderBg"));
-            //股权关系
-            vo.setEquityRelationship(MapUtil.getStr(dataMap, "equityRelationship"));
-            //平台重要性
-            vo.setPlatformImportance(MapUtil.getStr(dataMap, "platformImportance"));
-            //城投业务类型
-            vo.setUipBusinessType(MapUtil.getStr(dataMap, "uipBusinessType"));
-            //实控人
-            vo.setActualController(MapUtil.getStr(dataMap, "actualController"));
-            //最新报告期
-            vo.setLatestReportPeriod(MapUtil.getDate(dataMap, "latestReportPeriod"));
-            //总资产
-            vo.setTotalAssets(MapUtil.getDouble(dataMap, "totalAssets"));
-            //归母净资产
-            vo.setBelongNetAssets(MapUtil.getDouble(dataMap, "belongNetAssets"));
-            resultList.add(vo);
-        }
-        String title = "城投平台导出明细";
-        if (null!=pageDto.getExportExeclName()){
-            title = pageDto.getExportExeclName();
-        }
-        ExcelUtils<UrbanInvestmentExportVo> util = new ExcelUtils<>(UrbanInvestmentExportVo.class);
-        ByteArrayOutputStream ba = util.exportExcel(resultList, "城投平台", title, true);
-        uploadComponent.upload(title, ba, Constants.SUFFIX_XLSX, Constants.CONTENT_TYPE_XLSX);
-    }
 }

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

@@ -189,38 +189,19 @@ public class BusinessOpportunityRadarController {
         return opportunityRadarService.importantCondition();
     }
 
-//    /**
-//     * 导出重点项目清单
-//     */
-//    @RequestMapping("/export/important")
-//    @SaCheckPermission("radar:export:important")
-//    public R<SysOssVo> exportBid(@RequestBody JSONObject object, HttpServletResponse response) {
-//        List<ImportantProjectExportVo> list = opportunityRadarService.exportImportant(object);
-//        String title = "重点项目导出明细";
-//        ExcelUtils<ImportantProjectExportVo> util = new ExcelUtils<>(ImportantProjectExportVo.class);
-//        ByteArrayOutputStream ba = util.exportExcel(list, "重点项目", title, true);
-//        return uploadComponent.upload(title, ba, Constants.SUFFIX_XLSX, Constants.CONTENT_TYPE_XLSX);
-//    }
-
-    /*
-     * 重点项目清单导出count
+    /**
+     * 导出重点项目清单
      */
-    @RequestMapping("important/export/pre")
-    public AjaxResult exportImportantPre(@RequestBody JSONObject object) {
-        return opportunityRadarService.importantExportPre(object);
+    @RequestMapping("/export/important")
+    @SaCheckPermission("radar:export:important")
+    public R<SysOssVo> exportBid(@RequestBody JSONObject object, HttpServletResponse response) {
+        List<ImportantProjectExportVo> list = opportunityRadarService.exportImportant(object);
+        String title = "重点项目导出明细";
+        ExcelUtils<ImportantProjectExportVo> util = new ExcelUtils<>(ImportantProjectExportVo.class);
+        ByteArrayOutputStream ba = util.exportExcel(list, "重点项目", title, true);
+        return uploadComponent.upload(title, ba, Constants.SUFFIX_XLSX, Constants.CONTENT_TYPE_XLSX);
     }
 
-    /*
-     * 重点项目清单导出
-     */
-    @RequestMapping("important/export")
-    public void exportImportant(@RequestBody JSONObject object) {
-        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
-        if (StringUtils.isEmpty(compose.getExportExeclName())){
-            object.put("exportExeclName","重点项目导出");
-        }
-        opportunityRadarService.importantExport(object);
-    }
 
     /*
      * 公招市场

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

@@ -55,46 +55,6 @@ public class CompanySearchController {
         return opportunityRadarService.enterprisePage(object);
     }
 
-    /*
-     * 企业基本信息表导出count
-     */
-    @PostMapping("/info/export/pre")
-    public AjaxResult enterpriseInfoExportPre(@RequestBody JSONObject object) {
-        return opportunityRadarService.enterpriseInfoExportPre(object);
-    }
-
-    /*
-     * 企业基本信息表导出
-     */
-    @PostMapping("/info/export")
-    public void enterpriseInfoExport(@RequestBody JSONObject object) {
-        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
-        if (StringUtils.isEmpty(compose.getExportExeclName())){
-            object.put("exportExeclName","企业基本信息导出");
-        }
-        opportunityRadarService.enterpriseInfoExport(object);
-    }
-
-    /*
-     * 企业资质表导出count
-     */
-    @PostMapping("/aptitude/export/pre")
-    public AjaxResult enterpriseAptitudeExportPre(@RequestBody JSONObject object) {
-        return opportunityRadarService.enterpriseAptitudeExportPre(object);
-    }
-
-    /*
-     * 企业资质表导出
-     */
-    @PostMapping("/aptitude/export")
-    public void enterpriseAptitudeExport(@RequestBody JSONObject object) {
-        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
-        if (StringUtils.isEmpty(compose.getExportExeclName())){
-            object.put("exportExeclName","企业资质信息导出");
-        }
-        opportunityRadarService.enterpriseAptitudeExport(object);
-    }
-
     /*
      * 查业主单位
      */

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

+package com.dsk.search.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.utils.StringUtils;
+import com.dsk.jsk.domain.EnterpriseUipSearchBody;
+import com.dsk.jsk.domain.JskCombineSearchDto;
+import com.dsk.jsk.domain.bo.ComposeQueryDto;
+import com.dsk.jsk.domain.bo.UrbanInvestmentPlatformDto;
+import com.dsk.search.service.ExportService;
+import com.dsk.system.service.ISysUserFileRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+/**
+ * @author lc
+ * @date 2023/11/14 14:15
+ */
+@RestController
+@RequestMapping("/export")
+public class ExportController {
+
+    @Autowired
+    private ISysUserFileRecordService sysUserFileRecordService;
+    @Resource
+    private ExportService exportService;
+
+    /**
+     * 导出回调接口
+     * @param object
+     * @return
+     */
+    @PostMapping(value = "/backUrl")
+    public AjaxResult exportBack(@RequestBody JSONObject object) {
+        return sysUserFileRecordService.exportBack(object);
+    }
+
+    /*
+     * 企业基本信息表导出
+     */
+    @PostMapping("/enterpriseInfo/export")
+    public void enterpriseInfoExport(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = com.alibaba.fastjson2.JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (StringUtils.isEmpty(compose.getExportExeclName())){
+            object.put("exportExeclName","企业基本信息导出");
+        }
+        exportService.enterpriseInfoExport(object);
+    }
+
+    /*
+     * 企业资质表导出
+     */
+    @PostMapping("/aptitude/export")
+    public void enterpriseAptitudeExport(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = com.alibaba.fastjson2.JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (StringUtils.isEmpty(compose.getExportExeclName())){
+            object.put("exportExeclName","企业资质信息导出");
+        }
+        exportService.enterpriseAptitudeExport(object);
+    }
+
+    /*
+     * 重点项目清单导出
+     */
+    @RequestMapping("/important/export")
+    public void exportImportant(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = com.alibaba.fastjson2.JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (StringUtils.isEmpty(compose.getExportExeclName())){
+            object.put("exportExeclName","重点项目导出");
+        }
+        exportService.importantExport(object);
+    }
+
+    /**
+     * 集团成员列表导出
+     */
+    @PostMapping("/combine/memberList/export")
+    public void memberListExportPre(@RequestBody JskCombineSearchDto dto) throws Exception {
+        exportService.memberListExport(dto);
+    }
+
+    //集团中标业绩导出
+    @PostMapping("/combine/win/bid")
+    @SaCheckPermission("combine:info:export:win:bid")
+    public void exportWinBid(@RequestBody JskCombineSearchDto dto) {
+        exportService.exportWinBid(dto);
+    }
+
+    //集团招标业绩导出
+    @PostMapping("/combine/bid")
+    @SaCheckPermission("combine:info:export:win:bid")
+    public void exportBid(@RequestBody JskCombineSearchDto dto) {
+        exportService.exportBid(dto);
+    }
+
+    //查城投平台导出
+    @PostMapping(value = "/uipSerach/export")
+    public void uipSerachExport(@RequestBody @Valid EnterpriseUipSearchBody vo) throws Exception {
+        exportService.uipSerachExport(vo);
+    }
+
+    //市场经济  城投平台导出
+    @PostMapping("/urbanInvestmentPlatform/export")
+    public void export(@RequestBody UrbanInvestmentPlatformDto dto) {
+        exportService.export(dto);
+    }
+}

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

@@ -92,46 +92,6 @@ public class BusinessOpportunityRadarService {
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
-    public AjaxResult enterpriseInfoExportPre(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/count/enterprise", object);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Async
-    public void enterpriseInfoExport(JSONObject object) {
-        SysUserFileRecord fileRecord = new SysUserFileRecord();
-        fileRecord.setFileName(object.get("exportExeclName").toString());
-        fileRecord.setType(1);
-        //生成中
-        fileRecord.setStatus(2);
-        fileRecord.setRemark("企业基本信息导出");
-        Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
-        object.put("exportUniqueCode",fileId);
-        //回调函数
-        object.put("exportBackUrl",EXPORT_BACK_URL);
-        dskOpenApiUtil.requestBody("/operate/export/enterprise", object);
-    }
-
-    public AjaxResult enterpriseAptitudeExportPre(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/count/enterprise", object);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Async
-    public void enterpriseAptitudeExport(JSONObject object) {
-        SysUserFileRecord fileRecord = new SysUserFileRecord();
-        fileRecord.setFileName(object.get("exportExeclName").toString());
-        fileRecord.setType(1);
-        //生成中
-        fileRecord.setStatus(2);
-        fileRecord.setRemark("企业资质信息导出");
-        Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
-        object.put("exportUniqueCode",fileId);
-        //回调函数
-        object.put("exportBackUrl",EXPORT_BACK_URL);
-        dskOpenApiUtil.requestBody("/operate/export/aptitude", object);
-    }
-
     public AjaxResult bossCompany(JSONObject object) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/bossCompany", object);
 
@@ -229,27 +189,6 @@ public class BusinessOpportunityRadarService {
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
-    public AjaxResult importantExportPre(JSONObject object) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/count/important", object);
-        return BeanUtil.toBean(map, AjaxResult.class);
-    }
-
-    @Async
-    public void importantExport(JSONObject object) {
-        SysUserFileRecord fileRecord = new SysUserFileRecord();
-        fileRecord.setFileName(object.get("exportExeclName").toString());
-        fileRecord.setType(1);
-        //生成中
-        fileRecord.setStatus(2);
-        fileRecord.setRemark("重点项目清单导出");
-        Long fileId = sysUserFileRecordService.exportAdd(fileRecord);
-        object.put("exportUniqueCode",fileId);
-        //回调函数
-        object.put("exportBackUrl",EXPORT_BACK_URL);
-        dskOpenApiUtil.requestBody("/operate/export/important", object);
-
-    }
-
     public List<ImportantProjectExportVo> exportImportant(JSONObject object) {
         if (ObjectUtil.isEmpty(object.get("page"))) {
             throw new ServiceException("导出条数不能为空！");

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

 package com.dsk.system.service;
 
 
-import cn.hutool.json.JSONObject;
+
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;

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

@@ -3,7 +3,8 @@ package com.dsk.system.service.impl;
 import cn.hutool.core.bean.BeanException;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.json.JSONObject;
+
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.PageQuery;