From ffd5abc74eea1f6ee6433ac11e401aaa57bcc4ab Mon Sep 17 00:00:00 2001 From: yangys <y_ys79@sina.com> Date: 星期二, 08 七月 2025 22:37:50 +0800 Subject: [PATCH] 接口文档描述修改 --- blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmParamController.java | 2 +- blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java | 12 ++++++++++++ blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 33 +++++++++++++++++++++++++++++++++ blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java | 1 + 4 files changed, 47 insertions(+), 1 deletions(-) diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmParamController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmParamController.java index 89da234..ea9207f 100644 --- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmParamController.java +++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmParamController.java @@ -27,7 +27,7 @@ @RestController @RequestMapping("/system/param/") @AllArgsConstructor -@Tag(name = "DNC瀵煎叆", description = "DNC瀵煎叆鎺ュ彛") +@Tag(name = "MDM绯荤粺鍙傛暟", description = "MDM绯荤粺鍙傛暟") @Slf4j public class MdmParamController { private final ISysClient sysClient; diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java index f3778a4..5c65bf6 100644 --- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java +++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java @@ -127,4 +127,16 @@ public R<List<NcProgramVO>> send(@Parameter(description="鎵�灞炶妭鐐笽D")@RequestParam Long id) { return null;//R.data(ncProcessProgRefService.listByProcess(processInstanceId)); } + + @GetMapping("/send-to-machine-by-nodeid") + @Operation(summary = "涓嬪彂", description = "涓嬪彂缁欐満搴婅瀹氱殑鐩綍") + public R<Void> sendToMachineByNodeId(@Parameter(description = "鑺傜偣id") Long nodeId) { + try { + ncProgramService.sendByBindNodeId(nodeId); + return R.success(); + }catch(Exception e) { + log.error("鍒犻櫎鏂囦欢澶辫触",e); + return R.fail(e.getMessage()); + } + } } diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java index 417d28b..25af59b 100644 --- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java +++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java @@ -68,6 +68,7 @@ //璁剧疆涓�涓紦瀛橈紝2灏忔椂杩囨湡 bladeRedis.setEx(getFileKey(),bfile.getName(), Duration.ofHours(2)); + String pkgFileName = bladeRedis.get(getFileKey()); //String fileName = file.getOriginalFilename(); //InputStream zipFileInputStream = FileExchangeUtil.convertFileToZip(file.getInputStream()); InputStream zipFileInputStream = file.getInputStream();//test diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java index dfe7c10..f41b3e9 100644 --- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java +++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java @@ -31,7 +31,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.flowable.engine.*; import org.springblade.core.mp.base.BizServiceImpl; import org.springblade.core.mp.support.Condition; @@ -53,6 +55,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; @@ -264,4 +267,34 @@ public IPage<NcProgramVO> pageQuery(NcNodeProgramQueryVO query) { return this.getBaseMapper().pageQuery(Condition.getPage(query),query); } + + /** + * 涓嬪彂缁欎綘鏈哄簥 + * @param bindNcNodeId 涓庣▼搴忕粦瀹氱殑鑺傜偣id + */ + public void sendByBindNodeId(Long bindNcNodeId) throws IOException { + //NcNode node = this.nodeService.getById(bindNodeId); + LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(NcProgram::getBindNcNodeId, bindNcNodeId); + wrapper.eq(NcProgram::getIsLastEdition,1); + NcProgram prog = this.getOne(wrapper); + String filePath = prog.getName(); + try(InputStream ins = ossTemplate.statFileStream(prog.getOssName());){ + File targetFile = new File(filePath); + FileUtils.copyInputStreamToFile(ins, targetFile); + } + } + + String getFilePath(NcProgram prog){ + Machine machine = machineService.getByCode(prog.getMachineCode()); + String dirPath = machine.getProgSendDir(); + + dirPath = StringUtils.removeEnd(StringUtils.removeEnd(dirPath,"/"),"\\"); + File dirs = new File(dirPath); + if(!dirs.exists()){ + dirs.mkdirs(); + } + + return dirPath+File.separator+prog.getName(); + } } -- Gitblit v1.9.3