From ec1d61de19f0fe6c3efc781e5d7a6af2ed65ae5d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 10 六月 2025 10:51:49 +0800
Subject: [PATCH] DNC 文档导入、回传文档、解析文档、取消原有设备

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDocInfoService.java |   42 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 36 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 bf35a6f..01cd044 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,22 @@
      */
     boolean addDocInfoRec(String pathFile,File fileRec);
 
+    /**
+     * 瑙f瀽NC鏂囨。閫氱敤鏂规硶
+     * @param pathFile,fileRec
+     * @return
+     */
+    boolean addDocInfoAnalysisNcService(String pathFile,File fileRec) throws FileNotFoundException;
+
+    /**
+     * 鏂囨。瑙f瀽
+     * @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 +166,13 @@
     boolean deleteByProcessId(String processId);
 
     /**
+     * 鍒犻櫎宸ユ涓嬬殑鎵�鏈夋枃妗�
+     * @param stepId
+     * @return
+     */
+    boolean deleteByStepId(String stepId);
+
+    /**
      * 鍒犻櫎鏂囨。淇℃伅
      * @param attrType
      * @param attrId
@@ -207,7 +229,15 @@
      * @param docQuery
      * @return
      */
-    QueryListResponseResult<DocInfo> findList(DocInfoQueryRequest docQuery);
+    List<DocInfo> findList(DocInfoQueryRequest docQuery);
+
+    /**
+     * 閫氳繃涓�缁刟ttributionId,docClassCode,attributionType鏌ヨ鍙寚娲剧殑鏂囨。淇℃伅鍒楄〃
+     * @param docQuery
+     * @return
+     */
+    List<DocInfo> findListByDocQuery(DocInfoQueryRequest docQuery);
+
 
     /**
      * 鑾峰彇涓�缁勫伐搴忎笅鐨勬枃妗d俊鎭垪琛�
@@ -221,7 +251,7 @@
      * @param docIds
      * @return
      */
-    boolean batchRemoveDocInfo(String[] docIds);
+    boolean batchRemoveDocInfo(String[] docIds,String attrType,String attrId);
 
     /**
      * 鏂囨。涓嬭浇

--
Gitblit v1.9.3