From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 11 六月 2025 10:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDocInfoService.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDocInfoService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDocInfoService.java
index a1d8f0f..15990e5 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDocInfoService.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDocInfoService.java
@@ -6,16 +6,15 @@
import org.jeecg.modules.dnc.entity.DocFile;
import org.jeecg.modules.dnc.entity.DocInfo;
import org.jeecg.modules.dnc.entity.ProcessStream;
-import org.jeecg.modules.dnc.response.QueryListResponseResult;
-import org.jeecg.modules.dnc.response.QueryPageResponseResult;
-import org.jeecg.modules.dnc.response.ResponseResult;
import org.jeecg.modules.dnc.request.DocInfoQueryRequest;
import org.jeecg.modules.dnc.request.DocInfoUploadRequest;
+import org.jeecg.modules.dnc.response.ResponseResult;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
+import java.io.FileNotFoundException;
import java.util.List;
public interface IDocInfoService extends IService<DocInfo> {
@@ -41,7 +40,7 @@
* @param id
* @return
*/
- boolean deleteDocInfo(String id);
+ boolean deleteDocInfo(String id,String attrType,String attrId);
/**
* 鐩戞帶鏂囦欢瀵煎叆
* @param pathFile
@@ -49,6 +48,28 @@
*/
boolean addDocInfoRec(String pathFile,File fileRec);
+ /**
+ * 瑙ｆ瀽NC鏂囨。閫氱敤鏂规硶锛堝伐鎺цВ鏋愭秹瀵嗭級
+ * @param pathFile,fileRec
+ * @return
+ */
+ boolean addDocInfoAnalysisGwNcService(String pathFile,File fileRec) throws FileNotFoundException;
+
+ /**
+ * 绋嬪簭鍥炰紶锛堟秹瀵嗚В鏋愬伐鎺э級
+ * @param pathFile
+ */
+ boolean addDocInfoAnalysisSmwNcService(String pathFile,File fileRec);
+
+ /**
+ * 鏂囨。瑙ｆ瀽
+ * @param equipmentId
+ * @param fileRec
+ * @param fileNameSuffix
+ * @param fileNameNew
+ * @param filePath
+ * @return
+ */
boolean addDocInfoRecService(String equipmentId,File fileRec,String fileNameSuffix,String fileNameNew,String filePath );
/**
* 鍏ュ簱鎿嶄綔 鏂囨。瀵瑰簲鏂囦欢鍗囩増
@@ -151,6 +172,13 @@
boolean deleteByProcessId(String processId);
/**
+ * 鍒犻櫎宸ユ涓嬬殑鎵�鏈夋枃妗�
+ * @param stepId
+ * @return
+ */
+ boolean deleteByStepId(String stepId);
+
+ /**
* 鍒犻櫎鏂囨。淇℃伅
* @param attrType
* @param attrId
@@ -207,7 +235,15 @@
* @param docQuery
* @return
*/
- Result<?> findList(DocInfoQueryRequest docQuery);
+ List<DocInfo> findList(DocInfoQueryRequest docQuery);
+
+ /**
+ * 閫氳繃涓�缁刟ttributionId,docClassCode,attributionType鏌ヨ鍙寚娲剧殑鏂囨。淇℃伅鍒楄〃
+ * @param docQuery
+ * @return
+ */
+ List<DocInfo> findListByDocQuery(DocInfoQueryRequest docQuery);
+
/**
* 鑾峰彇涓�缁勫伐搴忎笅鐨勬枃妗ｄ俊鎭垪琛�
@@ -221,7 +257,7 @@
* @param docIds
* @return
*/
- boolean batchRemoveDocInfo(String[] docIds);
+ boolean batchRemoveDocInfo(String[] docIds,String attrType,String attrId);
/**
* 鏂囨。涓嬭浇
--
Gitblit v1.9.3