Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
李苗
/
Vion-DevOps
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 5ac12cce
authored
Jan 08, 2024
by
HlQ
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
[chg] FileController 删除无用代码
1 parent
24dc594b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
107 deletions
src/main/java/vion/controller/FileController.java
src/main/java/vion/service/impl/ContractServiceImpl.java
src/main/java/vion/controller/FileController.java
View file @
5ac12cc
...
@@ -3,9 +3,8 @@ package vion.controller;
...
@@ -3,9 +3,8 @@ package vion.controller;
import
cn.hutool.core.date.DatePattern
;
import
cn.hutool.core.date.DatePattern
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.io.FileUtil
;
import
cn.hutool.core.io.FileUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.crypto.SecureUtil
;
import
cn.hutool.crypto.SecureUtil
;
import
cn.hutool.http.HttpUtil
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
io.github.linpeilie.Converter
;
import
io.github.linpeilie.Converter
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
...
@@ -14,18 +13,12 @@ import org.springframework.beans.factory.annotation.Value;
...
@@ -14,18 +13,12 @@ import org.springframework.beans.factory.annotation.Value;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.MultipartFile
;
import
vion.dto.FileInfoDTO
;
import
vion.dto.FileInfoDTO
;
import
vion.model.*
;
import
vion.model.FileInfo
;
import
vion.service.*
;
import
vion.service.IFileService
;
import
vion.utils.ResultUtil
;
import
vion.vo.ResultVO
;
import
java.io.File
;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.function.Function
;
import
java.util.stream.Collectors
;
@RestController
@RestController
@RequestMapping
(
"/api"
)
@RequestMapping
(
"/api"
)
...
@@ -36,11 +29,6 @@ public class FileController {
...
@@ -36,11 +29,6 @@ public class FileController {
private
final
IFileService
fileService
;
private
final
IFileService
fileService
;
private
final
Converter
converter
;
private
final
Converter
converter
;
private
final
IDeliveryRecordService
deliveryRecordService
;
private
final
ITbDeliverGoodsService
deliverGoodsService
;
private
final
ITbAppendixService
appendixService
;
private
final
IContractService
contractService
;
@Value
(
"${fileUrl:}"
)
@Value
(
"${fileUrl:}"
)
private
String
fileUrl
;
private
String
fileUrl
;
...
@@ -61,14 +49,8 @@ public class FileController {
...
@@ -61,14 +49,8 @@ public class FileController {
}
}
}
}
/*
* todo
* 手机端工单预处理提交
* 项目阶段修改,待联调 sourceType=1 这里的附件查询
* 工单处理上传附件
*/
@PostMapping
(
"/upLoadFile"
)
@PostMapping
(
"/upLoadFile"
)
public
ResultVO
uploadFile
(
Long
storeId
,
Long
sourceId
,
FileInfo
fileInfo
,
@RequestParam
(
name
=
"file"
)
MultipartFile
infile
)
{
public
String
uploadFile
(
Long
storeId
,
Long
sourceId
,
FileInfo
fileInfo
,
@RequestParam
(
name
=
"file"
)
MultipartFile
infile
)
{
try
{
try
{
//上传url地址
//上传url地址
String
filename
=
infile
.
getOriginalFilename
()
+
"_"
+
DateUtil
.
format
(
new
Date
(),
DatePattern
.
PURE_DATETIME_PATTERN
);
String
filename
=
infile
.
getOriginalFilename
()
+
"_"
+
DateUtil
.
format
(
new
Date
(),
DatePattern
.
PURE_DATETIME_PATTERN
);
...
@@ -78,39 +60,21 @@ public class FileController {
...
@@ -78,39 +60,21 @@ public class FileController {
infile
.
transferTo
(
file
);
infile
.
transferTo
(
file
);
String
sha256
=
SecureUtil
.
sha256
(
file
).
toUpperCase
();
String
sha256
=
SecureUtil
.
sha256
(
file
).
toUpperCase
();
String
extName
=
FileUtil
.
extName
(
file
);
String
extName
=
FileUtil
.
extName
(
file
);
return
ResultUtil
.
success
(
path
);
return
path
;
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
return
ResultUtil
.
success
();
/*String filename = infile.getOriginalFilename() + "_" + DateUtil.format(new Date(), DatePattern.PURE_DATETIME_PATTERN);
String path = fileurl + FileUtil.FILE_SEPARATOR + fileInfo.getStoreId() + FileUtil.FILE_SEPARATOR + fileInfo.getSourceId() + FileUtil.FILE_SEPARATOR + filename;
// String path = fileurl + FileUtil.FILE_SEPARATOR + filename;
File file = FileUtil.touch(path);
try {
infile.transferTo(file);
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
throw new RuntimeException(
e);
log
.
error
(
"上传文件失败"
,
e
);
}
}
fileInfo.setName(filename);
return
"success"
;
fileInfo.setUrl(path);
fileInfo.setType(FileUtil.extName(file));
fileInfo.setSha256(SecureUtil.sha256(file).toUpperCase());
// 如果是预工单的话,可能是客户上传的文件
// fileInfo.setUploader();
fileService.save(fileInfo);
return ResultUtil.success();*/
}
}
@PostMapping
(
"/uploadFile1"
)
@PostMapping
(
"/uploadFile1"
)
public
String
uploadFile1
(
FileInfo
fileInfo
,
@RequestParam
(
name
=
"files"
)
MultipartFile
[]
files
)
throws
IOException
{
public
String
uploadFile1
(
FileInfo
fileInfo
,
@RequestParam
(
name
=
"files"
)
MultipartFile
[]
files
)
throws
IOException
{
for
(
MultipartFile
infile
:
files
)
{
for
(
MultipartFile
infile
:
files
)
{
String
orgName
=
infile
.
getOriginalFilename
();
String
orgName
=
infile
.
getOriginalFilename
();
String
fileName
=
orgName
.
substring
(
0
,
orgName
.
lastIndexOf
(
"."
)
);
String
mainName
=
FileUtil
.
mainName
(
orgName
);
String
fileExt
=
orgName
.
substring
(
orgName
.
lastIndexOf
(
"."
)
);
String
fileExt
=
FileUtil
.
extName
(
orgName
);
String
filename
=
fileName
+
"_"
+
DateUtil
.
format
(
new
Date
(),
"yyyyMMdd_HHmmss"
)
+
fileExt
;
String
filename
=
StrUtil
.
format
(
"{}_{}.{}"
,
mainName
,
DateUtil
.
format
(
new
Date
(),
"yyyyMMdd_HHmmss"
),
fileExt
)
;
String
path
=
fileUrl
+
FileUtil
.
FILE_SEPARATOR
+
fileInfo
.
getStoreId
()
+
FileUtil
.
FILE_SEPARATOR
+
fileInfo
.
getSourceId
()
+
FileUtil
.
FILE_SEPARATOR
+
filename
;
String
path
=
FileUtil
.
FILE_SEPARATOR
+
fileInfo
.
getStoreId
()
+
FileUtil
.
FILE_SEPARATOR
+
fileInfo
.
getSourceId
()
+
FileUtil
.
FILE_SEPARATOR
+
filename
;
File
file
=
FileUtil
.
touch
(
path
);
File
file
=
FileUtil
.
touch
(
path
);
infile
.
transferTo
(
file
);
infile
.
transferTo
(
file
);
...
@@ -129,63 +93,4 @@ public class FileController {
...
@@ -129,63 +93,4 @@ public class FileController {
return
"文件保存成功"
;
return
"文件保存成功"
;
}
}
@GetMapping
(
"/tmpfile"
)
public
String
sync
()
{
// bDeliverGoodsId => tbAppendix
Map
<
String
,
List
<
TbAppendix
>>
id2UrlMap
=
appendixService
.
list
(
Wrappers
.<
TbAppendix
>
lambdaQuery
().
eq
(
TbAppendix:
:
getBusinessTable
,
"tb_deliver_goods"
))
.
stream
().
collect
(
Collectors
.
groupingBy
(
TbAppendix:
:
getBusinessUnid
));
// bDeliverGoodsId => tbDeliverGoods
Map
<
Long
,
TbDeliverGoods
>
id2DeliverGoodsMap
=
deliverGoodsService
.
list
().
stream
().
collect
(
Collectors
.
toMap
(
TbDeliverGoods:
:
getDeliverUnid
,
Function
.
identity
()));
// contractNo => contract
Map
<
String
,
Long
>
no2ContractIdMap
=
contractService
.
list
().
stream
().
collect
(
Collectors
.
toMap
(
Contract:
:
getContractNo
,
Contract:
:
getId
));
// contractNo => List<DeliveryRecord>
Map
<
String
,
List
<
DeliveryRecord
>>
no2IdMap
=
deliveryRecordService
.
list
().
stream
().
collect
(
Collectors
.
groupingBy
(
DeliveryRecord:
:
getContractNo
));
id2UrlMap
.
forEach
((
id
,
appendixList
)
->
appendixList
.
forEach
(
appendix
->
{
TbDeliverGoods
deliverGoods
=
id2DeliverGoodsMap
.
get
(
Long
.
valueOf
(
id
));
String
contractNo
=
deliverGoods
.
getContractUnid
();
Long
contractId
=
no2ContractIdMap
.
get
(
contractNo
);
if
(
contractId
==
null
)
{
log
.
error
(
"合同不存在:{}"
,
contractNo
);
return
;
}
List
<
DeliveryRecord
>
deliveryIdList
=
no2IdMap
.
get
(
contractNo
);
if
(
deliveryIdList
.
size
()
==
1
)
{
String
path
=
fileUrl
+
FileUtil
.
FILE_SEPARATOR
+
"/delivery"
+
FileUtil
.
FILE_SEPARATOR
+
contractId
+
FileUtil
.
FILE_SEPARATOR
+
deliveryIdList
.
get
(
0
).
getId
()
+
FileUtil
.
FILE_SEPARATOR
+
appendix
.
getAppendixName
();
File
file
=
HttpUtil
.
downloadFileFromUrl
(
appendix
.
getAppendixUrl
().
replace
(
"192.168.9.110"
,
"117.133.143.114"
),
FileUtil
.
file
(
path
));
FileInfo
fileInfo
=
new
FileInfo
();
fileInfo
.
setStoreId
(-
1L
);
fileInfo
.
setSourceId
(
deliveryIdList
.
get
(
0
).
getId
());
fileInfo
.
setSourceType
(
6
);
fileInfo
.
setContractId
(
contractId
);
fileInfo
.
setName
(
appendix
.
getAppendixName
());
fileInfo
.
setUrl
(
path
);
fileInfo
.
setType
(
FileUtil
.
extName
(
file
));
fileInfo
.
setSha256
(
SecureUtil
.
sha256
(
file
).
toUpperCase
());
fileInfo
.
setUploader
(
"原合同平台"
);
fileService
.
save
(
fileInfo
);
}
else
{
for
(
DeliveryRecord
deliveryRecord
:
deliveryIdList
)
{
if
(
deliveryRecord
.
getSignDate
().
equals
(
id2DeliverGoodsMap
.
get
(
Long
.
valueOf
(
id
)).
getGoodsAcceptancDate
())
&&
deliveryRecord
.
getShipDate
().
equals
(
id2DeliverGoodsMap
.
get
(
Long
.
valueOf
(
id
)).
getDeliverGoodsDate
()))
{
String
path
=
fileUrl
+
FileUtil
.
FILE_SEPARATOR
+
"/delivery"
+
FileUtil
.
FILE_SEPARATOR
+
contractId
+
FileUtil
.
FILE_SEPARATOR
+
deliveryRecord
.
getId
()
+
FileUtil
.
FILE_SEPARATOR
+
appendix
.
getAppendixName
();
File
file
=
HttpUtil
.
downloadFileFromUrl
(
appendix
.
getAppendixUrl
().
replace
(
"192.168.9.110"
,
"117.133.143.114"
),
FileUtil
.
file
(
path
));
FileInfo
fileInfo
=
new
FileInfo
();
fileInfo
.
setStoreId
(-
1L
);
fileInfo
.
setSourceId
(
deliveryRecord
.
getId
());
fileInfo
.
setSourceType
(
6
);
fileInfo
.
setContractId
(
contractId
);
fileInfo
.
setName
(
appendix
.
getAppendixName
());
fileInfo
.
setUrl
(
path
);
fileInfo
.
setType
(
FileUtil
.
extName
(
file
));
fileInfo
.
setSha256
(
SecureUtil
.
sha256
(
file
).
toUpperCase
());
fileInfo
.
setUploader
(
"原合同平台"
);
fileService
.
save
(
fileInfo
);
}
}
}
}));
return
"success"
;
}
}
}
\ No newline at end of file
\ No newline at end of file
src/main/java/vion/service/impl/ContractServiceImpl.java
View file @
5ac12cc
...
@@ -219,7 +219,6 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
...
@@ -219,7 +219,6 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
String
mainName
=
FileUtil
.
mainName
(
orgName
);
String
mainName
=
FileUtil
.
mainName
(
orgName
);
String
fileExt
=
FileUtil
.
extName
(
orgName
);
String
fileExt
=
FileUtil
.
extName
(
orgName
);
String
filename
=
StrUtil
.
format
(
"{}_{}.{}"
,
mainName
,
DateUtil
.
format
(
new
Date
(),
"yyyyMMdd_HHmmss"
),
fileExt
);
String
filename
=
StrUtil
.
format
(
"{}_{}.{}"
,
mainName
,
DateUtil
.
format
(
new
Date
(),
"yyyyMMdd_HHmmss"
),
fileExt
);
;
String
path
=
fileUrl
+
FileUtil
.
FILE_SEPARATOR
+
"contract"
+
FileUtil
.
FILE_SEPARATOR
+
contract
.
getId
()
+
FileUtil
.
FILE_SEPARATOR
+
filename
;
String
path
=
fileUrl
+
FileUtil
.
FILE_SEPARATOR
+
"contract"
+
FileUtil
.
FILE_SEPARATOR
+
contract
.
getId
()
+
FileUtil
.
FILE_SEPARATOR
+
filename
;
File
file
=
FileUtil
.
touch
(
path
);
File
file
=
FileUtil
.
touch
(
path
);
try
{
try
{
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment