Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
map-parent
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
常超
map-parent
Commits
d2b008a4
Commit
d2b008a4
authored
Dec 01, 2022
by
宋珺琪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改可视化返回结构
parent
2b0d4982
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
32 deletions
+3
-32
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/HnTbStRygxDTO.java
+2
-0
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/Kshpropertice.java
+0
-31
common/service_base/src/main/java/com/founder/servicebase/controller/SkServiceController.java
+1
-1
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/HnTbStRygxDTO.java
View file @
d2b008a4
...
...
@@ -19,6 +19,8 @@ public class HnTbStRygxDTO implements Serializable {
private
String
id
;
private
String
label
;
private
int
x
;
private
int
y
;
private
Kshpropertice
properties
;
...
...
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/Kshpropertice.java
View file @
d2b008a4
...
...
@@ -16,36 +16,5 @@ public class Kshpropertice implements Serializable {
private
String
imgType
;
private
String
boderColor
;
/* @ApiModelProperty(value = "标签")
private String describe;
@ApiModelProperty(value = "标识")
private String name;
*//* @ApiModelProperty(value = "姓名")
private String xm;
@ApiModelProperty(value = "身份证号")
private String sfzh;*//*
@ApiModelProperty(value = "ID随机")
private String id;
@ApiModelProperty(value = "图片")
private String img;
@ApiModelProperty(value = "类型")
private String type;
private String value;
*//**
* 是否为黑色节点
*//*
private Boolean gen;
*//**
* 是否为黄色节点
*//*
private Boolean yellow;*/
}
common/service_base/src/main/java/com/founder/servicebase/controller/SkServiceController.java
View file @
d2b008a4
...
...
@@ -103,7 +103,7 @@ public class SkServiceController extends ApiController {
String
postfix
=
filename
.
substring
(
filename
.
lastIndexOf
(
"."
)
+
1
);
//根据Excel文件后缀读取数据
if
(
postfix
.
equals
(
"xls"
))
{
Map
xlsExcelMap
=
ExcelUtil
.
readXLS
X
Excel
(
file
.
getInputStream
(),
SkService
.
class
,
abandonFields
);
Map
xlsExcelMap
=
ExcelUtil
.
readXLSExcel
(
file
.
getInputStream
(),
SkService
.
class
,
abandonFields
);
resultList
=
(
List
)
xlsExcelMap
.
get
(
"dataList"
);
}
else
if
(
postfix
.
equals
(
"xlsx"
)){
Map
xlsxExcelMap
=
ExcelUtil
.
readXLSXExcel
(
file
.
getInputStream
(),
SkService
.
class
,
abandonFields
);
...
...
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