yangys
2025-07-08 ffd5abc74eea1f6ee6433ac11e401aaa57bcc4ab
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExchangeService.java
@@ -3,19 +3,14 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
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.SeekableInMemoryByteChannel;
import org.apache.commons.io.IOUtils;
import org.springblade.core.mp.base.BizEntity;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.redis.cache.BladeRedis;
@@ -23,7 +18,6 @@
import org.springblade.core.tool.utils.FileUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.IoUtil;
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.service.CureFlowService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
@@ -31,7 +25,6 @@
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.utils.CustomBinaryReader;
import org.springblade.mdm.utils.FileExchangeUtil;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -240,7 +233,7 @@
                     program.setIsTest(jsonObject.getInteger("isTest"));
                     program.setMachineCode(jsonObject.getString("machineCode"));
                     program.setNcNodeId(jsonObject.getLong("ncNodeId"));
                     program.setPartNo(jsonObject.getString("partNo"));
                     program.setDrawingNo(jsonObject.getString("drawingNo"));
                     program.setProcessEdition(jsonObject.getString("processEdition"));
                     setBaseProperties(program,jsonObject);
@@ -261,7 +254,7 @@
                     node.setDescription(jsonObject.getString("description"));
                     node.setNodeType(jsonObject.getString("nodeType"));
                     node.setProcessName(jsonObject.getString("processName"));
                     node.setPartNo(jsonObject.getString("partNo"));
                     node.setDrawingNo(jsonObject.getString("drawingNo"));
                     node.setMachineCode(jsonObject.getString("machineCode"));
                     node.setParentId(jsonObject.getLong("parentId"));
                     node.setParentIds(jsonObject.getString("parentIds"));