增补上传的文件类型字段

yangys

2025-08-13 c6b49750da5d19383e74e644f4fa1734138aff89

 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小时过期
@@ -106,7 +115,7 @@
               NcNode programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);
               NcNode curedProgramPkg = ncNodeService.getLastEditionCuredProgramPackage(packageName);

               if(programPackageNode!=null && curedProgramPkg != null) {//无固化程序，才放入列表
               if(programPackageNode!=null && curedProgramPkg == null) {//无固化程序，才放入列表
                  //NcNode programPackageNode = pkgList.get(0);
                  progData.setId(programPackageNode.getId());
                  progData.setProgramName(packageName);
@@ -209,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);
@@ -235,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());
@@ -244,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));
@@ -259,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);
               }
            });

@@ -295,7 +306,7 @@
      entity.setCreateUser(jsonObject.getLong("createUser"));
      entity.setUpdateUser(jsonObject.getLong("updateUser"));
   }

   /*
   void clearBaseProperties(BizEntity entity){
      entity.setId(null);
      entity.setCreateTime(null);
@@ -303,5 +314,5 @@
      entity.setStatus(null);
      entity.setCreateUser(null);
      entity.setUpdateUser(null);
   }
   }*/
}