Skip to content

D
dsk-operate-sys-cscec
Commit 51bf9f96 authored by tianhongyang's avatar tianhongyang
Browse files
Options

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

parents d58cb9a5 d17ead35
Hide whitespace changes
Inline Side-by-side
Showing with 722 additions and 121 deletions
dsk-admin/src/main/java/com/dsk/DskOperateSysApplication.java
View file @ 51bf9f96
......@@ -5,6 +5,7 @@ import com.google.api.client.util.SecurityUtils;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
......@@ -15,6 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication
@EnableScheduling
@EnableAsync(proxyTargetClass = true)
public class DskOperateSysApplication {
public static void main(String[] args) {
......
dsk-admin/src/main/resources/application-dev.yml
View file @ 51bf9f96
......@@ -188,14 +188,15 @@ sms:
dsk:
open:
endPoint: 120.27.13.145:8865
endPoint: pre-openapi.jiansheku.com
accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
protocol: http
protocol: https
# endPoint: openapi.jiansheku.com
# accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
# accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
# protocol: https
exportBackUrl: https://szh-test.jiansheku.com/export/backUrl
sa-token:
# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
......
dsk-admin/src/main/resources/application-test.yml
View file @ 51bf9f96
......@@ -188,14 +188,16 @@ sms:
dsk:
open:
endPoint: 120.27.13.145:8865
endPoint: pre-openapi.jiansheku.com
accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
protocol: http
protocol: https
# endPoint: openapi.jiansheku.com
# accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
# accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
# protocol: https
exportBackUrl: http://47.104.91.229:9099/export/backUrl
sa-token:
# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
is-concurrent: true
......
dsk-common/pom.xml
View file @ 51bf9f96
......@@ -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-framework/src/main/java/com/dsk/framework/config/SaTokenConfig.java
View file @ 51bf9f96
......@@ -57,7 +57,7 @@ public class SaTokenConfig implements WebMvcConfigurer {
});
})).addPathPatterns("/**")
// 排除不需要拦截的路径
.excludePathPatterns(securityProperties.getExcludes());
.excludePathPatterns(securityProperties.getExcludes()).excludePathPatterns("/export/backUrl");
}
@Bean
......
dsk-module/dsk-biz-api/pom.xml
View file @ 51bf9f96
......@@ -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/JskCombineInfoController.java
View file @ 51bf9f96
......@@ -46,14 +46,12 @@ public class JskCombineInfoController extends BaseController {
@Autowired
private JskCombineInfoService baseService;
@Autowired
private UploadComponent uploadComponent;
/**
* 集团成员列表
*/
@PostMapping("/memberList")
public TableDataInfo memberList(@RequestBody JskCombineSearchDto dto) throws Exception {
public AjaxResult memberList(@RequestBody JskCombineSearchDto dto) throws Exception {
return baseService.memberList(dto);
}
......@@ -165,29 +163,29 @@ public class JskCombineInfoController extends BaseController {
/**
* 导出中标业绩
*/
@PostMapping("/export/win/bid")
@SaCheckPermission("combine:info:export:win:bid")
public R<SysOssVo> exportWinBid(@RequestBody JskCombineSearchDto dto) {
List<JskCombineWinBidProjectExportVo> list = baseService.exportWinBid(dto);
String title = dto.getCombineName().concat("中标业绩清单");
ExcelUtils<JskCombineWinBidProjectExportVo> util = new ExcelUtils<>(JskCombineWinBidProjectExportVo.class);
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:bid")
public R<SysOssVo> exportBid(@RequestBody JskCombineBidPageDto dto) {
List<JskCombineBidProjectExportVo> list = baseService.exportBid(dto);
String title = dto.getCombineName().concat("招标公告清单");
ExcelUtils<JskCombineBidProjectExportVo> util = new ExcelUtils<>(JskCombineBidProjectExportVo.class);
ByteArrayOutputStream ba = util.exportExcel(list, "集团招标", title, true);
return uploadComponent.upload(title, ba, Constants.SUFFIX_XLSX, Constants.CONTENT_TYPE_XLSX);
}
// @PostMapping("/export/win/bid")
// @SaCheckPermission("combine:info:export:win:bid")
// public R<SysOssVo> exportWinBid(@RequestBody JskCombineSearchDto dto) {
// List<JskCombineWinBidProjectExportVo> list = baseService.exportWinBid(dto);
// String title = dto.getCombineName().concat("中标业绩清单");
// ExcelUtils<JskCombineWinBidProjectExportVo> util = new ExcelUtils<>(JskCombineWinBidProjectExportVo.class);
// 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:bid")
// public R<SysOssVo> exportBid(@RequestBody JskCombineBidPageDto dto) {
// List<JskCombineBidProjectExportVo> list = baseService.exportBid(dto);
// String title = dto.getCombineName().concat("招标公告清单");
// ExcelUtils<JskCombineBidProjectExportVo> util = new ExcelUtils<>(JskCombineBidProjectExportVo.class);
// ByteArrayOutputStream ba = util.exportExcel(list, "集团招标", title, true);
// return uploadComponent.upload(title, ba, Constants.SUFFIX_XLSX, Constants.CONTENT_TYPE_XLSX);
// }
/**
* 集团招标分页列表
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/UrbanInvestmentPlatformController.java
View file @ 51bf9f96
......@@ -56,4 +56,10 @@ public class UrbanInvestmentPlatformController {
public AjaxResult statistics(@RequestBody UrbanInvestmentPlatformDto dto) {
return urbanInvestmentPlatformService.statistics(dto);
}
@PostMapping("/export/pre")
public AjaxResult exportPre(@RequestBody UrbanInvestmentPlatformDto dto) {
return urbanInvestmentPlatformService.esportPre(dto);
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseUipSearchBody.java
View file @ 51bf9f96
......@@ -64,4 +64,9 @@ public class EnterpriseUipSearchBody extends BasePage {
*/
private List<String> equityRelationship;
/**
* 导出名称
*/
private String exportExeclName;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/JskCombineSearchDto.java
View file @ 51bf9f96
......@@ -109,4 +109,12 @@ public class JskCombineSearchDto implements Serializable {
*/
private String orderType;
private Integer exportCount;
private String exportExeclName;
private String exportBackUrl;
private String exportUniqueCode;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/bo/UrbanInvestmentPlatformDto.java
View file @ 51bf9f96
......@@ -77,4 +77,8 @@ public class UrbanInvestmentPlatformDto extends BasePage {
* 含下属区：1 本级：2
*/
private Integer type =1;
/**
* 导出文档名称
*/
private String exportExeclName;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/vo/UrbanInvestmentExportVo.java 0 → 100644
View file @ 51bf9f96
package com.dsk.jsk.domain.vo;
import com.dsk.common.annotation.Excel;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 城投企业
* @author lc
* @create 2023/11/13
*/
@Data
public class UrbanInvestmentExportVo implements Serializable {
@Excel(name = "序号", width = 6)
private Integer id;
@Excel(name = "公司名称", width = 15)
private String companyName;
@Excel(name = "区域", width = 15)
private String domicile;
@Excel(name = "招标数量", width = 10)
private Integer biddingCount;
@Excel(name = "城投拿地", width = 10)
private Integer landInfoCount;
@Excel(name = "供应商", width = 10)
private Integer supplierCount;
@Excel(name = "债卷余额" , suffix = "亿元")
private Double creditBalance;
@Excel(name = "主体评级", width = 15)
private String bratingSubjectLevel;
@Excel(name = "行政级别", width = 15)
private String uipExecutiveLevel;
@Excel(name = "股东背景", width = 15)
private String shareholderBg;
@Excel(name = "股权关系", width = 15)
private String equityRelationship;
@Excel(name = "平台重要性", width = 15)
private String platformImportance;
@Excel(name = "城投业务类型", width = 15)
private String uipBusinessType;
@Excel(name = "实控人", width = 15)
private String actualController;
@Excel(name = "最新报告期", width = 15, dateFormat = "yyyy/MM/dd")
private Date latestReportPeriod;
@Excel(name = "总资产" , suffix = "亿元")
private Double totalAssets;
@Excel(name = "归母净资产" , suffix = "亿元")
private Double belongNetAssets;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseService.java
View file @ 51bf9f96
......@@ -6,13 +6,18 @@ 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.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;
......@@ -20,9 +25,11 @@ 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.*;
......@@ -43,6 +50,8 @@ public class EnterpriseService {
@Autowired
ICustomerService iCustomerService;
@Autowired
private UploadComponent uploadComponent;
public R label(EnterpriseInfoLabelBody body) throws Exception {
List<Map<String, Object>> mapList = new ArrayList<>();
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/JskCombineInfoService.java
View file @ 51bf9f96
......@@ -5,7 +5,10 @@ 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;
......@@ -13,21 +16,28 @@ import com.dsk.common.exception.ServiceException;
import com.dsk.common.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;
......@@ -46,16 +56,20 @@ public class JskCombineInfoService {
private DskOpenApiUtil dskOpenApiUtil;
@Autowired
private EnterpriseService enterpriseService;
@Autowired
private ISysUserFileRecordService sysUserFileRecordService;
@Autowired
private UploadComponent uploadComponent;
@Value("${dsk.exportBackUrl}")
private String EXPORT_BACK_URL;
@Resource
private RedisCache redisCache;
public TableDataInfo memberList(JskCombineSearchDto dto) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/combine/memberList", BeanUtil.beanToMap(dto, false, false));
return dskOpenApiUtil.responsePage(map);
public AjaxResult memberList(JskCombineSearchDto dto) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/combine/memberList", BeanUtil.beanToMap(dto, false, false));
return BeanUtil.toBean(map, AjaxResult.class);
}
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);
......@@ -135,78 +149,78 @@ public class JskCombineInfoService {
return BeanUtil.toBean(map, AjaxResult.class);
}
public List<JskCombineWinBidProjectExportVo> exportWinBid(JskCombineSearchDto dto) {
if (ObjectUtils.isEmpty(dto.getPageSize())) throw new ServiceException("导出条数不能为空！");
if (dto.getPageSize() > 2000) dto.setPageSize(2000);
dto.setPageNum(1);
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/combine/projectList", BeanUtil.beanToMap(dto, false, false));
if (ObjectUtils.isEmpty(map.get("data"))) throw new ServiceException("导出失败，系统错误！");
Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
if (ObjectUtils.isEmpty(data.get("list"))) throw new ServiceException("导出失败，系统错误！");
// public List<JskCombineWinBidProjectExportVo> exportWinBid(JskCombineSearchDto dto) {
// if (ObjectUtils.isEmpty(dto.getPageSize())) throw new ServiceException("导出条数不能为空！");
// if (dto.getPageSize() > 2000) dto.setPageSize(2000);
// dto.setPageNum(1);
// Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/combine/projectList", BeanUtil.beanToMap(dto, false, false));
// if (ObjectUtils.isEmpty(map.get("data"))) throw new ServiceException("导出失败，系统错误！");
// Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
// if (ObjectUtils.isEmpty(data.get("list"))) throw new ServiceException("导出失败，系统错误！");
//
// List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
// if (ObjectUtils.isEmpty(list)) throw new ServiceException("导出失败，无数据导出！");
// List<JskCombineWinBidProjectExportVo> result = new ArrayList<>();
// for (int i = 0; i < list.size(); i++) {
// JskCombineWinBidProjectExportVo vo = new JskCombineWinBidProjectExportVo();
// vo.setId(i + 1);
// vo.setBidTime(MapUtil.getDate(list.get(i),"bidTime"));
// if(ObjectUtils.isEmpty(dto.getSearchValue())){
// vo.setCompanyName(MapUtil.getStr(list.get(i),"companyName"));
// vo.setProjectName(MapUtil.getStr(list.get(i),"projectName"));
// }else {
// vo.setCompanyName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"companyName")));
// vo.setProjectName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
// }
// vo.setStockPercent(MapUtil.getDouble(list.get(i),"stockPercent"));
// vo.setMemberLevel(MapUtil.getStr(list.get(i),"memberLevel"));
// vo.setBidAmount(MapUtil.getDouble(list.get(i),"bidAmount"));
// vo.setAddress(MapUtil.getStr(list.get(i),"address"));
// vo.setBoundType(MapUtil.getStr(list.get(i),"boundType"));
// vo.setProjectType(MapUtil.getStr(list.get(i),"projectType"));
// vo.setProjectUnit(MapUtil.getStr(list.get(i),"projectUnit"));
// result.add(vo);
// }
// return result;
// }
List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
if (ObjectUtils.isEmpty(list)) throw new ServiceException("导出失败，无数据导出！");
List<JskCombineWinBidProjectExportVo> result = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
JskCombineWinBidProjectExportVo vo = new JskCombineWinBidProjectExportVo();
vo.setId(i + 1);
vo.setBidTime(MapUtil.getDate(list.get(i),"bidTime"));
if(ObjectUtils.isEmpty(dto.getSearchValue())){
vo.setCompanyName(MapUtil.getStr(list.get(i),"companyName"));
vo.setProjectName(MapUtil.getStr(list.get(i),"projectName"));
}else {
vo.setCompanyName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"companyName")));
vo.setProjectName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
}
vo.setStockPercent(MapUtil.getDouble(list.get(i),"stockPercent"));
vo.setMemberLevel(MapUtil.getStr(list.get(i),"memberLevel"));
vo.setBidAmount(MapUtil.getDouble(list.get(i),"bidAmount"));
vo.setAddress(MapUtil.getStr(list.get(i),"address"));
vo.setBoundType(MapUtil.getStr(list.get(i),"boundType"));
vo.setProjectType(MapUtil.getStr(list.get(i),"projectType"));
vo.setProjectUnit(MapUtil.getStr(list.get(i),"projectUnit"));
result.add(vo);
}
return result;
}
public List<JskCombineBidProjectExportVo> exportBid(JskCombineBidPageDto dto) {
if (ObjectUtils.isEmpty(dto.getPageSize())) throw new ServiceException("导出条数不能为空！");
if (dto.getPageSize() > 2000) dto.setPageSize(2000);
dto.setPageNum(1);
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/combine/tenderList", BeanUtil.beanToMap(dto, false, false));
if (ObjectUtils.isEmpty(map.get("data"))) throw new ServiceException("导出失败，系统错误！");
Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
if (ObjectUtils.isEmpty(data.get("list"))) throw new ServiceException("导出失败，系统错误！");
List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
if (ObjectUtils.isEmpty(list)) throw new ServiceException("导出失败，无数据导出！");
List<JskCombineBidProjectExportVo> result = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
JskCombineBidProjectExportVo vo = new JskCombineBidProjectExportVo();
vo.setId(i + 1);
vo.setIssueTime(MapUtil.getDate(list.get(i),"issueTime"));
if(ObjectUtils.isEmpty(dto.getKeys())){
vo.setTenderee(MapUtil.getStr(list.get(i),"tenderee"));
vo.setProjectName(MapUtil.getStr(list.get(i),"projectName"));
vo.setAgency(MapUtil.getStr(list.get(i),"agency"));
}else {
vo.setTenderee(StringUtils.removeRed(MapUtil.getStr(list.get(i),"tenderee")));
vo.setProjectName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
vo.setAgency(StringUtils.removeRed(MapUtil.getStr(list.get(i),"agency")));
}
vo.setStockPercent(MapUtil.getDouble(list.get(i),"stockPercent"));
vo.setMemberLevel(MapUtil.getStr(list.get(i),"memberLevel"));
vo.setBidAmount(MapUtil.getDouble(list.get(i),"bidAmount"));
vo.setAddress(MapUtil.getStr(list.get(i),"address"));
vo.setSubjectMatter(MapUtil.getStr(list.get(i),"subjectMatter"));
vo.setProjectType(MapUtil.getStr(list.get(i),"projectType"));
result.add(vo);
}
return result;
}
// public List<JskCombineBidProjectExportVo> exportBid(JskCombineBidPageDto dto) {
// if (ObjectUtils.isEmpty(dto.getPageSize())) throw new ServiceException("导出条数不能为空！");
// if (dto.getPageSize() > 2000) dto.setPageSize(2000);
// dto.setPageNum(1);
// Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/combine/tenderList", BeanUtil.beanToMap(dto, false, false));
// if (ObjectUtils.isEmpty(map.get("data"))) throw new ServiceException("导出失败，系统错误！");
// Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
// if (ObjectUtils.isEmpty(data.get("list"))) throw new ServiceException("导出失败，系统错误！");
//
// List<Map<String, Object>> list = (List<Map<String, Object>>) data.get("list");
// if (ObjectUtils.isEmpty(list)) throw new ServiceException("导出失败，无数据导出！");
// List<JskCombineBidProjectExportVo> result = new ArrayList<>();
// for (int i = 0; i < list.size(); i++) {
// JskCombineBidProjectExportVo vo = new JskCombineBidProjectExportVo();
// vo.setId(i + 1);
// vo.setIssueTime(MapUtil.getDate(list.get(i),"issueTime"));
// if(ObjectUtils.isEmpty(dto.getKeys())){
// vo.setTenderee(MapUtil.getStr(list.get(i),"tenderee"));
// vo.setProjectName(MapUtil.getStr(list.get(i),"projectName"));
// vo.setAgency(MapUtil.getStr(list.get(i),"agency"));
// }else {
// vo.setTenderee(StringUtils.removeRed(MapUtil.getStr(list.get(i),"tenderee")));
// vo.setProjectName(StringUtils.removeRed(MapUtil.getStr(list.get(i),"projectName")));
// vo.setAgency(StringUtils.removeRed(MapUtil.getStr(list.get(i),"agency")));
// }
// vo.setStockPercent(MapUtil.getDouble(list.get(i),"stockPercent"));
// vo.setMemberLevel(MapUtil.getStr(list.get(i),"memberLevel"));
// vo.setBidAmount(MapUtil.getDouble(list.get(i),"bidAmount"));
// vo.setAddress(MapUtil.getStr(list.get(i),"address"));
// vo.setSubjectMatter(MapUtil.getStr(list.get(i),"subjectMatter"));
// vo.setProjectType(MapUtil.getStr(list.get(i),"projectType"));
//
// result.add(vo);
// }
// return result;
// }
public TableDataInfo bidPage(JskCombineBidPageDto dto) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/combine/tenderList", BeanUtil.beanToMap(dto, false, false));
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/service/UrbanInvestmentPlatformService.java
View file @ 51bf9f96
......@@ -38,4 +38,12 @@ public interface UrbanInvestmentPlatformService {
*@date: 2023/5/18 10:29
*/
AjaxResult statistics(UrbanInvestmentPlatformDto pageDto);
/**
* 城投企业导出count查询
* @param pageDto
* @return
*/
AjaxResult esportPre(UrbanInvestmentPlatformDto pageDto);
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/service/impl/UrbanInvestmentPlatformServiceImpl.java
View file @ 51bf9f96
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.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.*;
/**
......@@ -32,6 +40,8 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
@Autowired
private ICustomerService iCustomerService;
@Autowired
private UploadComponent uploadComponent;
@Override
public AjaxResult page(UrbanInvestmentPlatformDto pageDto) {
......@@ -123,4 +133,20 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/urbanInvestment/statistics", BeanUtil.beanToMap(dto, false, false));
return BeanUtil.toBean(map, AjaxResult.class);
}
@Override
public AjaxResult esportPre(UrbanInvestmentPlatformDto pageDto) {
pageDto.setPageNum(1);
pageDto.setPageSize(0);
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/urbanInvestment/page", BeanUtil.beanToMap(pageDto, false, false));
Integer code = MapUtils.getInteger(map, "code", 300);
if (HttpStatus.OK.value() != code) {
throw new RuntimeException();
}
Integer totalCount = MapUtils.getInteger(map, "totalCount");
HashMap<String, Object> resMap = new HashMap<>();
resMap.put("totalCount",totalCount);
return BeanUtil.toBean(resMap, AjaxResult.class);
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/BusinessOpportunityRadarController.java
View file @ 51bf9f96
......@@ -6,6 +6,7 @@ import com.dsk.biz.utils.ExcelUtils;
import com.dsk.common.constant.Constants;
import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.core.domain.R;
import com.dsk.common.utils.StringUtils;
import com.dsk.common.utils.poi.ExcelUtil;
import com.dsk.component.UploadComponent;
import com.dsk.jsk.domain.bo.ComposeQueryDto;
......@@ -201,6 +202,7 @@ public class BusinessOpportunityRadarController {
return uploadComponent.upload(title, ba, Constants.SUFFIX_XLSX, Constants.CONTENT_TYPE_XLSX);
}
/*
* 公招市场
*/
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/CompanySearchController.java
View file @ 51bf9f96
......@@ -2,6 +2,7 @@ package com.dsk.search.controller;
import com.alibaba.fastjson2.JSONObject;
import com.dsk.common.core.domain.AjaxResult;
import com.dsk.common.utils.StringUtils;
import com.dsk.jsk.domain.bo.ComposeQueryDto;
import com.dsk.search.service.BusinessOpportunityRadarService;
import org.springframework.web.bind.annotation.*;
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/ExportController.java 0 → 100644
View file @ 51bf9f96
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("/enterprise/info")
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")
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")
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")
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")
public void uipSerachExport(@RequestBody @Valid EnterpriseUipSearchBody vo) throws Exception {
exportService.uipSerachExport(vo);
}
//市场经济 城投平台导出
@PostMapping("/urbanInvestmentPlatform")
public void export(@RequestBody UrbanInvestmentPlatformDto dto) {
exportService.export(dto);
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/BusinessOpportunityRadarService.java
View file @ 51bf9f96
......@@ -15,9 +15,13 @@ import com.dsk.common.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;
......@@ -42,6 +46,11 @@ public class BusinessOpportunityRadarService {
@Autowired
private EnterpriseService enterpriseService;
@Autowired
private ISysUserFileRecordService sysUserFileRecordService;
@Value("${dsk.exportBackUrl}")
private String EXPORT_BACK_URL;
public AjaxResult jskBidNewsPage(JSONObject object) {
Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", object);
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/ExportService.java 0 → 100644
View file @ 51bf9f96
package com.dsk.search.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson2.JSONObject;
import com.dsk.acc.openapi.client.util.CommonUtils;
import com.dsk.biz.utils.ExcelUtils;
import com.dsk.common.constant.Constants;
import com.dsk.common.utils.DskOpenApiUtil;
import com.dsk.component.UploadComponent;
import com.dsk.jsk.domain.EnterpriseUipSearchBody;
import com.dsk.jsk.domain.JskCombineSearchDto;
import com.dsk.jsk.domain.bo.UrbanInvestmentPlatformDto;
import com.dsk.jsk.domain.vo.UrbanInvestmentExportVo;
import com.dsk.system.domain.SysUserFileRecord;
import com.dsk.system.service.ISysUserFileRecordService;
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 java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @author lc
* @date 2023/11/20 15:21
*/
@Service
public class ExportService {
@Autowired
private ISysUserFileRecordService sysUserFileRecordService;
@Value("${dsk.exportBackUrl}")
private String EXPORT_BACK_URL;
@Autowired
private DskOpenApiUtil dskOpenApiUtil;
@Autowired
private UploadComponent uploadComponent;
//企业基本信息导出
@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);
}
//企业资质导出
@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);
}
//重点项目清单
@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);
}
//集团成员导出
@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));
}
//集团中标业绩导出
@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/combine/tender", BeanUtil.beanToMap(dto, false, false));
}
@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);
}
@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-operate-ui/src/api/detail/groupAccount/groupAccount.js
View file @ 51bf9f96
......@@ -79,7 +79,7 @@ export function bidPage(data) {
// 集团业绩导出
export function exportWinBid(data) {
return request({
url: '/combine/info/export/win/bid',
url: '/export/combine/win/bid',
method: 'post',
data: data
})
......@@ -87,7 +87,7 @@ export function exportWinBid(data) {
// 集团招标导出
export function exportBid(data) {
return request({
url: '/combine/info/export/bid',
url: '/export/combine/bid',
method: 'post',
data: data
})
......@@ -145,7 +145,7 @@ export function peojectTop(data) {
// 集团成员导出
export function memberListExport(data) {
return request({
url: '/combine/info/memberList/export',
url: '/export/combine/memberList',
method: 'post',
data: data
})
......
dsk-operate-ui/src/api/enterpriseData/enterpriseData.js
View file @ 51bf9f96
......@@ -180,19 +180,19 @@ export const searchOwnerUnitListApi = (data) => request({
});
// 查城投平台导出
export const uipSerachExport = (data) => request({
url: '/enterprise/uipSerach/export',
url: '/export/uipSerach',
method: 'post',
data
});
// 企业基本信息导出
export const infoExport = (data) => request({
url: '/enterprise/info/export',
url: '/export/enterprise/info',
method: 'post',
data
});
// 企业资质导出
export const aptitudeExport = (data) => request({
url: '/enterprise/aptitude/export',
url: '/export/aptitude',
method: 'post',
data
});
......
dsk-operate-ui/src/api/macro/macro.js
View file @ 51bf9f96
......@@ -340,7 +340,7 @@ export function getUipIdByCid(param) {
//城投平台导出
export function urbanInvestmentExport(param) {
return request({
url: '/urbanInvestment/export',
url: '/export/urbanInvestment',
method: 'POST',
data: param
})
......
dsk-operate-ui/src/api/radar/radar.js
View file @ 51bf9f96
......@@ -232,7 +232,7 @@ let getImportantDetail = function getImportantDetail(param) {
//项目清单导出
let radarExport = function radarExport(param) {
return request({
url: '/radar/importantPage/export',
url: '/export/important',
method: 'post',
data: param
})
......
dsk-operate-ui/src/views/detail/groupAccount/index.vue
View file @ 51bf9f96
......@@ -31,7 +31,6 @@
import Zhaobiao from "./component/zhaobiao"
import { infoHeader } from '@/api/detail/party-a/index'
import {combineMemberLogo,infoMemberCount} from '@/api/detail/groupAccount/groupAccount'
import elementResizeDetectorMaker from "element-resize-detector"
export default {
name: 'GroupAccount',
components:{
......
dsk-system/src/main/java/com/dsk/system/service/ISysUserFileRecordService.java
View file @ 51bf9f96
package com.dsk.system.service;
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;
import com.dsk.system.domain.SysUserFileRecord;
......@@ -13,4 +17,8 @@ public interface ISysUserFileRecordService {
TableDataInfo<SysUserFileRecord> userList(PageQuery page);
boolean add(SysUserFileRecord bean);
Long exportAdd(SysUserFileRecord bean);
AjaxResult exportBack(JSONObject object);
}
dsk-system/src/main/java/com/dsk/system/service/impl/SysUserFileRecordServiceImpl.java
View file @ 51bf9f96
......@@ -3,10 +3,14 @@ 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 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;
import com.dsk.common.core.page.TableDataInfo;
import com.dsk.common.helper.LoginHelper;
import com.dsk.common.utils.JsonUtils;
import com.dsk.system.domain.SysUserFileRecord;
import com.dsk.system.mapper.SysUserFileRecordMapper;
import com.dsk.system.service.ISysUserFileRecordService;
......@@ -57,4 +61,25 @@ public class SysUserFileRecordServiceImpl implements ISysUserFileRecordService
if(ObjectUtils.isEmpty(bean.getType())) throw new BeanException("文件类型不能为空！");
bean.setUserId(LoginHelper.getUserId());
}
@Override
public Long exportAdd(SysUserFileRecord fileRecord){
fileRecord.setUserId(LoginHelper.getUserId());
baseMapper.insert(fileRecord);
return fileRecord.getId();
}
@Override
public AjaxResult exportBack(JSONObject object) {
if (object==null||object.get("url")==null||object.get("uniqueCode")==null){
return AjaxResult.error("回调参数异常："+object.toString());
}
SysUserFileRecord fileRecord = new SysUserFileRecord();
fileRecord.setId((Long) object.get("uniqueCode"));
fileRecord.setUrl(object.get("url").toString());
fileRecord.setType(0);
baseMapper.updateById(fileRecord);
log.info("导出回调成功："+object.toString());
return AjaxResult.success();
}
}
pom.xml
View file @ 51bf9f96
......@@ -48,6 +48,9 @@
<aws-java-sdk-s3.version>1.12.400</aws-java-sdk-s3.version>
<!-- SMS 配置 -->
<sms4j.version>2.2.0</sms4j.version>
<!--中文转拼音-->
<pinyin4j.version>2.5.1</pinyin4j.version>
</properties>
<profiles>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment