ubcs.git - Gitblit

			@@ -2506,10 +2506,10 @@
			if (!CollectionUtils.isEmpty(newCboList)) {
			//处理关键属性查出多条的话，根据集成调用的当前分类代号取当前分类的码值。
			Map<String/编码/, BaseModel/重复编码数据/> classOidTOBaseModelMap = new HashMap<>();
			newCboList.stream().forEach(baseModel->{
			String codeclsfid=baseModel.getData().get(CODE_CLASSIFY_OID_FIELD.toUpperCase(Locale.ROOT));
			classOidTOBaseModelMap.put(codeclsfid,baseModel);
			});
			newCboList.stream().forEach(baseModel->{
			String codeclsfid=baseModel.getData().get(CODE_CLASSIFY_OID_FIELD.toLowerCase(Locale.ROOT));
			classOidTOBaseModelMap.put(codeclsfid,baseModel);
			});
			String codeclsfid= classifyFullInfo.getCurrentClassifyVO().getOid();
			if(classOidTOBaseModelMap.containsKey(codeclsfid)){
			BaseModel newCbo= classOidTOBaseModelMap.get(codeclsfid);
			@@ -2546,7 +2546,7 @@
			}
			}
			});
			//关键熟悉更改
			//关键属性更改
			if (!CollectionUtils.isEmpty(editBoList)) {
			engineService.updateBatchByBaseModel(classifyFullInfo.getTopClassifyVO().getBtmTypeId(),editBoList);//保存数据
			}
			@@ -2740,7 +2740,7 @@
			//cboOidMap.put("id", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(codeDataMap.keySet().toArray(new String[0])) + ")");
			String tableName ="";
			try {
			R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
			R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(codeClassifyVO.getBtmTypeId());
			if(!r.isSuccess()) {
			throw new Throwable(r.getMsg());
			}
			@@ -2782,6 +2782,7 @@
			}

			List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString());
			DefaultAttrAssimtUtil.mapToLowerCase(dataMapList,true);
			List<ClientBusinessObject> cboList= ChangeMapTOClientBusinessObjects(dataMapList);
			Map<String, ClientBusinessObject> codeSystemObjectMap = cboList.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
			Map<String, String> errorMap = new HashMap<>();
			@@ -2837,7 +2838,17 @@
			cbo.setDescription(StringUtils.isBlank(orderDTO.getDescription())?"":orderDTO.getDescription());
			cbo.setName(orderDTO.getName());
			try {
			cbo.setAttributeValueWithNoCheck("description", orderDTO.getDescription());
			//主要处理大小写问题，将data里面的数据的key都转为小写
			HashMap<String,String> lowerData = new HashMap<>();
			Iterator<Map.Entry<String, String>> iterator = cbo.getData().entrySet().iterator();
			while (iterator.hasNext()){
			Map.Entry<String, String> next = iterator.next();
			lowerData.put(next.getKey().toLowerCase(Locale.ROOT),next.getValue());
			}
			cbo.getData().clear();
			cbo.getData().putAll(lowerData);
			cbo.setAttributeValueWithNoCheck("description", (StringUtil.isNotBlank(orderDTO.getData()
			.get("description")) ? orderDTO.getData().get("description") : orderDTO.getDescription() ));
			// cbo.setAttributeValue("name", orderDTO.getName());
			// if(finalIsProcess){//在流程中不允许更改
			// errorMap.put(code,errorMap.getOrDefault(code, errorMap.getOrDefault(code,"")+";数据"+code+"在流程中，不允许更改!"));
			@@ -2900,7 +2911,7 @@

			List<CodeAllCode>newCodeAllCodeList= codeAllCodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getCreateCodeOid, cbo.getOid()));
			if (!CollectionUtils.isEmpty(newCodeAllCodeList)) {
			CodeAllCode codeCbo = codeAllCodeList.get(0);
			CodeAllCode codeCbo = newCodeAllCodeList.get(0);
			log.info("codeCbos code:" + codeCbo.getId());
			codeCbo.setLcStatus(status);
			codeAllCodeList.add(codeCbo);
			@@ -2938,7 +2949,7 @@
			engineService.updateBatchByBaseModel(classifyFullInfo.getTopClassifyVO().getBtmTypeId(),updateList);
			codeAllCodeService.saveOrUpdateBatch(codeAllCodeList);
			if(deleteList.size()>0) {
			commonsMapper.deleteByTaleAndOid(tableName, VciBaseUtil.array2String(deleteList.toArray(new String[]{})));
			commonsMapper.deleteByTaleAndOid(tableName, VciBaseUtil.toInSql(deleteList.toArray(new String[]{})));
			}
			//是否调用集团接口申请接口
			if(isCodeOrGroupCode){
			@@ -3613,6 +3624,11 @@
			rowDataList.stream().forEach(rowData -> {
			ClientBusinessObject cbo=new ClientBusinessObject();
			DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
			R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(classifyFullInfo.getTopClassifyVO().getBtmTypeId()));
			if(!listR.isSuccess() \|\| listR.getData().size() == 0){
			throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
			}
			cbo.setRevisionRule("".equals(listR.getData().get(0).getVersionRule())?"1":listR.getData().get(0).getVersionRule());
			rowData.getData().forEach((index,value)->{
			String field = fieldIndexMap.get(index);
			if (StringUtils.isBlank(field)) {
			@@ -3959,7 +3975,8 @@
			String sql = "select " + valueField + "," + showText.toLowerCase(Locale.ROOT) +" from " + table + " where " + showText + " in (%s)";
			valueCollections.stream().forEach(values->{
			List<Map<String,String>> dataMapList = commonsMapper.queryByOnlySqlForMap(String.format(sql, VciBaseUtil.toInSql(values.toArray(new String[0]))));
			List<ClientBusinessObject> cbos= ChangeMapTOClientBusinessObjects(dataMapList);
			DefaultAttrAssimtUtil.mapToLowerCase(dataMapList,true);
			List<ClientBusinessObject> cbos=ChangeMapTOClientBusinessObjects(dataMapList);
			if(!CollectionUtils.isEmpty(cbos)){
			valueOidTextMap.putAll(cbos.stream().collect(Collectors.toMap(s->s.getAttributeValue(valueField),t->t.getAttributeValue(showText))));
			}
			@@ -4328,7 +4345,7 @@
			} else {
			Map<String, String> classifyDataMap = VciBaseUtil.objectToMapString(classifyVO);
			String value = classifyDataMap.getOrDefault(attrVO.getClassifyInvokeAttr(), "");
			log.error("================================当前分类注入的value值为：==========================",value);
			// log.error("================================当前分类注入的value值为：==========================",value);
			cbo.setAttributeValue(attrId, value);
			}
			} catch (Throwable e) {
			@@ -4376,7 +4393,9 @@
			// 查询不需要参与关键属性校验的除自己以外的所有分类oid
			final String isParticipateCheckOids = classifyService.selectLeafByParentClassifyOid(classifyFullInfo.getTopClassifyVO().getOid(), classifyFullInfo.getCurrentClassifyVO().getOid());
			final BladeUser user = AuthUtil.getUser();
			List<ClientBusinessObject> repeatDataMap = cboList.parallelStream().filter(cbo -> {
			//cboList = new CopyOnWriteArrayList<>(cboList);
			// TODO:Thread limit exceeded replacing blocked 异常是这部分代码抛出的,所以暂时将parallelStream改成了stream
			List<ClientBusinessObject> repeatDataMap = cboList.stream().filter(cbo -> {
			//每行都得查询.如果其中出现了错误，我们就直接抛出异常，其余的显示
			//VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
			Map<String, String> conditionMap = new HashMap<>();
			@@ -4403,6 +4422,7 @@
			List<String> repeatData = commonsMapper.selectList(sqlBO.getSqlId());
			if(!repeatData.isEmpty()){
			final List<Map<String,String>> newDataList = commonsMapper.queryByOnlySqlForMap(sqlBO.getSqlUnPage());
			DefaultAttrAssimtUtil.mapToLowerCase(newDataList,true);
			//List<ClientBusinessObject> newCboList=ChangeMapTOClientBusinessObjects(newDataList);
			List<BaseModel> newCboList = new ArrayList<>();
			newDataList.stream().forEach(stringStringMap -> {
			@@ -4631,10 +4651,11 @@
			}
			private List<ClientBusinessObject> ChangeMapTOClientBusinessObjects(List<Map<String,String>> oldDataMap){
			List<ClientBusinessObject> clientBusinessObjectList=new ArrayList<>();
			DefaultAttrAssimtUtil.mapToLowerCase(oldDataMap,true);
			final BladeUser user = AuthUtil.getUser();
			oldDataMap.stream().forEach(dataMap->{
			ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
			DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject,true,user);
			DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject,false,user);
			for (String key:dataMap.keySet()){
			Object value= dataMap.getOrDefault(key,"");
			clientBusinessObject.setAttributeValue(key.toLowerCase(Locale.ROOT),value==null?"":value.toString());
			@@ -4925,6 +4946,7 @@
			pageHelper.addDefaultDesc("id");
			CodeTemplateAttrSqlBO sqlBO = engineService.getSqlByTemplateVO(btmtypeid, templateVO, conditionMap, pageHelper);
			List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sqlBO.getSqlUnPage());
			DefaultAttrAssimtUtil.mapToLowerCase(dataMapList,true);
			List<ClientBusinessObject> resembleCboList= ChangeMapTOClientBusinessObjects(dataMapList);
			if(!CollectionUtils.isEmpty(resembleCboList)) {
			List<Map<String, String>> finalDataMap = dataMap;
			@@ -5293,7 +5315,7 @@
			final BladeUser user = AuthUtil.getUser();
			cboList.stream().forEach(clientBusinessObject -> {
			BaseModel newBaseModel=new BaseModel();
			DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(clientBusinessObject.getData(),newBaseModel,true,user);
			DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(clientBusinessObject.getData(),newBaseModel,false,user);
			newCbos.add(newBaseModel);
			});
			// 插入新的数据
			@@ -5332,12 +5354,12 @@
			List<Map<String,String>>dataList=new ArrayList<>();
			List<String> fieldList= execGroupCodePortDataDTO.getFieldList();
			getDatas(classifyFullInfo,templateVO,execGroupCodePortDataDTO.getFieldList(),dataList,Arrays.asList(code));
			DefaultAttrAssimtUtil.mapToLowerCase(dataList,true);
			if(!CollectionUtils.isEmpty(dataList)){
			Map<String,String> newDataMap=new HashMap<>();//将新对象属性暂时存储在Map<>
			newDataMap.putAll(clientBusinessObject.getData());
			Map<String,String> dataMap=dataList.get(0);
			BaseModel oldBaseModel=new BaseModel();

			DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,oldBaseModel,false,user);
			String oldOid=oldBaseModel.getOid();