Merge remote-tracking branch 'origin/master'

cuilei

2025-06-11 cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc

 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 );
    /**
     * 入库操作 文档对应文件升版
@@ -217,6 +238,14 @@
    List<DocInfo> findList(DocInfoQueryRequest docQuery);

    /**
     * 通过一组attributionId,docClassCode,attributionType查询可指派的文档信息列表
     * @param docQuery
     * @return
     */
    List<DocInfo> findListByDocQuery(DocInfoQueryRequest docQuery);


    /**
     * 获取一组工序下的文档信息列表
     * @param streams
     * @return
@@ -228,7 +257,7 @@
     * @param docIds
     * @return
     */
    boolean batchRemoveDocInfo(String[] docIds);
    boolean batchRemoveDocInfo(String[] docIds,String attrType,String attrId);

    /**
     * 文档下载