Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fulixin
dsk-operate-sys-cscec
Commits
9ba48532
Commit
9ba48532
authored
Dec 28, 2023
by
liuChang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug修复
parent
64ef994c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
4 deletions
+15
-4
aptitudeImportTemplate.xlsx
...dmin/src/main/resources/excel/aptitudeImportTemplate.xlsx
+0
-0
ExportService.java
...i/src/main/java/com/dsk/search/service/ExportService.java
+15
-4
No files found.
dsk-admin/src/main/resources/excel/aptitudeImportTemplate.xlsx
View file @
9ba48532
No preview for this file type
dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/ExportService.java
View file @
9ba48532
...
@@ -8,6 +8,7 @@ import com.dsk.common.constant.Constants;
...
@@ -8,6 +8,7 @@ import com.dsk.common.constant.Constants;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.excel.ExcelUtils
;
import
com.dsk.common.excel.ExcelUtils
;
import
com.dsk.common.exception.ServiceException
;
import
com.dsk.common.exception.ServiceException
;
import
com.dsk.common.utils.redis.RedisUtils
;
import
com.dsk.jsk.domain.JskCombineSearchDto
;
import
com.dsk.jsk.domain.JskCombineSearchDto
;
import
com.dsk.jsk.domain.bo.ComposeQueryDto
;
import
com.dsk.jsk.domain.bo.ComposeQueryDto
;
import
com.dsk.jsk.service.EnterpriseService
;
import
com.dsk.jsk.service.EnterpriseService
;
...
@@ -24,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
...
@@ -24,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.time.Duration
;
import
java.util.*
;
import
java.util.*
;
/**
/**
...
@@ -42,18 +44,25 @@ public class ExportService {
...
@@ -42,18 +44,25 @@ public class ExportService {
private
String
EXPORT_BACK_URL
;
private
String
EXPORT_BACK_URL
;
public
AjaxResult
aptitudeFile
(
MultipartFile
file
)
throws
Exception
{
public
AjaxResult
aptitudeFile
(
MultipartFile
file
)
throws
Exception
{
int
exportCount
=
1
;
if
(
RedisUtils
.
hasKey
(
"aptitudeFileExportCount"
)){
exportCount
=
RedisUtils
.
getCacheObject
(
"aptitudeFileExportCount"
);
if
(
exportCount
>=
3
){
return
AjaxResult
.
error
(
"每天最多导出3次"
);
}
}
ComposeQueryDto
composeQueryDto
=
new
ComposeQueryDto
();
ComposeQueryDto
composeQueryDto
=
new
ComposeQueryDto
();
//识别Excel内容
//识别Excel内容
List
<
AptitudeVo
>
companyNameList
=
new
ExcelUtils
<>(
AptitudeVo
.
class
).
importExcel
(
file
.
getInputStream
(),
2
);
List
<
AptitudeVo
>
companyNameList
=
new
ExcelUtils
<>(
AptitudeVo
.
class
).
importExcel
(
file
.
getInputStream
(),
2
);
if
(
companyNameList
.
isEmpty
())
{
if
(
companyNameList
.
isEmpty
())
{
throw
new
ServiceException
(
"表格中不存在待
导入
数据!"
);
throw
new
ServiceException
(
"表格中不存在待
查询
数据!"
);
}
}
List
<
String
>
list
=
new
ArrayList
<>();
List
<
String
>
list
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
companyNameList
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
companyNameList
.
size
();
i
++)
{
if
(
i
>
499
){
if
(
i
<
500
){
break
;
list
.
add
(
companyNameList
.
get
(
i
).
getCompanyName
())
;
}
}
list
.
add
(
companyNameList
.
get
(
i
).
getCompanyName
());
}
}
composeQueryDto
.
setKeyword
(
String
.
join
(
","
,
list
));
composeQueryDto
.
setKeyword
(
String
.
join
(
","
,
list
));
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyyMMdd"
);
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyyMMdd"
);
...
@@ -72,6 +81,8 @@ public class ExportService {
...
@@ -72,6 +81,8 @@ public class ExportService {
composeQueryDto
.
setExportBackUrl
(
EXPORT_BACK_URL
);
composeQueryDto
.
setExportBackUrl
(
EXPORT_BACK_URL
);
composeQueryDto
.
setExportExeclName
(
fileName
);
composeQueryDto
.
setExportExeclName
(
fileName
);
dskOpenApiUtil
.
requestBody
(
"/operate/export/zjyj/aptitude"
,
BeanUtil
.
beanToMap
(
composeQueryDto
,
false
,
false
));
dskOpenApiUtil
.
requestBody
(
"/operate/export/zjyj/aptitude"
,
BeanUtil
.
beanToMap
(
composeQueryDto
,
false
,
false
));
RedisUtils
.
setCacheObject
(
"aptitudeFileExportCount"
,
exportCount
);
RedisUtils
.
expire
(
"aptitudeFileExportCount"
,
Duration
.
ofHours
(
24
));
return
AjaxResult
.
success
();
return
AjaxResult
.
success
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment