Commit 1c97d091 authored by chenyuefang's avatar chenyuefang

数据导出

parent 88ef6fc9
...@@ -187,7 +187,8 @@ sms: ...@@ -187,7 +187,8 @@ sms:
territory: ap-guangzhou territory: ap-guangzhou
dsk: dsk:
exportBackUrl: http://123.60.218.188:9099/prod-api/export/backUrl exportBackUrl: http://cr20g.jiansheku.com/prod-api/export/backUrl
exportTemplateName: http://cr20g.jiansheku.com/company/
sa-token: sa-token:
# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
......
...@@ -188,6 +188,7 @@ sms: ...@@ -188,6 +188,7 @@ sms:
dsk: dsk:
exportBackUrl: http://123.60.218.188:9099/prod-api/export/backUrl exportBackUrl: http://123.60.218.188:9099/prod-api/export/backUrl
exportTemplateName: http://123.60.218.188:9099/company/
sa-token: sa-token:
# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
......
...@@ -30,6 +30,7 @@ captcha: ...@@ -30,6 +30,7 @@ captcha:
server: server:
# 服务器的HTTP端口,默认为8080 # 服务器的HTTP端口,默认为8080
# 正式环境为 9097 # 正式环境为 9097
# port: 9097
port: 9098 port: 9098
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
......
...@@ -12,6 +12,7 @@ import com.dsk.search.service.ExportService; ...@@ -12,6 +12,7 @@ import com.dsk.search.service.ExportService;
import com.dsk.search.util.ObjectUtils; import com.dsk.search.util.ObjectUtils;
import com.dsk.system.service.ISysUserFileRecordService; import com.dsk.system.service.ISysUserFileRecordService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -30,6 +31,9 @@ import java.util.Arrays; ...@@ -30,6 +31,9 @@ import java.util.Arrays;
@RequestMapping("/export") @RequestMapping("/export")
public class ExportController { public class ExportController {
@Value("${dsk.exportTemplateName}")
private String EXPORT_TEMPLATE_NAME;
@Autowired @Autowired
private ISysUserFileRecordService sysUserFileRecordService; private ISysUserFileRecordService sysUserFileRecordService;
@Resource @Resource
...@@ -58,7 +62,7 @@ public class ExportController { ...@@ -58,7 +62,7 @@ public class ExportController {
if (StringUtils.isEmpty(compose.getExportExeclName())){ if (StringUtils.isEmpty(compose.getExportExeclName())){
object.put("exportExeclName","企业基本信息导出"); object.put("exportExeclName","企业基本信息导出");
} }
object.put("exportTemplateName","http://123.60.218.188:9099/company/"); object.put("exportTemplateName",EXPORT_TEMPLATE_NAME);
object.put("exportStartRow",3); object.put("exportStartRow",3);
return exportService.enterpriseInfoExport(object); return exportService.enterpriseInfoExport(object);
} }
...@@ -76,7 +80,7 @@ public class ExportController { ...@@ -76,7 +80,7 @@ public class ExportController {
if (StringUtils.isEmpty(compose.getExportExeclName())){ if (StringUtils.isEmpty(compose.getExportExeclName())){
object.put("exportExeclName","企业资质信息导出"); object.put("exportExeclName","企业资质信息导出");
} }
object.put("exportTemplateName","http://123.60.218.188:9099/company/"); object.put("exportTemplateName",EXPORT_TEMPLATE_NAME);
object.put("exportStartRow",3); object.put("exportStartRow",3);
return exportService.enterpriseAptitudeExport(object); return exportService.enterpriseAptitudeExport(object);
} }
......
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