wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

...

This commit is contained in:
wangliwen 2022-04-19 10:04:47 +08:00
parent 1e2a8a64cb
commit 8ce7a18999
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterController.java
View File

@ -14,6 +14,8 @@ import io.renren.modules.activiti.service.ActRunningService;
import io.renren.modules.processForm.dto.TAbilityApplicationDTO; import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
import io.renren.modules.processForm.dto.TAbilityBatchApplicationDTO; import io.renren.modules.processForm.dto.TAbilityBatchApplicationDTO;
import io.renren.modules.processForm.service.TAbilityApplicationService; import io.renren.modules.processForm.service.TAbilityApplicationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -30,6 +32,8 @@ import java.util.stream.Collectors;
/** /**
* 能力集中中心 接口 * 能力集中中心 接口
*/ */
@Api(tags = "能力集中")
@RestController @RestController
@RequestMapping("/ability/center") @RequestMapping("/ability/center")
public class AbilityCenterController { public class AbilityCenterController {
@ -55,6 +59,7 @@ public class AbilityCenterController {
* @return * @return
*/ */
@PostMapping(value = "/apply") @PostMapping(value = "/apply")
@ApiOperation("批量进行能力申请")
public Result<List<ProcessInstanceDTO>> apply(@RequestBody TAbilityBatchApplicationDTO abilityBatchApplicationDTO) { public Result<List<ProcessInstanceDTO>> apply(@RequestBody TAbilityBatchApplicationDTO abilityBatchApplicationDTO) {
// 仿照请求接口 /act/process/lastestPage // 仿照请求接口 /act/process/lastestPage
PageData<Map<String, Object>> page = actProcessService.page(params); PageData<Map<String, Object>> page = actProcessService.page(params);

9
renren-admin/src/main/java/io/renren/common/controller/FileUploadController.java
View File

@ -2,6 +2,10 @@ package io.renren.common.controller;
import io.renren.common.utils.Result; import io.renren.common.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -18,6 +22,7 @@ import java.util.Date;
import java.util.UUID; import java.util.UUID;
@RestController @RestController
@Api(tags = "静态资源上传")
public class FileUploadController { public class FileUploadController {
@Value("${resource.path}") @Value("${resource.path}")
private String uploadPath; private String uploadPath;
@ -31,6 +36,10 @@ public class FileUploadController {
private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd/"); private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd/");
@PostMapping("/upload") @PostMapping("/upload")
@ApiOperation("上传")
@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "文件", paramType = "file", dataType = "file", required = true)
})
public Result<String> upload(@RequestParam("file") MultipartFile uploadFile, public Result<String> upload(@RequestParam("file") MultipartFile uploadFile,
HttpServletRequest request) { HttpServletRequest request) {
logger.info("上传文件：" + uploadFile.getOriginalFilename()); logger.info("上传文件：" + uploadFile.getOriginalFilename());