测试导出dnc

yangys

8 天以前 f4c6e0e1308bccb943ca1cddfdf7f643b6b6a1aa

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java

@@ -25,7 +25,6 @@
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.program.vo.MdmProgramImportVO;
import org.springblade.mdm.utils.CustomBinaryReader;
import org.springframework.stereotype.Service;
@@ -36,7 +35,6 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.*;

/**
@@ -70,6 +68,7 @@

         //设置一个缓存，2小时过期
         bladeRedis.setEx(getFileKey(),bfile.getName(), Duration.ofHours(2));
         String pkgFileName = bladeRedis.get(getFileKey());
         //String fileName = file.getOriginalFilename();
         //InputStream zipFileInputStream = FileExchangeUtil.convertFileToZip(file.getInputStream());
         InputStream zipFileInputStream = file.getInputStream();//test
@@ -146,7 +145,7 @@
                        d.setIsTest(jsonObject.getInteger("isTest"));
                        d.setMachineCode(jsonObject.getString("machineCode"));
                        d.setNcNodeId(jsonObject.getLong("ncNodeId"));
                        d.setPartNo(jsonObject.getString("partNo"));
                        d.setDrawingNo(jsonObject.getString("drawingNo"));
                        d.setProcessEdition(jsonObject.getString("processEdition"));

                        fileDataMap.put(d.getName(),d);
@@ -239,25 +238,25 @@
                     JSONArray jsonArray = JSONArray.parseArray(jsonStr);
                     for(int i=0;i<jsonArray.size();i++){
                        JSONObject jsonObject = jsonArray.getJSONObject(i);
                        NcProgram d = new NcProgram();
                        d.setId(jsonObject.getLong("id"));
                        d.setName(jsonObject.getString("name"));
                        NcProgram prog = new NcProgram();
                        prog.setId(jsonObject.getLong("id"));
                        prog.setName(jsonObject.getString("name"));

                        d.setCode(jsonObject.getString("code"));
                        d.setDescription(jsonObject.getString("description"));
                        d.setCategory(jsonObject.getString("category"));
                        d.setBindNcNodeId(jsonObject.getLong("bindNcNodeId"));
                        d.setIsLastEdition(jsonObject.getInteger("isLastEdition"));
                        d.setIsLocked(jsonObject.getInteger("isLocked"));
                        d.setIsTest(jsonObject.getInteger("isTest"));
                        d.setMachineCode(jsonObject.getString("machineCode"));
                        d.setNcNodeId(jsonObject.getLong("ncNodeId"));
                        d.setPartNo(jsonObject.getString("partNo"));
                        d.setProcessEdition(jsonObject.getString("processEdition"));
                        prog.setCode(jsonObject.getString("code"));
                        prog.setDescription(jsonObject.getString("description"));
                        prog.setCategory(jsonObject.getString("category"));
                        prog.setBindNcNodeId(jsonObject.getLong("bindNcNodeId"));
                        prog.setIsLastEdition(jsonObject.getInteger("isLastEdition"));
                        prog.setIsLocked(jsonObject.getInteger("isLocked"));
                        prog.setIsTest(jsonObject.getInteger("isTest"));
                        prog.setMachineCode(jsonObject.getString("machineCode"));
                        prog.setNcNodeId(jsonObject.getLong("ncNodeId"));
                        prog.setDrawingNo(jsonObject.getString("drawingNo"));
                        prog.setProcessEdition(jsonObject.getString("processEdition"));

                        setBaseProperties(d,jsonObject);
                        setBaseProperties(prog,jsonObject);

                        progList.add(d);
                        progList.add(prog);
                     }

                  }
@@ -273,7 +272,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"));
@@ -297,6 +296,7 @@
                        record.setUserNickname(jsonObject.getString("userNickname"));
                        record.setOperateResult(jsonObject.getString("operateResult"));
                        record.setOperateTime(jsonObject.getDate("operateTime"));
                        record.setComment(jsonObject.getString("comment"));
                        setBaseProperties(record,jsonObject);

                        recordList.add(record);