提交代码

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/ControllerUtil.java

@@ -234,7 +234,6 @@

    public static void downloadErrorFile(HttpServletResponse response, String uuid) throws IOException {
        String errorFile = (String)tempFileForDownloadMap.getOrDefault(uuid, "");

        try {
            if (StringUtil.isNotBlank(errorFile)) {
                writeFileToResponse(response, new File(errorFile), (String)null, true, "application/msexcel");

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java

@@ -23,6 +23,7 @@
import com.vci.ubcs.code.mapper.CodeClassifyMapper;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeImProtRusultVO;
import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
@@ -37,6 +38,8 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j;
import lombok.extern.log4j.Log4j2;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -68,6 +71,7 @@
@AllArgsConstructor
@RequestMapping("/codeClassify")
@Api(value = "主题库定义表", tags = "主题库定义表接口")
@Log4j2
public class CodeClassifyController extends BladeController {

    private final ICodeClassifyService codeClassifyService;
@@ -279,12 +283,16 @@
            codeClassifyService.importClassify(file1);
            return R.success("导入成功！");
        }catch (Throwable e) {
            log.error("导入错误",e);
            String errorFile = LocalFileUtil.getDefaultTempFolder() + File.separator + "错误信息.txt";
            LocalFileUtil.writeContentToFile(LangBaseUtil.getErrorMsg(e),errorFile);
            //放到map里
//            R result = R.fail("导入失败");
//            result.(ControllerUtil.putErrorFile(errorFile));
            return R.data(400,errorFile,"导入失败");
            CodeImProtRusultVO codeImProtRusultVO =new CodeImProtRusultVO();
            codeImProtRusultVO.setRedisUuid("");
            codeImProtRusultVO.setFileOid(ControllerUtil.putErrorFile(errorFile));
            codeImProtRusultVO.setFilePath(errorFile);
            R r = R.fail("导入失败");
            r.setData(codeImProtRusultVO);
            return r;
        }finally {
            file1.delete();
        }

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java

@@ -233,8 +233,6 @@
            codeImProtRusultVO.setFilePath(errorFile);
            R r = R.fail("导入失败");
            r.setData(codeImProtRusultVO);


            return r;
        }finally {
            file1.delete();

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java

@@ -213,7 +213,7 @@
                vo.setPkBtmType(btmType.getOid());
                vo.setAttrDataType(VciFieldTypeEnum.VTString.name());
                // 版本规则字段不能为空
                vo.setNullableFlag(false);
//                vo.setNullableFlag(false);
                vo.setAttributeLength(150);
                if (Arrays.asList("lastr","firstr","lastv","firstv","revisionseq","versionseq","revisionvalue","versionvalue").contains(id)){
                    vo.setAttributeLength(5);
@@ -234,7 +234,7 @@
                vo.setId(id);
                vo.setName(name);
                vo.setPkBtmType(btmType.getOid());
                vo.setNullableFlag(false);
//                vo.setNullableFlag(false);
                vo.setAttributeLength(50);
                vo.setAttrDataType(VciFieldTypeEnum.VTString.name());
                list.add(vo);
@@ -248,7 +248,7 @@
                vo.setId(id);
                vo.setName(name);
                vo.setPkBtmType(btmType.getOid());
                vo.setNullableFlag(false);
//                vo.setNullableFlag(false);
                vo.setAttributeLength(5);
                vo.setAttrDataType(VciFieldTypeEnum.VTInteger.name());
                list.add(vo);