yangys
2025-08-12 8ede6183253248e497d391a0902bb5d41181b3bf
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
@@ -2,6 +2,7 @@
package org.springblade.mdm.program.service;
import com.alibaba.fastjson.JSONObject;
import io.netty.util.internal.StringUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -23,6 +24,7 @@
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.utils.EntityUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +65,13 @@
    */
   public List<DncSendBackData> dncSendBackUpload(MultipartFile file) {
      List<DncSendBackData> list;
      if(file == null || file.isEmpty()){
         throw new ServiceException("文件为空");
      }
      if(!StringUtils.endsWith(file.getOriginalFilename(),".zip")){
         throw new ServiceException("文件必须为zip包 ");
      }
      try {
         BladeFile bfile = ossTemplate.putFile(file);//上传,供后续入库使用
         //设置一个缓存,2小时过期
@@ -103,9 +112,10 @@
               //目录,才是程序包,
               //查询数据库,对应上才能确认时有效的程序包
               String packageName = StringUtils.removeEnd(entryName,"/");
               NcNode programPackageNode = ncNodeService.getLastEditionProgramPackage(packageName);
               //List<NcNode> pkgList = ncNodeService.lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE).eq(NcNode::getName, packageName).eq(NcNode::getIsLastEdition,1).list();
               //if(!pkgList.isEmpty()) {
               NcNode programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);
               NcNode curedProgramPkg = ncNodeService.getLastEditionCuredProgramPackage(packageName);
               if(programPackageNode!=null && curedProgramPkg == null) {//无固化程序,才放入列表
                  //NcNode programPackageNode = pkgList.get(0);
                  progData.setId(programPackageNode.getId());
                  progData.setProgramName(packageName);
@@ -113,7 +123,8 @@
                  progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));
                  progData.setProgramNo(programPackageNode.getProgramNo());
                  list.add(progData);
               //}
               }
            }
         }
@@ -180,7 +191,11 @@
         for(String dir : dirList){
            String programPackageName = StringUtils.removeEnd(dir,"/");
            NcNode oriProgramPkg = this.ncNodeService.getLastEditionProgramPackage(programPackageName);
            NcNode oriProgramPkg = this.ncNodeService.getLastEditionTryingProgramPackage(programPackageName);
            NcNode curedProgramPkg = ncNodeService.getLastEditionCuredProgramPackage(programPackageName);
            if(curedProgramPkg != null){
               throw new ServiceException(programPackageName+"已经固化,请勿重复入库。");
            }
            if(oriProgramPkg == null){
               log.warn("文件夹未发现匹配的程序包名{}",dir);
               continue;
@@ -191,9 +206,10 @@
            if(active){
               throw new ServiceException(programPackageName+"正在审批中,请勿重复入库。");
            }
            /*
            if(oriProgramPkg.hasCured()){
               throw new ServiceException(programPackageName+"已经固化,请勿重复入库。");
            }
            }*/
            if(!programPackageIdList.contains(oriProgramPkg.getId())){
               //不在勾选的范围内
@@ -202,7 +218,7 @@
            }
            NcNode newProgramPkg = new NcNode();
            BeanUtils.copyProperties(oriProgramPkg, newProgramPkg);
            clearBaseProperties(newProgramPkg);
            EntityUtil.clearBaseProperties(newProgramPkg);
            newProgramPkg.setIsLastEdition(1);
            ncNodeService.save(newProgramPkg);
            newProgramPackageNodeList.add(newProgramPkg);
@@ -228,7 +244,7 @@
                  NcNode newProgramNode = new NcNode();
                  BeanUtils.copyProperties(oldProgramNode, newProgramNode);
                  clearBaseProperties(newProgramNode);
                  EntityUtil.clearBaseProperties(newProgramNode);
                  newProgramNode.setIsLastEdition(1);
                  newProgramNode.setParentId(newProgramPkg.getId());
                  newProgramNode.setParentIds(newProgramPkg.getParentIds()+","+newProgramPkg.getId());
@@ -237,10 +253,10 @@
                  FlowProgramFile oldFlowFile = flowProgramFileService.getById(newProgramNode.getFlowProgramFileId());
                  FlowProgramFile newFlowFile = new FlowProgramFile();//TODO
                  FlowProgramFile newFlowFile = new FlowProgramFile();
                  BeanUtils.copyProperties(oldFlowFile, newFlowFile);
                  newFlowFile.setProcessInstanceId(null);
                  clearBaseProperties(newFlowFile);
                  EntityUtil.clearBaseProperties(newFlowFile);
                  try {
                     InputStream ins = zipFile.getInputStream(zipFile.getEntry(entryName));
@@ -252,9 +268,11 @@
                  newProgramNode.setFlowProgramFile(newFlowFile);
                  newProgramNode.setVersionNumber(oldProgramNode.genNewVersionNumber());
                  newProgramNodes.add(newProgramNode);
                  oldProgramNode.setIsLastEdition(0);
                  oldProgramNode.setIsLocked(1);
                  ncNodeService.updateById(oldProgramNode);
                  //旧节点处理,咋办?如果导出工控网 重复导出呢?,isLastEdition不用设置了,因为 程序包节点 是新的
                  //TODO 待验证
                  //oldProgramNode.setIsLastEdition(原来是0);
                  //oldProgramNode.setIsLocked(1);
                  //ncNodeService.updateById(oldProgramNode);
               }
            });
@@ -288,7 +306,7 @@
      entity.setCreateUser(jsonObject.getLong("createUser"));
      entity.setUpdateUser(jsonObject.getLong("updateUser"));
   }
   /*
   void clearBaseProperties(BizEntity entity){
      entity.setId(null);
      entity.setCreateTime(null);
@@ -296,5 +314,5 @@
      entity.setStatus(null);
      entity.setCreateUser(null);
      entity.setUpdateUser(null);
   }
   }*/
}