Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java

@@ -479,6 +479,10 @@
      );
      //属性英文名称校验（判空、系统中判重、是否关键字、是否合规等）
      checkName(osAttributeDTO.getId());
      //检查属性名是否已存在与系统中
      if(platformClientUtil.getAttributeService().checkRowIsExists(osAttributeDTO.getId())){
         throw new PLException("500",new String[]{"属性名称【" + osAttributeDTO.getId() + "】在系统中已存在!"});
      }
      //检查默认值与属性类型是否匹配
      checkDefValue(osAttributeDTO);
      //osAttributeDTO.setOid(VciBaseUtil.getPk().toUpperCase(Locale.ROOT));
@@ -693,9 +697,9 @@
         throw new PLException("500",new String[]{"属性名无效,原因：属性名是数据库关键字!"});
      }
      //检查属性名是否已存在与系统中
      if(platformClientUtil.getAttributeService().checkRowIsExists(abName)){
      /*if(platformClientUtil.getAttributeService().checkRowIsExists(abName)){
         throw new PLException("500",new String[]{"属性名称【" + abName + "】在系统中已存在!"});
      }
      }*/
   }

   /**
@@ -997,10 +1001,12 @@
   /**
    * 导入属性
    * @param file
    * @param isContinue 系统中出现重复是否跳过报错继续执行
    * @return
    * @throws Exception
    */
   @Override
   public BaseResult importAttributes(File file) throws Exception{
   public BaseResult importAttributes(File file, boolean isContinue) throws Exception{
      VciBaseUtil.alertNotNull(file,"excel文件");
      if(!file.exists()){
         throw new VciBaseException("导入的excel文件不存在,{0}",new String[]{file.getPath()});
@@ -1017,13 +1023,29 @@
         List<OsAttributeDTO> dtoList = new ArrayList<>();
         //当前excel中是否重复用的判重Map:（key：判重属性，value：行号）
         Map<String, String> excelReapeat = new HashMap<>();
         poList.stream().forEach(osAttributePO -> {
         for (int i = 0; i < poList.size(); i++) {
            OsAttributePO osAttributePO = poList.get(i);
            if(Func.isBlank(osAttributePO.getId())){//属性名判空
               throw new VciBaseException("第【"+osAttributePO.getRowIndex()+"】行，attrnameerror");
            }else if(Func.isBlank(osAttributePO.getAttributeDataType())){
               throw new VciBaseException("第【"+osAttributePO.getRowIndex()+"】行，typeerror");
            }else if(excelReapeat.containsKey(osAttributePO.getId())){//属性名表格中判重
               throw new VciBaseException("第【"+excelReapeat.get(osAttributePO.getId())+"】行和第【"+osAttributePO.getRowIndex()+"】行数据，属性名重复");
            }else {
               try {
                  if(platformClientUtil.getAttributeService().checkRowIsExists(osAttributePO.getId())){
                     throw new PLException("500",new String[]{"属性名称【" + osAttributePO.getId() + "】在系统中已存在!"});
                  }
               } catch (PLException e) {
                  e.printStackTrace();
                  String errorMsg = "与系统中属性名查重时出现错误,原因：" + VciBaseUtil.getExceptionMessage(e);
                  logger.error(errorMsg);
                  //是否跳过当期重复数据
                  if(isContinue){
                     continue;
                  }
                  throw new VciBaseException(errorMsg);
               }
            }
            //属性名校验
            try {
@@ -1076,7 +1098,7 @@
               throw new VciBaseException(VciBaseUtil.getExceptionMessage(e));
            }
            dtoList.add(osAttributeDTO);
         });
         }
         //执行保存操作
         dtoList.stream().forEach(dto->{
            try {
@@ -1091,7 +1113,7 @@
         });
      }catch (Exception e){
         if(logger.isErrorEnabled()){
            logger.error("读取excel内容时或保存用户信息时出现了错误，具体原因：",VciBaseUtil.getExceptionMessage(e));
            logger.error("读取excel内容时或保存属性时出现了错误，具体原因：",VciBaseUtil.getExceptionMessage(e));
         }
         e.printStackTrace();
         return BaseResult.fail(VciBaseUtil.getExceptionMessage(e),new String[]{},e);