From a3048fa6fa72fa3cc5da2c43c59bd000e00c9599 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 23:13:32 +0800
Subject: [PATCH] 工控网分析程序状态问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowProgramController.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 5ddcd05..955bbd9 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,28 +1,20 @@
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.springblade.core.log.exception.ServiceException;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.flow.entity.FlowProgramFile;
-import org.springblade.mdm.flow.service.ApproveRecordService;
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;
/**
@@ -37,9 +29,6 @@
@Tag(name = "娴佺▼绠＄悊", description = "娴佺▼绠＄悊")
@Slf4j
public class FlowProgramController {
-
- private final NcProgramService ncProgramService;
- private final ProcessProgRefService ncProcessProgRefService;
private final FlowProgramFileService flowProgramFileService;
@@ -58,7 +47,7 @@
@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).list());
+ return R.data(flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).orderByAsc(FlowProgramFile::getCreateTime).list());
}
@PostMapping("/remove")
@@ -73,7 +62,7 @@
return R.success();
}
- @GetMapping("/content")
+ @GetMapping("/nc-content")
@Operation(summary = "鑾峰彇鏂囦欢鍐呭", description = "浠呴檺鏂囨湰鏍煎紡鐨勫唴瀹癸紝浜岃繘鍒舵枃浠跺皢杩斿洖绌轰覆")
public R<String> fileContent(@Parameter(description = "绋嬪簭鏂囦欢id") Long id) {
try {
@@ -84,4 +73,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