From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 25 六月 2025 11:51:38 +0800 Subject: [PATCH] Merge branch 'mdc_hyjs_master' --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamController.java | 95 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamController.java new file mode 100644 index 0000000..26ae973 --- /dev/null +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamController.java @@ -0,0 +1,95 @@ +package org.jeecg.modules.dncFlow.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.modules.dnc.response.CommonCode; +import org.jeecg.modules.dnc.response.DataResponseResult; +import org.jeecg.modules.dnc.response.QueryPageResponseResult; +import org.jeecg.modules.dnc.response.ResponseResult; +import org.jeecg.modules.dncFlow.entity.AssignFileStream; +import org.jeecg.modules.dncFlow.ext.AssignFileStreamExt; +import org.jeecg.modules.dncFlow.request.ApproveBatchRequest; +import org.jeecg.modules.dncFlow.request.AssignFileRequest; +import org.jeecg.modules.dncFlow.request.AssignFileStreamQueryRequest; +import org.jeecg.modules.dncFlow.service.IAssignFileStreamService; +import org.jeecg.modules.dncFlow.vo.AssignFlowTaskVo; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@Slf4j +@Api(tags = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔") +@RestController +@RequestMapping("/nc/activit") +public class AssignFileStreamController { + @Resource + private IAssignFileStreamService assignFileStreamService; + + @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鍚姩娴佺▼ 淇濆瓨鐩稿簲鐨勬暟鎹� 缁戝畾businessKey") + @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鍚姩娴佺▼ 淇濆瓨鐩稿簲鐨勬暟鎹� 缁戝畾businessKey", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鍚姩娴佺▼ 淇濆瓨鐩稿簲鐨勬暟鎹� 缁戝畾businessKey") + @PostMapping("/assign/file/apply") + public Result<?> applyAssignFile(@RequestBody AssignFileStream stream) { + return assignFileStreamService.applyAssignFile(stream); + } + + @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-瀹℃壒鏈嶅姟") + @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-瀹℃壒鏈嶅姟", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-瀹℃壒鏈嶅姟") + @PostMapping("/assign/file/approve") + public ResponseResult approveAssignFile(@RequestBody AssignFlowTaskVo assignFlowTaskVo) { + boolean b = assignFileStreamService.approveAssignFile(assignFlowTaskVo); + if(b) + return new ResponseResult(CommonCode.SUCCESS); + return new ResponseResult(CommonCode.FAIL); + } + + @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵归噺鎸囨淳鍒拌澶�") + @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵归噺鎸囨淳鍒拌澶�", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵归噺鎸囨淳鍒拌澶�") + @PostMapping("/assign/file/batch/apply") + public ResponseResult applyBatchAssignFile(@RequestBody AssignFileRequest assignFileRequest) { + boolean b = assignFileStreamService.applyBatchAssignFile(assignFileRequest); + if(b) + return new ResponseResult(CommonCode.SUCCESS); + return new ResponseResult(CommonCode.FAIL); + } + + @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵归噺瀹℃壒") + @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵归噺瀹℃壒", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵归噺瀹℃壒") + @PostMapping("/assign/file/batch/approve") + public ResponseResult approveBatchAssignFile(@RequestBody ApproveBatchRequest approveBatchRequest) { + boolean b = assignFileStreamService.approveBatchAssignFile(approveBatchRequest); + if(b) + return new ResponseResult(CommonCode.SUCCESS); + return new ResponseResult(CommonCode.FAIL); + } + + @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-宸插姙鍒楄〃鑾峰彇") + @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-宸插姙鍒楄〃鑾峰彇", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-宸插姙鍒楄〃鑾峰彇") + @GetMapping("/find/page") + public Result<?> findPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, AssignFileStreamQueryRequest request) { + return assignFileStreamService.findPageList(pageNo, pageSize, request); + } + + @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鏌ヨ鏂囨。鐨勫鎵硅褰�") + @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鏌ヨ鏂囨。鐨勫鎵硅褰�", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鏌ヨ鏂囨。鐨勫鎵硅褰�") + @GetMapping("/find/page/{page}/{size}/{docId}") + public QueryPageResponseResult<AssignFileStreamExt> findPageListByDocId(@PathVariable("page") int page, @PathVariable("size") int size, @PathVariable("docId") String docId) { + return assignFileStreamService.findPageListByDocId(page, size, docId); + } + + @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鑾峰彇鍚敤娴佺▼鐨勬爣璁�") + @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鑾峰彇鍚敤娴佺▼鐨勬爣璁�", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鑾峰彇鍚敤娴佺▼鐨勬爣璁�") + @GetMapping("/get/enable/flag") + public DataResponseResult<Boolean> getActiveEnable() { + Boolean b = assignFileStreamService.getFlowableEnable(); + return new DataResponseResult<>(CommonCode.SUCCESS, b); + } + + @GetMapping(value = "/selectVoById") + public Result<AssignFileStream> selectVoById(@RequestParam(name="id") String id){ + return Result.OK(assignFileStreamService.getAssignFileStreamDetail(id)); + } +} -- Gitblit v1.9.3