Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
car-reptiles
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
梁辉
car-reptiles
Commits
e89670b1
Commit
e89670b1
authored
Dec 08, 2020
by
landerliang@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完成文件上传功能
parent
3097b14e
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
77 additions
and
4 deletions
+77
-4
car-reptiles-system/src/main/java/me/zhengjie/modules/system/constants/MyConstants.java
+33
-0
car-reptiles-system/src/main/java/me/zhengjie/modules/system/domain/vo/report/ReportDetailsReqVo.java
+9
-0
car-reptiles-system/src/main/java/me/zhengjie/modules/system/domain/vo/report/ReportPdfVo.java
+9
-0
car-reptiles-system/src/main/java/me/zhengjie/modules/system/rest/ReportController.java
+10
-0
car-reptiles-system/src/main/java/me/zhengjie/modules/system/service/ReportService.java
+12
-4
car-reptiles-system/src/main/java/me/zhengjie/modules/system/util/CarReportUtil.java
+0
-0
car-reptiles-system/src/main/resources/config/application.yml
+4
-0
No files found.
car-reptiles-system/src/main/java/me/zhengjie/modules/system/constants/MyConstants.java
View file @
e89670b1
...
...
@@ -16,4 +16,37 @@ public class MyConstants {
*/
public
static
final
String
USER_TOKEN_CONTEXT_KEY
=
"user-token"
;
//////// 约定的上传检测报告的其他文件以 车牌号 + 文件名称的后缀 .jpg 来扫描
/**
* 车牌号文件后缀
*/
public
static
final
String
CARNUM_SUFFIX
=
"_1.jpg"
;
/**
* 身份证文件名后缀
*/
public
static
final
String
IDCARD_SUFFIX
=
"_2.jpg"
;
/**
* 申请表文件后缀
*/
public
static
final
String
APPLY_SUFFIX
=
"_3.jpg"
;
/**
* 维修凭证文件后缀
*/
/*public static final String CERTIFICATE_SUFFIX = "_4.jpg";*/
/**
* 行驶证1文件后缀
*/
public
static
final
String
DRIVER_SUFFIX1
=
"_4.jpg"
;
/**
* 行驶证2文件后缀
*/
public
static
final
String
DRIVER_SUFFIX2
=
"_5.jpg"
;
}
car-reptiles-system/src/main/java/me/zhengjie/modules/system/domain/vo/report/ReportDetailsReqVo.java
View file @
e89670b1
...
...
@@ -17,6 +17,15 @@ public class ReportDetailsReqVo {
@ApiModelProperty
(
"检测报告编码"
)
private
String
reportNum
;
@ApiModelProperty
(
"业务流水key"
)
private
String
businessKey
;
@ApiModelProperty
(
"唯一字符串"
)
private
String
uniqueString
;
private
String
vehicleId
;
@ApiModelProperty
(
"开始时间"
)
private
Date
startTime
;
...
...
car-reptiles-system/src/main/java/me/zhengjie/modules/system/domain/vo/report/ReportPdfVo.java
View file @
e89670b1
package
me
.
zhengjie
.
modules
.
system
.
domain
.
vo
.
report
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModelProperty
;
...
...
@@ -29,6 +30,14 @@ public class ReportPdfVo {
@ApiModelProperty
(
"关联的检测报告编号"
)
private
String
reportNum
;
@ApiModelProperty
(
"业务流水key"
)
private
String
businessKey
;
@ApiModelProperty
(
"唯一字符串"
)
private
String
uniqueString
;
private
String
vehicleId
;
@ApiModelProperty
(
"车牌号"
)
private
String
carNum
;
...
...
car-reptiles-system/src/main/java/me/zhengjie/modules/system/rest/ReportController.java
View file @
e89670b1
...
...
@@ -110,6 +110,13 @@ public class ReportController {
return
ResultVo
.
success
(
reportService
.
findCurrentDeptSignature
());
}
@ApiOperation
(
"上传当前检测报告"
)
@GetMapping
(
"/uploadCurrent/{reportPdfId}"
)
public
ResultVo
uploadCurrentReport
(
@PathVariable
Integer
reportPdfId
){
AssertUtil
.
isNotNull
(
reportPdfId
,
"缺少参数reportPdfId"
);
reportService
.
uploadReport
(
reportPdfId
,
null
);
return
ResultVo
.
success
();
}
@ApiOperation
(
"上传报告"
)
@PostMapping
(
"/upload"
)
...
...
@@ -134,6 +141,9 @@ public class ReportController {
@ApiOperation
(
"检测报告详情"
)
public
ResultVo
<
ReportPdfVo
>
signatureReport
(
@RequestBody
ReportDetailsReqVo
detailsReqVo
){
AssertUtil
.
isNotBlank
(
detailsReqVo
.
getCarNum
(),
"缺少参数车牌号"
);
AssertUtil
.
isNotBlank
(
detailsReqVo
.
getBusinessKey
(),
"缺少参数businessKey"
);
AssertUtil
.
isNotBlank
(
detailsReqVo
.
getUniqueString
(),
"缺少参数uniqueString"
);
AssertUtil
.
isNotBlank
(
detailsReqVo
.
getVehicleId
(),
"缺少参数vehicleId"
);
AssertUtil
.
isNotBlank
(
detailsReqVo
.
getReportNum
(),
"缺少参数检测报告编号"
);
AssertUtil
.
isNotNull
(
detailsReqVo
.
getStartTime
(),
"缺少参数开始检测时间"
);
AssertUtil
.
isNotNull
(
detailsReqVo
.
getEndTime
(),
"缺少参数检测结束时间"
);
...
...
car-reptiles-system/src/main/java/me/zhengjie/modules/system/service/ReportService.java
View file @
e89670b1
...
...
@@ -132,7 +132,7 @@ public class ReportService {
List
<
String
>
filePath
=
new
ArrayList
<>();
try
{
int
i
=
0
;
/*
int i =0;
for (MultipartFile file : files) {
String reportPath = carReportUtil.getReportPath(reportPdfVo.getReportNum() + "_" + i , ".jpg");
if(FileUtil.exist(reportPath)){
...
...
@@ -141,10 +141,12 @@ public class ReportService {
FileUtil.writeBytes(file.getBytes(),reportPath);
filePath.add(reportPath);
i++;
}
carReportUtil
.
uploadReport
(
currUserDept
.
getEpAccount
(),
currUserDept
.
getEpPassword
(),
reportPdfVo
,
filePath
);
}*/
//carReportUtil.uploadReport(currUserDept.getEpAccount(),currUserDept.getEpPassword(),reportPdfVo);
carReportUtil
.
uploadReportPost
(
currUserDept
.
getEpAccount
(),
currUserDept
.
getEpPassword
(),
reportPdfVo
);
}
catch
(
Exception
e
)
{
throw
new
BusinessException
(
e
.
getMessage
());
throw
new
BusinessException
(
e
.
get
Localized
Message
());
}
finally
{
//删除刚才保存的文件
filePath
.
forEach
(
path
->
{
...
...
@@ -248,6 +250,9 @@ public class ReportService {
reportPdfVo
.
setReportNum
(
detailsReqVo
.
getReportNum
());
reportPdfVo
.
setCreateTime
(
DateUtil
.
date
());
reportPdfVo
.
setReportName
(
name
);
reportPdfVo
.
setVehicleId
(
detailsReqVo
.
getVehicleId
());
reportPdfVo
.
setUniqueString
(
detailsReqVo
.
getUniqueString
());
reportPdfVo
.
setBusinessKey
(
detailsReqVo
.
getBusinessKey
());
reportPdfMapper
.
insert
(
reportPdfVo
);
}
else
{
reportPdfVo
.
setCarNum
(
detailsReqVo
.
getCarNum
());
...
...
@@ -255,6 +260,9 @@ public class ReportService {
reportPdfVo
.
setReportNum
(
detailsReqVo
.
getReportNum
());
reportPdfVo
.
setCreateTime
(
DateUtil
.
date
());
reportPdfVo
.
setReportName
(
name
);
reportPdfVo
.
setUniqueString
(
detailsReqVo
.
getUniqueString
());
reportPdfVo
.
setVehicleId
(
detailsReqVo
.
getVehicleId
());
reportPdfVo
.
setBusinessKey
(
detailsReqVo
.
getBusinessKey
());
reportPdfMapper
.
updateById
(
reportPdfVo
);
}
...
...
car-reptiles-system/src/main/java/me/zhengjie/modules/system/util/CarReportUtil.java
View file @
e89670b1
This diff is collapsed.
Click to expand it.
car-reptiles-system/src/main/resources/config/application.yml
View file @
e89670b1
...
...
@@ -75,6 +75,7 @@ reptiles:
#环保检索配置
like
:
host
:
http://10.48.21.198:8899/
uploadFileUrl
:
http://10.48.21.198:8899/uploadFile/UploadFileData/SaveUploadVIMFiles
url
:
http://10.48.21.198:8899/businesscom/common/DataAndPhotoPageQuery
inspectReportUrl
:
http://10.48.21.198:8899/Addins_NanNing/Template/InspectionReport_GasMethod_NN.aspx
...
...
@@ -82,6 +83,9 @@ like:
kinggrid
:
url
:
http://sign.kinggrid.com/OfficeServer.jsp
#上传检测报告其他文件的存放目录
uploadFilePath
:
C:\\reptiles\\uploadPicture\\
#签章服务的url
signature
:
carSignature
:
...
...
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