ubcs.git - Gitblit

			@@ -6,13 +6,11 @@
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.google.protobuf.ServiceException;
			import com.vci.ubcs.code.applyjtcodeservice.entity.DockingPreAttrMapping;
			import com.vci.ubcs.code.applyjtcodeservice.feign.IMdmInterJtClient;
			import com.vci.ubcs.code.applyjtcodeservice.vo.DockingPreAttrMappingVO;
			import com.vci.ubcs.code.bo.AttributeValue;
			import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
			import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
			import com.vci.ubcs.code.constant.MdmEngineConstant;
			import com.vci.ubcs.code.dto.*;
			import com.vci.ubcs.code.entity.CodeAllCode;
			import com.vci.ubcs.code.enumpack.CodeDefaultLC;
			@@ -71,6 +69,7 @@
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.CollectionUtils;
			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletRequest;
			import java.beans.BeanInfo;
			import java.beans.Introspector;
			import java.beans.PropertyDescriptor;
			@@ -88,7 +87,6 @@
			import java.util.concurrent.CopyOnWriteArrayList;
			import java.util.concurrent.CopyOnWriteArraySet;
			import java.util.concurrent.atomic.AtomicBoolean;
			import java.util.concurrent.atomic.AtomicReference;
			import java.util.stream.Collectors;

			import static com.alibaba.druid.util.FnvHash.Constants.LIMIT;
			@@ -199,9 +197,9 @@
			private SaveLogUtil saveLogUtil;

			/**
			* 导出的十万条
			* 客户现场excel为老版本，导出的总数限制为65535
			*/
			public static final int EXPORT_LIMIT = 100000;
			public static final int EXPORT_LIMIT = 65535;

			/**
			* 批量申请：选取选中分类下的所有模板关键属性，相似属性，必填属性，写入execl中
			@@ -612,6 +610,7 @@
			ExcelUtil.writeDataToFile(excelName,eo);
			return excelName;
			}

			/**
			* 获取码段宽度
			* @param codeClassifyOid
			@@ -1274,6 +1273,7 @@
			throw e;
			}
			}

			/**
			* 导入批量编辑数据
			*
			@@ -1282,6 +1282,7 @@
			* @param file excel文件的信息
			* @return 有错误信息的excel
			*/
			@Transactional
			@Override
			public CodeImProtRusultVO batchImportEdit(String codeClassifyOid, String classifyAttr,File file) throws Throwable{
			VciBaseUtil.alertNotNull(codeClassifyOid,"分类的主键");
			@@ -1328,7 +1329,7 @@
			titleRowData.remove(titleRowData.size()-1);
			templateVO= templateVOList.get(0);
			}catch (Throwable e){
			throw new VciBaseException(e.getMessage());
			throw new ServiceException(e.getMessage());
			}

			CodeClassifyTemplateVO finalTemplateVO = templateVO;
			@@ -1355,23 +1356,13 @@
			//我们使用和业务类型的来查询
			List<Map> cbosB = commonsMapper.selectBySql(sqlBO.getSqlUnPage());
			if(cbosB.size() == 0){
			throw new ServiceException("编码："+ sheetRowData.getData().get(0) + ",未能查询到相关数据。");
			throw new ServiceException("编码："+ sheetRowData.getData().get(0) + ",未能查询到相关数据。");
			}
			excelToCboEdit(fieldIndexMap, sheetRowData, orderDTO, cbosB.get(0));
			orderDTO.setCopyFromVersion(orderDTO.getOid());
			orderDTO.setOid(null);
			try {
			mdmEngineService.upSaveCode(orderDTO);
			List<Map> newCbos = commonsMapper.selectBySql(sqlBO.getSqlUnPage());
			//对码值表进行处理替换创建数据的oid
			QueryWrapper<CodeAllCode> wrapper = new QueryWrapper<>();
			wrapper.eq("CREATECODEOID",orderDTO.getCopyFromVersion());
			List<CodeAllCode> codeAllCodes = codeAllCodeService.selectByWrapper(wrapper);
			codeAllCodes.get(0).setCreateCodeOid(newCbos.get(0).get("OID").toString());
			codeAllCodes.get(0).setLastModifyTime(new Date());
			codeAllCodes.get(0).setTs(new Date());
			codeAllCodes.get(0).setLastModifier(AuthUtil.getUser().getUserName());
			codeAllCodeService.updateBatchById(codeAllCodes);
			} catch (Throwable e) {
			log.error("批量产生编码的时候出错了", e);
			errorMap.put(sheetRowData.getRowIndex(), ";系统错误，存储数据的时候出错了:"+e.getMessage());
			@@ -1836,10 +1827,10 @@
			tableName = VciBaseUtil.getTableName(btmTypeId);
			}

			String countSql = "select count(*) from " + tableName +" where 1=1" +
			String countSql = "select count() from (select FROM " + tableName +" where 1=1" +
			" and lastr = '1'" +
			" and lastv='1'" +
			" and codeclsfpath like '%" + exportAttrDTO.getCodeClassifyOid() + "%'";
			" and codeclsfpath like '%" + exportAttrDTO.getCodeClassifyOid() + "%' {}";

			//先查询总数
			int total = 0;
			@@ -1853,8 +1844,7 @@
			thisPage.setSort(exportAttrDTO.getSort());
			thisPage.setOrder(exportAttrDTO.getOrder());
			thisPage.addDefaultDesc("createTime");

			total += commonsMapper.queryCountBySql(countSql);
			total += commonsMapper.queryCountBySql(StringUtil.format(countSql," limit " + exportAttrDTO.getLimit() +" offset "+ i +")subquery;"));
			}
			}else{
			total = commonsMapper.queryCountBySql(countSql);
			@@ -2119,7 +2109,8 @@
			}).collect(Collectors.toList());
			List<ClientBusinessObject> finalNeedSaveCboList = needSaveCboList;
			Map<String, CodeRuleVO> finalRuleVOMap = ruleVOMap;
			ruleRowIndexMap.keySet().parallelStream().forEach(ruleOid -> {
			// TODO：多线程流套多线程流，有坑，我把这儿改了
			ruleRowIndexMap.keySet().stream().forEach(ruleOid -> {
			List <BaseModel>dataCBOList=new CopyOnWriteArrayList<>();
			List<String> rowIndexList = ruleRowIndexMap.get(ruleOid);
			List<ClientBusinessObject> thisCbos = needSaveCboList.stream().filter(cbo -> rowIndexList.contains(cbo.getAttributeValue(IMPORT_ROW_INDEX)) && !errorMap.containsKey(cbo.getAttributeValue(IMPORT_ROW_INDEX))).collect(Collectors.toList());
			@@ -2501,7 +2492,6 @@
			resultDataObjectDetailDO.setErrorid("0");
			}
			resultDataObjectDetailDO.setId(sourceOid);

			resultDataObjectDetailDO.setMsg(msg);
			resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
			//处理传送的数据中关键属性重复的，直接拿到已经申请到编码的数据编码直接将赋给关键属性重复的数据
			@@ -3347,7 +3337,7 @@
			String oid=rowData.getOid();
			String rowNumber=rowData.getRowIndex();
			ClientBusinessObject cbo = new ClientBusinessObject();
			DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
			DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId(),null);
			rowData.getData().forEach((index,value)->{
			String field = fieldIndexMap.get(index);
			if(StringUtils.isBlank(field)){
			@@ -3453,7 +3443,7 @@
			String fullPath = getFullPath(classifyFullInfo);
			codeImprotDataVO.getDatas().stream().forEach(rowData -> {
			ClientBusinessObject cbo=new ClientBusinessObject();
			DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
			DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId(),null);
			rowData.forEach((field,value)->{
			try {
			cbo.setAttributeValueWithNoCheck(field,value);
			@@ -3507,7 +3497,7 @@
			String fullPath,boolean newCode){
			rowDataList.stream().forEach(rowData -> {
			ClientBusinessObject cbo=new ClientBusinessObject();
			DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
			DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId(),null);
			rowData.getData().forEach((index,value)->{
			String field = fieldIndexMap.get(index);
			if (StringUtils.isBlank(field)) {
			@@ -4270,6 +4260,7 @@
			Map<String,List<BaseModel>> indexTODataMap=new ConcurrentHashMap<>();
			// 查询不需要参与关键属性校验的除自己以外的所有分类oid
			final String isParticipateCheckOids = classifyService.selectLeafByParentClassifyOid(classifyFullInfo.getTopClassifyVO().getOid(), classifyFullInfo.getCurrentClassifyVO().getOid());
			final HttpServletRequest request = org.springblade.core.tool.utils.WebUtil.getRequest();
			List<ClientBusinessObject> repeatDataMap = cboList.parallelStream().filter(cbo -> {
			//每行都得查询.如果其中出现了错误，我们就直接抛出异常，其余的显示
			//VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
			@@ -4295,7 +4286,7 @@
			List<BaseModel> newCboList = new ArrayList<>();
			newDataList.stream().forEach(stringStringMap -> {
			BaseModel baseModel=new BaseModel();
			DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(stringStringMap,baseModel);
			DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(stringStringMap,baseModel,request);
			baseModel.setData(stringStringMap);
			newCboList.add(baseModel);
			});
			@@ -4521,7 +4512,7 @@
			List<ClientBusinessObject> clientBusinessObjectList=new ArrayList<>();
			oldDataMap.stream().forEach(dataMap->{
			ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
			DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject);
			DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject,null);
			for (String key:dataMap.keySet()){
			Object value= dataMap.getOrDefault(key,"");
			clientBusinessObject.setAttributeValue(key.toLowerCase(Locale.ROOT),value==null?"":value.toString());