From 5d99227a97b7b244893b748af28e7f78238d2951 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 05 九月 2025 01:15:15 +0800
Subject: [PATCH] 任务提醒，增加导出提醒；
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java
index 28564ce..91c711f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java
@@ -1,27 +1,23 @@
package org.springblade.mdm.flow.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
-import org.springblade.mdm.flow.service.ApproveRecordService;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowProgramFileService;
-import org.springblade.mdm.flow.vo.ApproveRecordVO;
import org.springblade.mdm.flow.vo.ProgramUploadVO;
-import org.springblade.mdm.flow.vo.TaskTraceVO;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
-import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
-import org.springblade.mdm.program.vo.NcProgramUploadVO;
-import org.springblade.mdm.program.vo.NcProgramVO;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -46,7 +42,7 @@
@Operation(summary = "涓婁紶绋嬪簭鏂囦欢", description = "涓婁紶绋嬪簭鏂囦欢")
public R<Boolean> upload(ProgramUploadVO uploadVO) {
try {
-
+ flowProgramFileService.uploadFlowProgramFile(uploadVO);
}catch(Exception e) {
log.error("绋嬪簭涓婁紶鎵ц閿欒",e);
return R.fail("涓婁紶澶辫触:" + e.getMessage());
@@ -54,10 +50,10 @@
return R.success();
}
- @GetMapping("/list-by-node")
- @Operation(summary = "鑺傜偣绋嬪簭鏂囦欢鍒楄〃", description = "鏌愯妭鐐瑰唴鐨勭▼搴忓垪琛紝浠呪�樼▼搴忓寘鈥欏瓧鍏稿��60")
- public R<List<NcProgramVO>> listByNode(@Parameter(description="鎵�灞炶妭鐐笽D")@RequestParam Long nodeId) {
- return R.data(ncProgramService.listByNode(nodeId));
+ @GetMapping("/nclist-by-instanceid")
+ @Operation(summary = "娴佺▼绋嬪簭鏂囦欢鍒楄〃", description = "娴佺▼绋嬪簭鏂囦欢鍒楄〃")
+ public R<List<FlowProgramFile>> listNcFileByProcess(@Parameter(description="娴佺▼瀹炰緥id")@RequestParam String processInstanceId) {
+ return R.data(flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).orderByAsc(FlowProgramFile::getCreateTime).list());
}
@PostMapping("/remove")
@@ -72,7 +68,7 @@
return R.success();
}
- @GetMapping("/content")
+ @GetMapping("/nc-content")
@Operation(summary = "鑾峰彇鏂囦欢鍐呭", description = "浠呴檺鏂囨湰鏍煎紡鐨勫唴瀹癸紝浜岃繘鍒舵枃浠跺皢杩斿洖绌轰覆")
public R<String> fileContent(@Parameter(description = "绋嬪簭鏂囦欢id") Long id) {
try {
@@ -83,4 +79,15 @@
}
}
+ @GetMapping("/down-flow-file")
+ @Operation(summary = "鑾峰彇鏂囦欢鍐呭", description = "浠呴檺鏂囨湰鏍煎紡鐨勫唴瀹癸紝浜岃繘鍒舵枃浠跺皢杩斿洖绌轰覆")
+ public void downloadFile(@Parameter(description = "绋嬪簭鏂囦欢id") Long id, HttpServletResponse response) {
+ try {
+ flowProgramFileService.download(id,response);
+ }catch(Exception e) {
+ log.error("涓嬭浇绋嬪簭鏂囦欢寮傚父", e);
+ throw new ServiceException(e.getMessage());
+ }
+ }
+
}
--
Gitblit v1.9.3