Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gdtel-gztel-school-center
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
吴学德
gdtel-gztel-school-center
Commits
de33ed16
Commit
de33ed16
authored
Jun 05, 2020
by
彭祥礼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
图片上传路径修改
parent
2c274363
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
20 deletions
+23
-20
common/src/main/java/com/winsun/utils/PicturesUtil.java
+8
-8
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
+15
-12
No files found.
common/src/main/java/com/winsun/utils/PicturesUtil.java
View file @
de33ed16
...
...
@@ -9,6 +9,7 @@ import java.io.FileOutputStream;
import
java.io.IOException
;
import
java.util.Base64
;
import
java.util.Calendar
;
import
java.util.Date
;
/**
* 二维码海报工具类
...
...
@@ -23,14 +24,14 @@ public class PicturesUtil {
* <p>
* 前端传来图片必须为jpeg格式
* @param file 图片base64字符串
* @param
partner 用户ID做为
文件夹名
* @param
orderNum 图片上一级
文件夹名
* @param pathType 图片上一级文件夹名
* @param
* @return
*/
public
static
String
uploadPictures
(
String
file
,
String
partner
,
String
pathType
){
if
(
StringUtils
.
isBlank
(
partner
)){
partner
=
"temp"
;
public
static
String
uploadPictures
(
String
file
,
String
orderNum
,
String
pathType
){
if
(
StringUtils
.
isBlank
(
orderNum
)){
orderNum
=
"temp"
;
}
Calendar
now
=
Calendar
.
getInstance
();
Integer
yyyy
=
now
.
get
(
Calendar
.
YEAR
);
...
...
@@ -49,13 +50,12 @@ public class PicturesUtil {
if
(!
multipartFiles
[
i
].
isEmpty
())
{
String
base64Data
=
multipartFiles
[
i
].
split
(
","
)[
1
];
String
houzhui
=
multipartFiles
[
i
].
split
(
","
)[
0
].
split
(
"/"
)[
1
].
split
(
";"
)[
0
];
String
filePath1
=
FilePath
.
PATH
.
getValue
()+
pathType
+
"/"
+
partner
+
"/"
+
yymmdd
;
String
filePath1
=
FilePath
.
PATH
.
getValue
()+
pathType
+
"/"
+
yymmdd
+
"/"
+
orderNum
;
File
dir
=
new
File
(
filePath1
);
if
(!
dir
.
exists
())
{
dir
.
mkdirs
();
}
//enclosure/images/idCard/temp/年/月/日/name.jpeg
filePath
=
FilePath
.
PATH
.
getValue
()+
pathType
+
"/"
+
partner
+
"/"
+
yymmdd
+
"."
+
houzhui
;
}
//enclosure/images/idCard/temp/年/月/日/name.jpeg
filePath
=
FilePath
.
PATH
.
getValue
()+
pathType
+
"/"
+
yymmdd
+
"/"
+
orderNum
+
"/"
+
(
new
Date
()).
getTime
()
+
"."
+
houzhui
;
//byte[] bytes = Base64.getUrlDecoder().decode(base64Data);
//byte[] bytes =new BASE64Decoder().decodeBuffer(base64Data);
...
...
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
View file @
de33ed16
...
...
@@ -208,10 +208,11 @@ public class PackageNewClothes {
SysUser
sysUser
=
userMapper
.
selectById
(
partner
);
Order
order
=
new
Order
();
String
uuid
=
UUID
.
randomUUID
().
toString
();
String
id
=
uuid
.
split
(
"-"
)[
0
]+
uuid
.
split
(
"-"
)[
1
];
String
id
=
uuid
.
split
(
"-"
)[
0
]+
uuid
.
split
(
"-"
)[
1
];
if
(
isFromRh
.
equals
(
"true"
)){
order
.
setUserBussinessType
(
"5"
);
}
String
orderNum
=
"YRYM"
+
ProduceIdUtil
.
getId
();
order
.
setId
(
id
);
order
.
setIdCard
(
idCard
);
order
.
setOrderStatus
(
"待处理"
);
...
...
@@ -223,15 +224,15 @@ public class PackageNewClothes {
order
.
setPackageId
(
cardId
);
order
.
setCustomerName
(
customerName
);
order
.
setContactNumber
(
contactNumber
);
order
.
setStudenCard
(
PicturesUtil
.
uploadPictures
(
studentCard
,
partner
,
PATHTYPE
));
order
.
setIdCardzs
(
PicturesUtil
.
uploadPictures
(
studentCard
,
partner
,
PATHTYPE
));
order
.
setIdCardz
(
PicturesUtil
.
uploadPictures
(
idCardz
,
partner
,
PATHTYPE
));
order
.
setIdCardf
(
PicturesUtil
.
uploadPictures
(
idCardf
,
partner
,
PATHTYPE
));
order
.
setStudenCard
(
PicturesUtil
.
uploadPictures
(
studentCard
,
orderNum
,
PATHTYPE
));
order
.
setIdCardzs
(
PicturesUtil
.
uploadPictures
(
studentCard
,
orderNum
,
PATHTYPE
));
order
.
setIdCardz
(
PicturesUtil
.
uploadPictures
(
idCardz
,
orderNum
,
PATHTYPE
));
order
.
setIdCardf
(
PicturesUtil
.
uploadPictures
(
idCardf
,
orderNum
,
PATHTYPE
));
order
.
setRemarks
(
remarks
);
Date
date
=
new
Date
();
order
.
setCreateTime
(
date
);
order
.
setUserType
(
UserType
.
NEWCUSTOMER
.
getId
());
order
.
setOrderNumber
(
"YRYM"
+
ProduceIdUtil
.
getId
()
);
order
.
setOrderNumber
(
orderNum
);
order
.
setHehuorenArea
(
sysUser
.
getSubstName
());
order
.
setHehuorenName
(
sysUser
.
getName
());
String
schoolId
=
appMapper
.
selectSchoolId
(
partner
);
...
...
@@ -336,6 +337,7 @@ public class PackageNewClothes {
if
(
isFromRh
.
equals
(
"true"
)){
order
.
setUserBussinessType
(
"5"
);
}
String
orderNum
=
"YRYM"
+
ProduceIdUtil
.
getId
();
order
.
setIdCard
(
idCard
);
order
.
setOrderStatus
(
"待处理"
);
order
.
setUserSchool
(
userSchool
);
...
...
@@ -346,9 +348,9 @@ public class PackageNewClothes {
order
.
setCustomerName
(
customerName
);
order
.
setContactNumber
(
contactNumber
);
//图片处理
order
.
setIdCardzs
(
PicturesUtil
.
uploadPictures
(
idCardzs
,
partner
,
PATHTYPE
));
order
.
setIdCardz
(
PicturesUtil
.
uploadPictures
(
idCardz
,
partner
,
PATHTYPE
));
order
.
setIdCardf
(
PicturesUtil
.
uploadPictures
(
idCardf
,
partner
,
PATHTYPE
));
order
.
setIdCardzs
(
PicturesUtil
.
uploadPictures
(
idCardzs
,
orderNum
,
PATHTYPE
));
order
.
setIdCardz
(
PicturesUtil
.
uploadPictures
(
idCardz
,
orderNum
,
PATHTYPE
));
order
.
setIdCardf
(
PicturesUtil
.
uploadPictures
(
idCardf
,
orderNum
,
PATHTYPE
));
order
.
setRemarks
(
remarks
);
order
.
setClassNumber
(
classNumber
);
order
.
setParentName
(
parentName
);
...
...
@@ -356,7 +358,7 @@ public class PackageNewClothes {
Date
date
=
new
Date
();
order
.
setCreateTime
(
date
);
order
.
setUserType
(
UserType
.
NEWCUSTOMER
.
getId
());
order
.
setOrderNumber
(
"YRYM"
+
ProduceIdUtil
.
getId
()
);
order
.
setOrderNumber
(
orderNum
);
order
.
setHehuorenArea
(
sysUser
.
getSubstName
());
order
.
setHehuorenName
(
sysUser
.
getName
());
String
schoolId
=
appMapper
.
selectSchoolId
(
partner
);
...
...
@@ -490,17 +492,18 @@ public class PackageNewClothes {
if
(
StringUtils
.
isNotBlank
(
addRess
)){
order
.
setAddress
(
addRess
);
}
String
orderNum
=
"YRYM"
+
ProduceIdUtil
.
getId
();
order
.
setKapin
(
kapin
);
order
.
setPackageId
(
cardId
);
order
.
setCustomerName
(
customerName
);
order
.
setContactNumber
(
contactNumber
);
order
.
setRemarks
(
remarks
);
order
.
setStudenCard
(
PicturesUtil
.
uploadPictures
(
studentCard
,
partner
,
PATHTYPE
));
order
.
setStudenCard
(
PicturesUtil
.
uploadPictures
(
studentCard
,
orderNum
,
PATHTYPE
));
order
.
setBusinessNumber
(
businessNumber
);
Date
date
=
new
Date
();
order
.
setCreateTime
(
date
);
order
.
setUserType
(
UserType
.
NEWCUSTOMER
.
getId
());
order
.
setOrderNumber
(
"YRYM"
+
ProduceIdUtil
.
getId
()
);
order
.
setOrderNumber
(
orderNum
);
order
.
setHehuorenArea
(
sysUser
.
getSubstName
());
order
.
setHehuorenName
(
sysUser
.
getName
());
order
.
setHehuorenSchool
(
school
.
getSchoolName
());
...
...
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