Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
a7bf6735
Commit
a7bf6735
authored
Oct 10, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改峰会
parent
db2bbc06
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
11 deletions
+19
-11
ActivityBmController.java
...xxfc/platform/summit/controller/ActivityBmController.java
+4
-0
UploadController.java
.../xxfc/platform/universal/controller/UploadController.java
+14
-11
UploadZipServiceImpl.java
...platform/universal/service/impl/UploadZipServiceImpl.java
+1
-0
No files found.
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityBmController.java
View file @
a7bf6735
...
@@ -12,6 +12,8 @@ import com.xxfc.platform.summit.entity.ActivityBm;
...
@@ -12,6 +12,8 @@ import com.xxfc.platform.summit.entity.ActivityBm;
import
com.xxfc.platform.summit.entity.User
;
import
com.xxfc.platform.summit.entity.User
;
import
com.xxfc.platform.summit.pojo.ActivityBmExcel
;
import
com.xxfc.platform.summit.pojo.ActivityBmExcel
;
import
com.xxfc.platform.summit.pojo.ActivityBmQuery
;
import
com.xxfc.platform.summit.pojo.ActivityBmQuery
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -25,6 +27,7 @@ import java.util.List;
...
@@ -25,6 +27,7 @@ import java.util.List;
*/
*/
@RestController
@RestController
@RequestMapping
(
"/activityBm"
)
@RequestMapping
(
"/activityBm"
)
@Api
(
tags
=
{
"峰会报名信息"
})
public
class
ActivityBmController
extends
BaseController
<
ActivityBmBiz
,
ActivityBm
>
{
public
class
ActivityBmController
extends
BaseController
<
ActivityBmBiz
,
ActivityBm
>
{
@Autowired
@Autowired
...
@@ -53,6 +56,7 @@ public class ActivityBmController extends BaseController<ActivityBmBiz, Activity
...
@@ -53,6 +56,7 @@ public class ActivityBmController extends BaseController<ActivityBmBiz, Activity
@PostMapping
(
"/excel"
)
@PostMapping
(
"/excel"
)
@ApiOperation
(
"下载报名信息excel表"
)
public
void
getExcel
(
@RequestBody
ActivityBmQuery
query
)
throws
Exception
{
public
void
getExcel
(
@RequestBody
ActivityBmQuery
query
)
throws
Exception
{
List
<
ActivityBmExcel
>
rows
=
baseBiz
.
excel
(
query
);
List
<
ActivityBmExcel
>
rows
=
baseBiz
.
excel
(
query
);
// 通过工具类创建writer,默认创建xls格式
// 通过工具类创建writer,默认创建xls格式
...
...
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/UploadController.java
View file @
a7bf6735
...
@@ -15,6 +15,7 @@ import com.xxfc.platform.universal.service.UploadZipService;
...
@@ -15,6 +15,7 @@ import com.xxfc.platform.universal.service.UploadZipService;
import
com.xxfc.platform.universal.utils.ImgBase64Util
;
import
com.xxfc.platform.universal.utils.ImgBase64Util
;
import
com.xxfc.platform.universal.utils.PublicMsg
;
import
com.xxfc.platform.universal.utils.PublicMsg
;
import
com.xxfc.platform.universal.vo.Ueditor
;
import
com.xxfc.platform.universal.vo.Ueditor
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.fileupload.FileItem
;
import
org.apache.commons.fileupload.FileItem
;
import
org.apache.commons.fileupload.disk.DiskFileItemFactory
;
import
org.apache.commons.fileupload.disk.DiskFileItemFactory
;
...
@@ -67,6 +68,7 @@ public class UploadController{
...
@@ -67,6 +68,7 @@ public class UploadController{
return
JsonResultUtil
.
createSuccessResultWithObj
(
uploadService
.
uploadFile
(
file
,
prefix
));
return
JsonResultUtil
.
createSuccessResultWithObj
(
uploadService
.
uploadFile
(
file
,
prefix
));
}
}
@ApiOperation
(
"视频上传"
)
@RequestMapping
(
value
=
"/app/unauth/uploadVideo"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/app/unauth/uploadVideo"
,
method
=
RequestMethod
.
POST
)
public
JSONObject
uploadVideo
(
public
JSONObject
uploadVideo
(
@RequestParam
(
"file"
)
MultipartFile
file
,
@RequestParam
(
"file"
)
MultipartFile
file
,
...
@@ -184,6 +186,7 @@ public class UploadController{
...
@@ -184,6 +186,7 @@ public class UploadController{
return
fileUploadService
.
handlerUpload
(
upfile
,
null
,
prefix
);
return
fileUploadService
.
handlerUpload
(
upfile
,
null
,
prefix
);
}
}
@ApiOperation
(
"图片压缩包上传"
)
@PostMapping
(
value
=
"/app/unauth/pictureZip"
)
@PostMapping
(
value
=
"/app/unauth/pictureZip"
)
public
ObjectRestResponse
pictureZip
(
public
ObjectRestResponse
pictureZip
(
@RequestParam
(
"file"
)
MultipartFile
file
,
@RequestParam
(
"file"
)
MultipartFile
file
,
...
@@ -192,16 +195,16 @@ public class UploadController{
...
@@ -192,16 +195,16 @@ public class UploadController{
}
}
@PostMapping
(
value
=
"/app/unauth/uploadVideo"
)
//
@PostMapping(value="/app/unauth/uploadVideo")
public
ObjectRestResponse
video
(
//
public ObjectRestResponse video(
@RequestParam
(
"file"
)
MultipartFile
file
,
//
@RequestParam("file")MultipartFile file,
@RequestParam
(
value
=
"prefix"
,
defaultValue
=
"summit"
)
String
prefix
)
throws
Exception
{
//
@RequestParam(value = "prefix",defaultValue = "summit")String prefix) throws Exception {
String
filename
=
file
.
getOriginalFilename
();
//
String filename = file.getOriginalFilename();
String
suffixName
=
filename
.
substring
(
filename
.
lastIndexOf
(
"."
));
//
String suffixName = filename.substring(filename.lastIndexOf("."));
if
(!
VideoConstant
.
forms
.
contains
(
suffixName
))
{
//
if (!VideoConstant.forms.contains(suffixName)) {
return
ObjectRestResponse
.
createFailedResult
(
ResultCode
.
FAILED_CODE
,
"只能上传MP4格式"
);
//
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"只能上传MP4格式");
}
//
}
return
ObjectRestResponse
.
succ
(
uploadService
.
uploadVideo
(
file
,
prefix
));
//
return ObjectRestResponse.succ(uploadService.uploadVideo(file,prefix));
}
//
}
}
}
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/impl/UploadZipServiceImpl.java
View file @
a7bf6735
...
@@ -97,6 +97,7 @@ public class UploadZipServiceImpl implements UploadZipService {
...
@@ -97,6 +97,7 @@ public class UploadZipServiceImpl implements UploadZipService {
}
}
}
}
result
.
substring
(
0
,
result
.
length
()-
1
);
return
ObjectRestResponse
.
succ
(
result
.
substring
(
0
,
result
.
length
()-
1
));
return
ObjectRestResponse
.
succ
(
result
.
substring
(
0
,
result
.
length
()-
1
));
}
}
}
}
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