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
801d4f17
Commit
801d4f17
authored
Dec 26, 2023
by
yangyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数据关系提交(西藏)
parent
d65426c2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
70 deletions
+32
-70
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/HnTbStRygx.java
+2
-2
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/Kshpropertice.java
+1
-33
service/publicapi/src/main/java/com/founder/publicapi/controller/YunSouController/HnTbStRygxController.java
+27
-33
service/publicapi/src/main/resources/bootstrap-prod.properties
+2
-2
No files found.
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/HnTbStRygx.java
View file @
801d4f17
...
...
@@ -21,8 +21,8 @@ import java.io.Serializable;
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@Accessors
(
chain
=
true
)
@TableName
(
"
hn_tb
_st_rygx"
)
@ApiModel
(
value
=
"
Hn
TbStRygx对象"
,
description
=
""
)
@TableName
(
"
ksh
_st_rygx"
)
@ApiModel
(
value
=
"
Sk
TbStRygx对象"
,
description
=
""
)
public
class
HnTbStRygx
implements
Serializable
{
@ApiModelProperty
(
value
=
"标签"
)
...
...
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/hnkshEntity/Kshpropertice.java
View file @
801d4f17
...
...
@@ -12,39 +12,7 @@ public class Kshpropertice implements Serializable {
private
String
label
;
private
String
imgType
;
private
String
imagePhoto
;
private
String
boderColor
;
private
String
imagePhoto
;
/* @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;*/
}
service/publicapi/src/main/java/com/founder/publicapi/controller/YunSouController/HnTbStRygxController.java
View file @
801d4f17
...
...
@@ -32,9 +32,7 @@ import org.springframework.web.bind.annotation.*;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.OutputStream
;
import
java.io.*
;
import
java.net.URL
;
import
java.net.URLEncoder
;
import
java.util.*
;
...
...
@@ -324,9 +322,6 @@ public class HnTbStRygxController {
}
//团伙信息集合
List
<
Map
<
String
,
Object
>>
rythInfoList
=
(
List
<
Map
<
String
,
Object
>>)
redisTemplate
.
opsForValue
().
get
(
username
+
":"
+
taskId
+
":"
+
TEAM_KEY
+
teamNum
);
if
(
rythInfoList
.
size
()==
0
){
return
new
MapRestResult
(
200
,
"暂无数据"
,
null
);
}
//指定团伙集合
List
<
Map
<
String
,
Object
>>
rythInfoByIdList
=
new
ArrayList
<>();
...
...
@@ -392,6 +387,7 @@ public class HnTbStRygxController {
Set
<
Map
<
String
,
String
>>
nameSet
=
(
Set
<
Map
<
String
,
String
>>)
team
.
get
(
"name"
);
//拿出children
Set
<
HnTbStRygx
>
childrenList
=
(
Set
<
HnTbStRygx
>)
team
.
get
(
"children"
);
for
(
int
i
=
0
;
i
<
nameList
.
size
();
i
++)
{
HnTbStRygxDTO
mergeDTOgjd
=
new
HnTbStRygxDTO
();
String
name
=
nameList
.
get
(
i
).
get
(
i
).
getName
();
...
...
@@ -480,25 +476,21 @@ public class HnTbStRygxController {
String
excelName
=
excelInfo
.
getExcelName
();
String
postfix
=
excelInfo
.
getExcelPostfix
();
System
.
out
.
println
(
createName
);
//下载的路径
String
path
=
HNKSH_DOWNLOAD_FILE_PATH
+
createName
+
"/"
+
rwid
+
"/"
+
excelId
+
"."
+
postfix
;
//防止url中出现中文
String
encode
=
URLUtil
.
encode
(
path
);
//从URL中获取流
InputStream
inputStream
=
URLUtil
.
getStream
(
new
URL
(
encode
));
response
.
setContentType
(
"application/vnd.ms-excel"
);
response
.
setHeader
(
"content-Disposition"
,
"attachment;filename="
+
URLEncoder
.
encode
(
excelName
,
"utf-8"
));
response
.
setHeader
(
"Access-Control-Expose-Headers"
,
"content-Disposition"
);
OutputStream
outputStream
=
response
.
getOutputStream
();
Workbook
workbook
=
null
;
if
(
postfix
.
equals
(
"xls"
))
{
workbook
=
new
HSSFWorkbook
(
inputStream
);
}
else
{
workbook
=
new
XSSFWorkbook
(
inputStream
);
}
workbook
.
write
(
outputStream
);
outputStream
.
flush
();
outputStream
.
close
();
//读取文件
InputStream
in
=
new
FileInputStream
(
path
);
OutputStream
out
=
response
.
getOutputStream
();
byte
[]
buffer
=
new
byte
[
1024
];
int
len
;
//循环取出流中的数据
while
((
len
=
in
.
read
(
buffer
))
!=
-
1
){
out
.
write
(
buffer
,
0
,
len
);
}
in
.
close
();
out
.
close
();
}
/**
...
...
@@ -512,19 +504,21 @@ public class HnTbStRygxController {
@GetMapping
(
"downloadExcelTemplate"
)
public
void
downloadExcelTemplate
(
HttpServletResponse
response
)
throws
Exception
{
//下载的路径
//防止url中出现中文
String
path
=
URLUtil
.
encode
(
HNKSH_DOWNLOAD_EXCEL_TEMPLATE_PATH
);
//从URL中获取流
InputStream
inputStream
=
URLUtil
.
getStream
(
new
URL
(
path
));
String
path
=
HNKSH_DOWNLOAD_EXCEL_TEMPLATE_PATH
;
response
.
setContentType
(
"application/vnd.ms-excel"
);
response
.
setHeader
(
"content-Disposition"
,
"attachment;filename="
+
URLEncoder
.
encode
(
"上传文件模板.xls"
,
"utf-8"
));
response
.
setHeader
(
"Access-Control-Expose-Headers"
,
"content-Disposition"
);
OutputStream
outputStream
=
response
.
getOutputStream
();
HSSFWorkbook
workbook
=
new
HSSFWorkbook
(
inputStream
);
// XSSFWorkbook workbook = new XSSFWorkbook(inputStream);
workbook
.
write
(
outputStream
);
outputStream
.
flush
();
outputStream
.
close
();
//读取文件
InputStream
in
=
new
FileInputStream
(
path
);
OutputStream
out
=
response
.
getOutputStream
();
byte
[]
buffer
=
new
byte
[
1024
];
int
len
;
//循环取出流中的数据
while
((
len
=
in
.
read
(
buffer
))
!=
-
1
){
out
.
write
(
buffer
,
0
,
len
);
}
in
.
close
();
out
.
close
();
}
/**
...
...
@@ -540,7 +534,7 @@ public class HnTbStRygxController {
public
Result
delFileByExcelId
(
String
excelId
)
{
HnTbStRygxRw
excelInfo
=
hnKshRwService
.
getOne
(
new
QueryWrapper
<
HnTbStRygxRw
>().
eq
(
"excel_id"
,
excelId
));
if
(
excelInfo
==
null
)
{
return
Result
.
ok
().
message
(
"不存在该文件"
);
return
Result
.
error
().
message
(
"不存在该文件"
);
}
String
taskId
=
excelInfo
.
getParentId
();
String
createName
=
excelInfo
.
getCreateName
();
...
...
@@ -570,7 +564,7 @@ public class HnTbStRygxController {
public
Result
delFileByTaskId
(
String
taskId
)
{
List
<
HnTbStRygxRw
>
rwList
=
hnKshRwService
.
list
(
new
QueryWrapper
<
HnTbStRygxRw
>().
eq
(
"RWID"
,
taskId
));
if
(
rwList
.
isEmpty
())
{
return
Result
.
ok
().
message
(
"不存在该任务"
);
return
Result
.
error
().
message
(
"不存在该任务"
);
}
//删除 ksh_st_rygx_rw表的Excel信息
//1.删除任务
...
...
service/publicapi/src/main/resources/bootstrap-prod.properties
View file @
801d4f17
...
...
@@ -31,9 +31,9 @@ spring.redis.password=founder#123
#\u6570\u636E\u5206\u6790\u4E0A\u4F20\u7684\u8DEF\u5F84
hnkshFilePath
=
/opt/
#\u6570\u636E\u5206\u6790\u4E0B\u8F7D\u7684\u8DEF\u5F84
hnkshDownloadFilePath
=
http://155.1.31.34:1009
/opt/
hnkshDownloadFilePath
=
/opt/
#\u6570\u636E\u5206\u6790\u4E0B\u8F7D\u6A21\u677F\u7684\u8DEF\u5F84
hnkshDownloadExcelTemplatePath
=
http://155.1.31.34:1009
/opt/ExcelTemplate.xls
hnkshDownloadExcelTemplatePath
=
/opt/ExcelTemplate.xls
#\u5377\u5B97\u4E0A\u4F20\u7684\u8DEF\u5F84
...
...
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