From 26f07223e1b33a8eb5ee184041575e9b204cfebe Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 27 六月 2025 23:26:44 +0800
Subject: [PATCH] 上传程序文件
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncSendBackService.java | 61 ++++--------------------------
1 files changed, 9 insertions(+), 52 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncSendBackService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncSendBackService.java
index cfe41ef..8e4d686 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncSendBackService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncSendBackService.java
@@ -1,56 +1,15 @@
-/**
- * BladeX Commercial License Agreement
- * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
- * <p>
- * Use of this software is governed by the Commercial License Agreement
- * obtained after purchasing a license from BladeX.
- * <p>
- * 1. This software is for development use only under a valid license
- * from BladeX.
- * <p>
- * 2. Redistribution of this software's source code to any third party
- * without a commercial license is strictly prohibited.
- * <p>
- * 3. Licensees may copyright their own code but cannot use segments
- * from this software for such purposes. Copyright of this software
- * remains with BladeX.
- * <p>
- * Using this software signifies agreement to this License, and the software
- * must not be used for illegal purposes.
- * <p>
- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
- * not liable for any claims arising from secondary or illegal development.
- * <p>
- * Author: Chill Zhuang (bladejava@qq.com)
- */
+
package org.springblade.mdm.program.service;
-import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
-import org.apache.commons.compress.archivers.zip.ZipFile;
-import org.apache.commons.compress.utils.IOUtils;
-import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
-import org.flowable.engine.*;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.FileUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.flow.service.CureFlowService;
-import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
-import org.springblade.mdm.program.vo.DncSendBackData;
import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.List;
/**
@@ -62,11 +21,7 @@
@Service
@AllArgsConstructor
public class DncSendBackService {
-
- //private final RepositoryService repositoryService;
- //private final RuntimeService runtimeService;
- //private final HistoryService historyService;
- //private final ProcessEngine processEngine;
+ private final NcNodeService ncNodeService;
private final NcProgramService ncProgramService;
private final CureFlowService cureFlowService;
private final NcProgramExchangeMapper ncProgramExchangeMapper;
@@ -81,16 +36,18 @@
public void dncFileAccept(String ids) {
List<Long> idList = Func.toLongList(ids);
NcProgramExchange exchange;
- NcProgram program;
+ //NcProgram program;
+ NcNode programNode;
+
for (Long id : idList) {
exchange = ncProgramExchangeMapper.selectById(id);
exchange.setStatus(2);//宸插叆搴撶姸鎬�
- program = ncProgramService.getLastNcProgram(exchange.getName());
+ programNode = ncNodeService.getLastProgramNode(exchange.getName());
//濡傛灉鏄凡缁忓浐鍖栫殑鍒欎笉闇�瑕佸惎鍔ㄦ祦绋�
//鍚姩鍥哄寲娴佺▼
- if(program.getIsCured() !=1) {//鏈浐鍖栫殑绋嬪簭锛屽惎鍔ㄥ浐鍖栨祦绋�
- cureFlowService.start(program.getId());
+ if(programNode.getIsCured() !=1) {//鏈浐鍖栫殑绋嬪簭锛屽惎鍔ㄥ浐鍖栨祦绋�
+ cureFlowService.start(programNode.getId());
}
}
--
Gitblit v1.9.3