ubcs.git - Gitblit

			@@ -3,6 +3,7 @@
			import com.alibaba.fastjson.JSONObject;
			import com.alibaba.nacos.common.utils.StringUtils;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.google.protobuf.ServiceException;
			import com.vci.ubcs.code.applyjtcodeservice.feign.IMdmInterJtClient;
			import com.vci.ubcs.code.bo.AttributeValue;
			import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
			@@ -96,8 +97,12 @@
			@Value("${batchadd.exportattr.type:基本信息}")
			public String BATCHADD_EXCEPORT_ATTR_TYPE;

			@Value("${batchadd.redis.time:6000000}")

			public int BATCHADD_REDIS_TIME;

			@Value("${batchadd.import_data_limit:5001}")
			private Integer IMPORT_DATA_LIMIT;

			/**
			* 主题库分类的服务
			*/
			@@ -398,9 +403,9 @@
			LinkedList<WriteExcelData> excelDataList = new LinkedList<>();
			Workbook workbook = new HSSFWorkbook();
			if(isHistory){
			excelDataList.add(new WriteExcelData(0,0,"分类路径"));
			excelDataList.add(new WriteExcelData(0,1,"码段宽度"));
			excelDataList.add(new WriteExcelData(0,2,!CollectionUtils.isEmpty(idAttrVOList)?idAttrVOList.get(0).getName():"企业编码"));
			excelDataList.add(new WriteExcelData(0,0,"分类路径",""));
			excelDataList.add(new WriteExcelData(0,1,"码段宽度",""));
			excelDataList.add(new WriteExcelData(0,2,!CollectionUtils.isEmpty(idAttrVOList)?idAttrVOList.get(0).getName():"企业编码",idAttrVOList.get(0).getId()));
			}
			for (int i = 0; i < templateAttrVOS.size(); i++) {
			CodeClassifyTemplateAttrVO attrVO = templateAttrVOS.get(i);
			@@ -408,7 +413,7 @@
			Object text = attrVO.getName();
			text = exportKeyAndRequired(workbook,attrVO,text);
			int colIndex = (isHistory?3:0) + i;
			WriteExcelData excelData = new WriteExcelData(0, colIndex, text);
			WriteExcelData excelData = new WriteExcelData(0, colIndex, text,attrVO.getId());
			if(StringUtils.isNotBlank(attrVO.getCodeDateFormat())
			\|\| VciFieldTypeEnum.VTDateTime.name().equalsIgnoreCase(attrVO.getAttributeDataType())
			\|\| VciFieldTypeEnum.VTDate.name().equalsIgnoreCase(attrVO.getAttributeDataType())
			@@ -794,6 +799,10 @@
			\|\| sheetDataSetList.get(i).getRowData().size() < 1) {
			continue;
			}
			// 单次导入数量限制
			if(sheetDataSetList.get(i).getRowData().size() > IMPORT_DATA_LIMIT){
			throw new ServiceException("为了保证系统的稳定性，请一次不要导入超过"+IMPORT_DATA_LIMIT+"条的数据");
			}
			//历史导入的时候不处理编码
			//----逻辑内容----
			//1. 分类的路径可以在页面上选择是分类编号还是分类的名称
			@@ -847,7 +856,7 @@
			String idFieldName = attrVOS.stream().filter(s -> VciQueryWrapperForDO.ID_FIELD.equalsIgnoreCase(s.getId())).findFirst().orElseGet(() -> new CodeClassifyTemplateAttrVO()).getName();
			getFieldIndexMap(titleRowData, attrNameIdMap, fieldIndexMap);
			//先不用管属性是否都存在，先转换一下数据
			List<ClientBusinessObject> cboList = new ArrayList<>();
			List<ClientBusinessObject> cboList = new CopyOnWriteArrayList<>();
			String fullPath = getFullPath(classifyFullInfo);
			//我们需要获取到所有的下级分类的oid的路径，因为后面需要
			Map<String/主键/, String/路径/> childOidPathMap = getChildClassifyPathMap(classifyFullInfo, fullPath);
			@@ -933,7 +942,8 @@
			if (CollectionUtils.isEmpty(ruleOidMap.values())) {
			throw new VciBaseException("导入的数据所选择的分类都没有设置编码规则");
			}
			Map<String, CodeRuleVO> ruleVOMap = ruleService.listCodeRuleByIds(ruleOidMap.values(), true).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
			// TODO: 该用oid查询规则的，别用id
			Map<String, CodeRuleVO> ruleVOMap = ruleService.listCodeRuleByOids(ruleOidMap.values()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
			//校验编码规则和码段是否正确
			Map<String, List<String>> ruleRowIndexMap = new ConcurrentHashMap<>();
			checkSecLengthInHistory(cboList, classifyVOMap, ruleVOMap, ruleOidMap, errorMap, ruleRowIndexMap);
			@@ -1028,7 +1038,7 @@
			//VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
			List<String> rowIndexList = ruleRowIndexMap.get(ruleOid);
			List<ClientBusinessObject> thisCbos = finalNeedSaveCboList.stream().filter(cbo -> rowIndexList.contains(cbo.getAttributeValue(IMPORT_ROW_INDEX)) && !errorMap.containsKey(cbo.getAttributeValue(IMPORT_ROW_INDEX))).collect(Collectors.toList());
			List<BaseModel> dataCBOList=new ArrayList<>();
			List<BaseModel> dataCBOList=new CopyOnWriteArrayList<>();
			thisCbos.stream().forEach(clientBusinessObject -> {
			BaseModel baseModel=new BaseModel();
			BeanUtil.convert(clientBusinessObject,baseModel);
			@@ -1045,7 +1055,7 @@
			log.error("批量产生编码的时候出错了", e);
			thisCbos.stream().forEach(cbo -> {
			String rowIndex = cbo.getAttributeValue(IMPORT_ROW_INDEX);
			errorMap.put(rowIndex, errorMap.getOrDefault(rowIndex, "") + ";系统错误，存储数据的时候出错了");
			errorMap.put(rowIndex, errorMap.getOrDefault(rowIndex, "") + ";系统错误，存储数据的时候出错了:"+e.getMessage());
			});

			}
			@@ -1139,7 +1149,6 @@
			* @param currentTemplateVO
			* @param templateColumnVOMap
			*/

			private void createTemplate(CodeClassifyTemplateVO currentTemplateVO,Map<String,List<ColumnVO>>templateColumnVOMap){

			List<CodeClassifyTemplateAttrVO> templateAttrVOS = currentTemplateVO.getAttributes().stream().filter(s ->
			@@ -1529,7 +1538,6 @@
			total += commonsMapper.queryCountBySql(countSql);
			}
			}else{

			total = commonsMapper.queryCountBySql(countSql);
			}
			List<String> selectFieldList = new ArrayList<>();
			@@ -1750,7 +1758,8 @@
			Map<String/分类主键/, String/规则主键/> ruleOidMap = new ConcurrentHashMap<String, String>();
			List<String> unExistRuleClassifyOidList = new CopyOnWriteArrayList<>();
			checkRuleOidInHistory(classifyVOMap, ruleOidMap, unExistRuleClassifyOidList);
			ruleVOMap = ruleService.listCodeRuleByIds(ruleOidMap.values(), true).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
			// TODO 改用oid查询的，这儿不该用id
			ruleVOMap = ruleService.listCodeRuleByOids(ruleOidMap.values()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));

			checkSecLengthInHistory(cboList, classifyVOMap, ruleVOMap, ruleOidMap, errorMap, ruleRowIndexMap);
			}
			@@ -1956,7 +1965,6 @@

			//都转换完了。需要批量检查
			//如果出错了，我们依然执行有效的数据，无效的数据写回到excel中


			Map<String,String> errorKeyMap=new HashMap<>();
			//1.分类注入
			@@ -2946,7 +2954,7 @@
			for (int j = 0; j < ruleVO.getSecVOList().size(); j++) {
			CodeBasicSecVO secVO = ruleVO.getSecVOList().get(j);
			String length= secValues[j];
			if(StringUtils.isNotBlank(secVO.getCodeSecLength())&&VciBaseUtil.getInt(length)>VciBaseUtil.getInt(secVO.getCodeSecLength())){
			if(StringUtils.isNotBlank(secVO.getCodeSecLength())&&VciBaseUtil.getInt(length)>(VciBaseUtil.getInt(secVO.getCodeSecLength())+((secVO.getPrefixCode()+secVO.getSuffixCode()).length()))){
			errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";码段宽度与系统中的编码规则不同" );
			fined = true;
			break;
			@@ -3139,6 +3147,7 @@
			});

			}

			/**
			* excel转换为cbo的对象
			* @param classifyFullInfo 分类的全部信息
			@@ -3156,7 +3165,7 @@
			ClientBusinessObject cbo=new ClientBusinessObject();
			DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
			rowData.getData().forEach((index,value)->{
			String field = fieldIndexMap.get(index);
			String field = fieldIndexMap.get(index);
			if (StringUtils.isBlank(field)) {
			throw new VciBaseException("第" + (index + 1) + "列的标题在系统中不存在");
			}
			@@ -3513,6 +3522,7 @@
			});
			}
			}

			/***
			* 校验分类对应的模板信息
			* @param titleRowData
			@@ -3596,6 +3606,7 @@
			}
			return codeClassifyTemplateVOList ;
			}

			/**
			* 从属性上获取参照的内容
			* @param attrVO 属性的信息
			@@ -3718,6 +3729,7 @@
			}
			}
			}

			/**
			* 处理分类注入
			* @param attrVOS 模板属性
			@@ -3807,7 +3819,9 @@
			//2.判断关键属性在系统里是否重复
			//因为数据量很大，所以得想办法并行
			//SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
			Map<String,List<BaseModel>> indexTODataMap=new HashMap<>();
			Map<String,List<BaseModel>> indexTODataMap=new ConcurrentHashMap<>();
			// 查询不需要参与关键属性校验的除自己以外的所有分类oid
			String isParticipateCheckOids = classifyService.selectLeafByParentClassifyOid(classifyFullInfo.getTopClassifyVO().getOid(), classifyFullInfo.getCurrentClassifyVO().getOid());
			List<ClientBusinessObject> repeatDataMap = cboList.parallelStream().filter(cbo -> {
			//每行都得查询.如果其中出现了错误，我们就直接抛出异常，其余的显示
			//VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
			@@ -3821,6 +3835,10 @@
			engineService.wrapperKeyAttrConditionMap(value, keyRuleVO, attrId, trim, ignoreCase, ignoreWidth, trimAll, conditionMap);
			});
			if (!CollectionUtils.isEmpty(ketAttrMap)) {
			// 添加不参与关键属性校验的分类oid判断
			if(Func.isNotBlank(isParticipateCheckOids)){
			conditionMap.put("t.codeclsfid",QueryOptionConstant.NOTIN+isParticipateCheckOids);
			}
			CodeTemplateAttrSqlBO sqlBO = engineService.getSqlByTemplateVO(classifyFullInfo.getTopClassifyVO().getBtmTypeId(), templateVO, conditionMap, null);
			boolean isKeyCheck= commonsMapper.queryCountBySql(sqlBO.getSqlCount()) > 0;
			if(isKeyCheck){
			@@ -3864,7 +3882,7 @@
			if(StringUtils.isBlank(classifyPath)){
			classifyPath = "#current#";
			}
			if ( !pathMap.containsKey(classifyPath)) {
			if (!pathMap.containsKey(classifyPath)) {
			String row_index = cbo.getAttributeValue(IMPORT_ROW_INDEX);
			errorMap.put(row_index,errorMap.getOrDefault(row_index,"") + ";分类路径不存在");
			} else {
			@@ -4004,7 +4022,7 @@
			List<String>newOidList=new ArrayList<>();
			newOidList.add(oid);
			if(keyAttrOkOidTORepeatOidMap.containsKey(okOid)){
			List<String> oldOidList= keyAttrOkOidTORepeatOidMap.get(okOid);
			List<String> oldOidList = keyAttrOkOidTORepeatOidMap.get(okOid);
			newOidList.addAll(oldOidList);

			}
			@@ -4044,6 +4062,7 @@
			}
			}
			}

			private List<ClientBusinessObject> ChangeMapTOClientBusinessObjects(List<Map<String,String>> oldDataMap){
			List<ClientBusinessObject> clientBusinessObjectList=new ArrayList<>();
			oldDataMap.stream().forEach(dataMap->{