From fcee672452c02cc29e0e17ebc27a8c51698c6d0d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 17:28:44 +0800
Subject: [PATCH] 优化程序注释
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java | 228 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 151 insertions(+), 77 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
index 9cb255f..91d6a16 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncBackFileService.java
@@ -1,99 +1,173 @@
+
package org.springblade.mdm.program.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.HistoryService;
+import org.flowable.engine.ProcessEngine;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.flow.service.CureFlowService;
+import org.springblade.core.oss.model.BladeFile;
+import org.springblade.core.tool.utils.FileUtil;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
+import org.springblade.mdm.flow.service.FlowBusinessService;
import org.springblade.mdm.program.entity.DncBackFile;
-import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.mapper.DncBackFileMapper;
import org.springblade.mdm.program.vo.DncBackFileQueryVO;
import org.springblade.mdm.program.vo.DncBackFileVO;
-import org.springframework.beans.BeanUtils;
+import org.springblade.mdm.program.vo.DncSendBackFile;
+import org.springblade.mdm.utils.FileContentUtil;
+import org.springblade.mdm.utils.ZipTextFileContentUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Enumeration;
import java.util.List;
+import java.util.Optional;
+import java.util.zip.ZipEntry;
-@AllArgsConstructor
+/**
+ * DNC鍥炰紶鏂囦欢澶勭悊鏈嶅姟
+ *
+ * @author yangys
+ */
+@Slf4j
@Service
+@AllArgsConstructor
public class DncBackFileService extends BizServiceImpl<DncBackFileMapper, DncBackFile> {
- private final NcProgramService progService;
+ private final NcNodeService ncNodeService;
private final OssTemplate ossTemplate;
-
- private final CureFlowService cureFlowService;
- /**
- * 鎺ュ彈
- * @param ids
- */
- public void accept(String ids) {
-
- List<Long> idList = Func.toLongList(ids);
-
- for(Long id : idList){
- DncBackFile backFile = this.getById(id);
- backFile.setStatus(DncBackFile.STATUS_ACCEPTED);
- backFile.setConfirmTime(DateUtil.now());
- this.updateById(backFile);
-
- //鏂板缓涓�涓▼搴忥紝灏嗚�佺殑绋嬪簭isLastEditon璁剧疆鏈�0锛岀劧鍚庡惎鍔ㄦ祦绋�
- this.upgradeProgramAndStartCure(backFile.getNcProgramId(),backFile);
- }
- }
-
- void upgradeProgramAndStartCure(long ncProgramId,DncBackFile backFile) {
- NcProgram oldProgram = this.progService.getById(ncProgramId);
- //鏇存柊鏂囦欢淇℃伅
- oldProgram.setOssName(backFile.getOssName());
- oldProgram.setUrl(backFile.getUrl());
- //TODO锛屾槸鍚﹀垹闄ゅ師鏉ョ殑鏂囦欢锛�
- progService.updateById(oldProgram);
- /*
- NcProgram newProgram = new NcProgram();
- BeanUtils.copyProperties(oldProgram,newProgram);
-
- oldProgram.setIsLastEdition(0);
- progService.updateById(oldProgram);
-
- newProgram.setId(null);
- newProgram.setIsLastEdition(1);
- progService.updateById(newProgram);
-
- */
-
- cureFlowService.startOne(oldProgram);//鍚姩涓�涓▼搴忕殑鍥哄寲娴佺▼
- }
-
- /**
- * 鎷掔粷
- * @param ids
- */
- public void reject(String ids) {
- List<Long> idList = Func.toLongList(ids);
-
- for(Long id : idList){
- DncBackFile backFile = this.getById(id);
- backFile.setStatus(DncBackFile.STATUS_REJECTED);
- backFile.setConfirmTime(DateUtil.now());
- this.ossTemplate.removeFile(backFile.getOssName());
- this.updateById(backFile);
- }
-
- }
-
- /**
- * DNC鍥炰紶绋嬪簭澶勭悊鍒嗛〉鏌ヨ
- * @param query 鏌ヨ鍙傛暟
- * @return 鍒嗛〉鏁版嵁
- */
+ private final HistoryService historyService;
+ private final FlowBusinessService businessService;
public IPage<DncBackFileVO> pageQuery(DncBackFileQueryVO query) {
- /*
- IPage<DncBackFileVO> page = this.getBaseMapper().pageQuery(Condition.getPage(query),query);
- */
- return this.getBaseMapper().pageQuery(Condition.getPage(query),query);
+ IPage<DncBackFileVO> page= this.baseMapper.pageQuery(Condition.getPage(query),query);
+ page.getRecords().forEach(item->{
+ item.setProcessExecuted(isProcessExecuted(item.getProcessInstanceId()));
+ });
+ return page;
}
+ /**
+ * 妫�鏌ユ祦绋嬪疄渚嬫槸鍚﹁鎵ц杩囷紙閫氳繃鍘嗗彶璁板綍锛�
+ */
+ public boolean isProcessExecuted(String processInstanceId) {
+ // 妫�鏌ユ槸鍚︽湁鍘嗗彶娲诲姩璁板綍
+ /*
+ long activityCount = historyService.createHistoricActivityInstanceQuery()
+ .processInstanceId(processInstanceId)
+ .count();
+ */
+ // 妫�鏌ユ槸鍚︽湁鍘嗗彶浠诲姟璁板綍
+ long taskCount = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(processInstanceId)
+ .count();
+
+ //澶氫簬涓�涓换鍔¤澶勭悊锛岃鏄庤嚦灏戞祦杞埌绗簩涓妭鐐逛簡
+ return taskCount > 1;
+ }
+
+ /**
+ * 鍙栨秷娴佺▼
+ * @param id 鍥炰紶璁板綍id
+ */
+ @Transactional
+ public void cancelProcess(long id) {
+ DncBackFile backFIle = this.getById(id);
+ NcNode packageNode = ncNodeService.getById(backFIle.getNcNodeId());
+ //澶氫簬涓�涓换鍔¤澶勭悊锛岃鏄庤嚦灏戞祦杞埌绗簩涓妭鐐逛簡
+ if(isProcessExecuted(packageNode.getProcessInstanceId())){
+ throw new ServiceException("娴佺▼宸茬粡寮�濮嬪鐞嗭紝涓嶅彲鍙栨秷");
+ }
+ businessService.deleteProcessInstance(packageNode.getProcessInstanceId());
+ this.baseMapper.deleteById(id);
+ }
+
+ /**
+ * 鑾峰彇鍥炰紶璁板綍鐨勬枃浠跺垪琛�
+ * @param id 鍥炰紶璁板綍id
+ * @return
+ */
+ public List<DncSendBackFile> filesById(long id) throws IOException {
+ List<DncSendBackFile> fileList = new ArrayList<>();
+
+ DncBackFile backFIle = this.getById(id);
+
+ InputStream inputStream = this.ossTemplate.statFileStream(backFIle.getOssName());
+ Path tempZipFile = createTempFile(inputStream);
+ List<String> entryNameList = new ArrayList<>();
+ NcNode packageNode = this.ncNodeService.getById(backFIle.getNcNodeId());
+ String targetFolder = packageNode.getName()+"-"+packageNode.getProcessEdition()+"/";
+ ZipEntry entry;
+ try (java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(tempZipFile.toFile())) {
+ Enumeration<? extends ZipEntry> entries = zipFile.entries();
+ while(entries.hasMoreElements()) {
+ entry = entries.nextElement();
+
+ if(!entry.isDirectory() && entry.getName().startsWith(targetFolder)){
+ //杩欓噷闈箣鍓嶆椂鍏ュ簱鐨勬枃浠�
+ DncSendBackFile file = new DncSendBackFile();
+ file.setName(entry.getName().substring(targetFolder.length()));
+ file.setEntryName(entry.getName());
+
+ fileList.add(file);
+ }
+ }
+ }
+ return fileList;
+ }
+
+
+ Path createTempFile(InputStream inputStream) throws IOException {
+ byte[] zipData = FileUtil.copyToByteArray(inputStream);
+ Path tempFile = Files.createTempFile("tempzip"+System.currentTimeMillis(), ".zip");
+ // 鍐欏叆瀛楄妭鏁版嵁鍒颁复鏃舵枃浠�
+ Files.write(tempFile, zipData, StandardOpenOption.WRITE);
+
+ return tempFile;
+ }
+ /**
+ * 浠庢枃浠跺す鍚嶈В鏋愬嚭绋嬪簭鍖呭悕鍜屽拰宸ュ簭鐗堟
+ * @param folderName 鏂囦欢澶瑰悕
+ * @return 缁撴瀯鏁版嵁
+ */
+ PackageAndProcessEdition parseProgramPackageFromFolderName(String folderName){
+ int index = StringUtils.lastIndexOf(folderName,'-');
+ String processEditon = "";
+ String temp;
+ String packageName = "";
+ if(index != -1){
+ processEditon = folderName.substring(index+1);
+ packageName = folderName.substring(0,index);
+ }
+
+ PackageAndProcessEdition result = new PackageAndProcessEdition();;
+ result.setProgramPackageName(packageName);
+ result.setProcessEdition(processEditon);
+ return result;
+ }
+
+ /**
+ * 鑾峰彇鍘嗗彶璁板綍涓殑鏂囦欢鍐呭
+ * @param id 鍥炰紶鍘嗗彶璁板綍id
+ * @param entryName 鍘嬬缉鍖呮枃浠惰矾寰�
+ * @return
+ */
+ public String getEntryFileContent(long id, String entryName) throws IOException {
+ DncBackFile backFIle = this.getById(id);
+
+ return ZipTextFileContentUtil.getTextContent(this.ossTemplate.statFileStream(backFIle.getOssName()),entryName);
+ }
}
--
Gitblit v1.9.3