Commit a7bf6735 authored by hanfeng's avatar hanfeng

修改峰会

parent db2bbc06
...@@ -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格式
......
...@@ -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));
} // }
} }
...@@ -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));
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment