Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
brandkbs2
Overview
Overview
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
shenjunjie
brandkbs2
Commits
a601c50c
Commit
a601c50c
authored
Sep 26, 2024
by
陈健智
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数据下载动态表头文本增加截取处理
parent
803cb7f0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
7 deletions
+25
-7
src/main/java/com/zhiwei/brandkbs2/config/Constant.java
+4
-0
src/main/java/com/zhiwei/brandkbs2/easyexcel/EasyExcelUtil.java
+20
-6
src/main/java/com/zhiwei/brandkbs2/service/impl/MarkDataServiceImpl.java
+1
-1
No files found.
src/main/java/com/zhiwei/brandkbs2/config/Constant.java
View file @
a601c50c
...
@@ -26,10 +26,14 @@ public class Constant {
...
@@ -26,10 +26,14 @@ public class Constant {
public
static
final
String
MONTH_PATTERN
=
"yyyy-MM"
;
public
static
final
String
MONTH_PATTERN
=
"yyyy-MM"
;
public
static
final
String
YEAR_PATTERN
=
"yyyy"
;
public
static
final
String
YEAR_PATTERN
=
"yyyy"
;
public
static
final
String
SECOND_PATTERN
=
"yyyy-MM-dd HH:mm:ss"
;
public
static
final
FastDateFormat
SPEC_MINUTE_FORMAT
=
FastDateFormat
.
getInstance
(
SPEC_MINUTE_PATTERN
);
public
static
final
FastDateFormat
SPEC_MINUTE_FORMAT
=
FastDateFormat
.
getInstance
(
SPEC_MINUTE_PATTERN
);
public
static
final
FastDateFormat
SPEC_DAY_POINT_FORMAT
=
FastDateFormat
.
getInstance
(
SPEC_DAY_PATTERN
);
public
static
final
FastDateFormat
SPEC_DAY_POINT_FORMAT
=
FastDateFormat
.
getInstance
(
SPEC_DAY_PATTERN
);
public
static
final
FastDateFormat
HOUR_FORMAT
=
FastDateFormat
.
getInstance
(
HOUR_PATTERN
);
public
static
final
FastDateFormat
HOUR_FORMAT
=
FastDateFormat
.
getInstance
(
HOUR_PATTERN
);
public
static
final
FastDateFormat
DAY_FORMAT
=
FastDateFormat
.
getInstance
(
DAY_PATTERN
);
public
static
final
FastDateFormat
DAY_FORMAT
=
FastDateFormat
.
getInstance
(
DAY_PATTERN
);
public
static
final
FastDateFormat
EXCEL_TIME_FORMAT
=
FastDateFormat
.
getInstance
(
SECOND_PATTERN
);
public
static
final
FastDateFormat
SPEC_DAY_FORMAT
=
FastDateFormat
.
getInstance
(
"yyyy/MM/dd"
);
public
static
final
FastDateFormat
SPEC_DAY_FORMAT
=
FastDateFormat
.
getInstance
(
"yyyy/MM/dd"
);
public
static
final
FastDateFormat
ONLY_MONTH_FORMAT
=
FastDateFormat
.
getInstance
(
"M月"
);
public
static
final
FastDateFormat
ONLY_MONTH_FORMAT
=
FastDateFormat
.
getInstance
(
"M月"
);
public
static
final
FastDateFormat
DF_yyyyMMdd
=
FastDateFormat
.
getInstance
(
"yyyyMMdd"
);
public
static
final
FastDateFormat
DF_yyyyMMdd
=
FastDateFormat
.
getInstance
(
"yyyyMMdd"
);
...
...
src/main/java/com/zhiwei/brandkbs2/easyexcel/EasyExcelUtil.java
View file @
a601c50c
...
@@ -9,6 +9,7 @@ import com.alibaba.excel.write.metadata.WriteSheet;
...
@@ -9,6 +9,7 @@ import com.alibaba.excel.write.metadata.WriteSheet;
import
com.zhiwei.brandkbs2.easyexcel.config.ReadExcelDTO
;
import
com.zhiwei.brandkbs2.easyexcel.config.ReadExcelDTO
;
import
com.zhiwei.brandkbs2.easyexcel.config.WriteExcelDTO
;
import
com.zhiwei.brandkbs2.easyexcel.config.WriteExcelDTO
;
import
com.zhiwei.brandkbs2.util.Tools
;
import
com.zhiwei.brandkbs2.util.Tools
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.apache.logging.log4j.Logger
;
...
@@ -26,6 +27,7 @@ import java.nio.channels.ReadableByteChannel;
...
@@ -26,6 +27,7 @@ import java.nio.channels.ReadableByteChannel;
import
java.nio.channels.WritableByteChannel
;
import
java.nio.channels.WritableByteChannel
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Objects
;
/**
/**
* @author sjj
* @author sjj
...
@@ -112,7 +114,7 @@ public class EasyExcelUtil {
...
@@ -112,7 +114,7 @@ public class EasyExcelUtil {
*/
*/
public
static
<
T
>
void
write
(
String
filePath
,
String
sheetName
,
Class
<
T
>
clazz
,
List
<
T
>
datas
)
{
public
static
<
T
>
void
write
(
String
filePath
,
String
sheetName
,
Class
<
T
>
clazz
,
List
<
T
>
datas
)
{
try
{
try
{
formatExcelExports
(
clazz
,
datas
);
formatExcelExports
(
clazz
,
datas
,
null
);
EasyExcel
.
write
(
filePath
,
clazz
).
sheet
(
sheetName
).
doWrite
(
datas
);
EasyExcel
.
write
(
filePath
,
clazz
).
sheet
(
sheetName
).
doWrite
(
datas
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"file:{},write error:"
,
filePath
,
e
);
log
.
error
(
"file:{},write error:"
,
filePath
,
e
);
...
@@ -172,6 +174,7 @@ public class EasyExcelUtil {
...
@@ -172,6 +174,7 @@ public class EasyExcelUtil {
*/
*/
public
static
void
dynamicHeadWrite
(
String
filePath
,
String
sheetName
,
List
<
List
<
String
>>
head
,
List
<
List
<
Object
>>
datas
)
{
public
static
void
dynamicHeadWrite
(
String
filePath
,
String
sheetName
,
List
<
List
<
String
>>
head
,
List
<
List
<
Object
>>
datas
)
{
try
{
try
{
formatExcelExports
(
null
,
null
,
datas
);
EasyExcel
.
write
(
filePath
).
head
(
head
).
sheet
(
sheetName
).
doWrite
(
datas
);
EasyExcel
.
write
(
filePath
).
head
(
head
).
sheet
(
sheetName
).
doWrite
(
datas
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"file:{},write error:"
,
filePath
,
e
);
log
.
error
(
"file:{},write error:"
,
filePath
,
e
);
...
@@ -190,7 +193,7 @@ public class EasyExcelUtil {
...
@@ -190,7 +193,7 @@ public class EasyExcelUtil {
*/
*/
public
static
<
T
>
void
download
(
String
fileName
,
String
sheetName
,
Class
<
T
>
clazz
,
List
<
T
>
datas
,
HttpServletResponse
response
)
{
public
static
<
T
>
void
download
(
String
fileName
,
String
sheetName
,
Class
<
T
>
clazz
,
List
<
T
>
datas
,
HttpServletResponse
response
)
{
try
{
try
{
formatExcelExports
(
clazz
,
datas
);
formatExcelExports
(
clazz
,
datas
,
null
);
response
.
setContentType
(
"application/vnd.ms-excel"
);
response
.
setContentType
(
"application/vnd.ms-excel"
);
response
.
setCharacterEncoding
(
"utf-8"
);
response
.
setCharacterEncoding
(
"utf-8"
);
// 这里URLEncoder.encode可以防止中文乱码
// 这里URLEncoder.encode可以防止中文乱码
...
@@ -238,11 +241,12 @@ public class EasyExcelUtil {
...
@@ -238,11 +241,12 @@ public class EasyExcelUtil {
return
filePath
+
Tools
.
concat
(
projectName
,
nickName
,
System
.
currentTimeMillis
(),
fileName
)
+
".xlsx"
;
return
filePath
+
Tools
.
concat
(
projectName
,
nickName
,
System
.
currentTimeMillis
(),
fileName
)
+
".xlsx"
;
}
}
private
static
<
T
>
void
formatExcelExports
(
Class
<
T
>
clazz
,
List
<
T
>
datas
){
private
static
<
T
>
void
formatExcelExports
(
Class
<
T
>
clazz
,
List
<
T
>
datas
,
List
<
List
<
Object
>>
dynamicDatas
){
if
(
Objects
.
nonNull
(
clazz
))
{
List
<
Field
>
stringFields
=
new
ArrayList
<>();
List
<
Field
>
stringFields
=
new
ArrayList
<>();
// 记录需要设置的部分
// 记录需要设置的部分
for
(
Field
field
:
clazz
.
getDeclaredFields
())
{
for
(
Field
field
:
clazz
.
getDeclaredFields
())
{
// String格式截取前32767
位
// String格式截取前5000
位
if
(
field
.
getGenericType
().
toString
().
equals
(
String
.
class
.
toString
()))
{
if
(
field
.
getGenericType
().
toString
().
equals
(
String
.
class
.
toString
()))
{
field
.
setAccessible
(
true
);
field
.
setAccessible
(
true
);
stringFields
.
add
(
field
);
stringFields
.
add
(
field
);
...
@@ -252,12 +256,22 @@ public class EasyExcelUtil {
...
@@ -252,12 +256,22 @@ public class EasyExcelUtil {
for
(
Field
field
:
stringFields
)
{
for
(
Field
field
:
stringFields
)
{
try
{
try
{
// 截取为excel单元格允许的最大长度
// 截取为excel单元格允许的最大长度
field
.
set
(
data
,
StringUtils
.
substring
((
String
)
(
field
.
get
(
data
)),
0
,
32767
));
field
.
set
(
data
,
StringUtils
.
substring
((
String
)
(
field
.
get
(
data
)),
0
,
5000
));
}
catch
(
IllegalAccessException
e
)
{
}
catch
(
IllegalAccessException
e
)
{
log
.
error
(
e
);
log
.
error
(
e
);
}
}
}
}
});
});
}
}
if
(
CollectionUtils
.
isNotEmpty
(
dynamicDatas
)){
for
(
List
<
Object
>
dynamicData
:
dynamicDatas
)
{
dynamicData
.
replaceAll
(
obj
->
{
if
(
Objects
.
nonNull
(
obj
))
{
obj
=
StringUtils
.
substring
(
String
.
valueOf
(
obj
),
0
,
5000
);
}
return
obj
;
});
}
}
}
}
}
src/main/java/com/zhiwei/brandkbs2/service/impl/MarkDataServiceImpl.java
View file @
a601c50c
...
@@ -5183,7 +5183,7 @@ public class MarkDataServiceImpl implements MarkDataService {
...
@@ -5183,7 +5183,7 @@ public class MarkDataServiceImpl implements MarkDataService {
for
(
JSONObject
hit
:
hits
)
{
for
(
JSONObject
hit
:
hits
)
{
BaseMap
baseMap
=
Tools
.
getBaseFromEsMap
(
hit
);
BaseMap
baseMap
=
Tools
.
getBaseFromEsMap
(
hit
);
List
<
Object
>
data
=
new
ArrayList
<>();
List
<
Object
>
data
=
new
ArrayList
<>();
data
.
add
(
new
Date
(
baseMap
.
getTime
()));
data
.
add
(
Constant
.
EXCEL_TIME_FORMAT
.
format
(
baseMap
.
getTime
()));
data
.
add
(
baseMap
.
getPlatform
());
data
.
add
(
baseMap
.
getPlatform
());
data
.
add
(
baseMap
.
getSource
());
data
.
add
(
baseMap
.
getSource
());
data
.
add
(
baseMap
.
getTitle
());
data
.
add
(
baseMap
.
getTitle
());
...
...
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