From b267ac7499877043675bbd25d1478b1731c12ec9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 24 十一月 2023 15:14:03 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 166 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 124 insertions(+), 42 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 588fe6f..c168c16 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -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;
@@ -98,18 +99,25 @@
@Value("${batchadd.redis.time:6000000}")
public int BATCHADD_REDIS_TIME;
+
+ @Value("${batchadd.import_data_limit:5001}")
+ private Integer IMPORT_DATA_LIMIT;
+
/**
* 涓婚搴撳垎绫荤殑鏈嶅姟
*/
@Resource
private ICodeClassifyService classifyService;
+ @Resource
+ private MdmEngineService mdmEngineService;
/**
* 閫氱敤鏌ヨ
*/
@Resource
private CommonsMapper commonsMapper;
+
/****
* 鐮佸�兼湇鍔�
*/
@@ -347,10 +355,12 @@
@Override
public String createImportExcel(String codeClassifyOid, boolean isHistory) {
List<CodeClassifyTemplateVO> templateVOList=new ArrayList<>();
-
VciBaseUtil.alertNotNull("瀵煎嚭妯℃澘","瀵煎嚭鐨勯厤缃�",codeClassifyOid,"涓婚搴撳垎绫荤殑涓婚敭");
CodeClassifyVO codeClassifyVO = classifyService.getObjectByOid(codeClassifyOid);
+
+ //鑾峰彇鐮佹瀹藉害
+ //String secWidth = getCodeSegmentWidth(codeClassifyVO.getOid());
if(isHistory){
templateVOList= templateService.childTemplates(codeClassifyOid);
@@ -465,6 +475,30 @@
}
/**
+ * 鑾峰彇鐮佹瀹藉害
+ * @param codeClassifyOid
+ * @return
+ */
+ private String getCodeSegmentWidth(String codeClassifyOid){
+ CodeClassifyVO codeClassifyVO = classifyService.getObjectByOid(codeClassifyOid);
+ // 瑕佽幏鍙栫爜娈靛搴︼紝鍏堣鑾峰彇瑙勫垯锛屽綋鍓嶆病鏈夊線涓婃壘
+ CodeRuleVO codeRuleByClassifyFullInfo = mdmEngineService.getCodeRuleByClassifyFullInfo(classifyService.getClassifyFullInfo(codeClassifyOid));
+ List<CodeBasicSecVO> secVOList = codeRuleByClassifyFullInfo.getSecVOList();
+ if(secVOList.isEmpty()){
+ return "";
+ }
+
+ StringBuffer secWidth = new StringBuffer("");
+
+ for (int j = 0; j < secVOList.size(); j++) {
+ CodeBasicSecVO secVO = secVOList.get(j);
+ int width = VciBaseUtil.getInt(secVO.getCodeSecLength()) + ((secVO.getPrefixCode() + secVO.getSuffixCode()).length());
+ secWidth.append(width).append("#");
+ }
+ return secWidth.toString().substring(0, secWidth.length() - 1);
+ }
+
+ /**
* 瀵煎嚭鐨勬椂鍊欏皝瑁呭繀杈撳拰鍏抽敭灞炴��
* @param attrVO 灞炴�х殑鏄剧ず瀵硅薄
* @param text 鍗曞厓鏍肩殑鍊�
@@ -524,7 +558,7 @@
//鏍￠獙妯℃澘鏄笉鏄渶鏂扮殑
checkTemplateSync(sheetDataSetList,templateVO,0);
//鍏堜笉鐢ㄧ灞炴�ф槸鍚﹂兘瀛樺湪锛屽厛杞崲涓�涓嬫暟鎹�
- Map<String,String> errorMap = new HashMap<>();
+ Map<String,String> errorMap = new ConcurrentHashMap<>();
String redisUUid=batchImportCodes(orderDTO,templateVO,dataSet,errorMap,true);
CodeImProtRusultVO codeImProtRusultVO = new CodeImProtRusultVO();
List<String> needRowIndexList = new ArrayList<>();
@@ -649,7 +683,7 @@
//2.鍒ゆ柇蹇呰緭椤广�傘�傞渶瑕佸叏閮ㄧ殑灞炴�э紝濡傛灉鏄繀杈擄紝浣嗘槸琛ㄥ崟閲岄潰涓嶆樉绀虹殑锛屽彧鑳芥槸鍒嗙被娉ㄥ叆鎴栬�呯粍鍚堣鍒�
batchCheckRequiredAttrOnOrder(templateVO,allCboList,errorMap);
//3.鍒ゆ柇鍏抽敭灞炴��
- CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, allCboList);
+ CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, allCboList,errorMap);
Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
if(!CollectionUtils.isEmpty(selfRepeatRowIndexList)){
@@ -659,7 +693,7 @@
}
if(!CollectionUtils.isEmpty(keyAttrRepeatRowIndexList)){
keyAttrRepeatRowIndexList.stream().forEach(rowIndex->{
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅" );
+ errorMap.put(rowIndex, "鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅;" + errorMap.getOrDefault(rowIndex,"") );
});
}
//鍒嗙被娉ㄥ叆
@@ -794,6 +828,10 @@
|| sheetDataSetList.get(i).getRowData().size() < 1) {
continue;
}
+ // 鍗曟瀵煎叆鏁伴噺闄愬埗
+ if(sheetDataSetList.get(i).getRowData().size() > IMPORT_DATA_LIMIT){
+ throw new ServiceException("涓轰簡淇濊瘉绯荤粺鐨勭ǔ瀹氭�э紝璇蜂竴娆′笉瑕佸鍏ヨ秴杩�"+IMPORT_DATA_LIMIT+"鏉＄殑鏁版嵁");
+ }
//鍘嗗彶瀵煎叆鐨勬椂鍊欎笉澶勭悊缂栫爜
//----閫昏緫鍐呭----
//1. 鍒嗙被鐨勮矾寰勫彲浠ュ湪椤甸潰涓婇�夋嫨鏄垎绫荤紪鍙疯繕鏄垎绫荤殑鍚嶇О
@@ -894,7 +932,7 @@
//鍒ゆ柇蹇呰緭椤�
batchCheckRequiredAttrOnOrder(templateVO, cboList, errorMap);
- //鏈夐檺鏍￠獙缂栫爜鏄惁瀛樺湪
+ //浼樺厛鏍￠獙缂栫爜鏄惁瀛樺湪
batchCheckIdExistOnOrder(templateVO, cboList, errorMap);
//boolean
@@ -904,15 +942,18 @@
batchSwitchEnumAttrOnOrder(attrVOS, cboList, errorMap);
batchSwitchReferAttrOnOrder(attrVOS, cboList, errorMap);
+
//6.澶勭悊鍒嗙被娉ㄥ叆
batchSwitchClassifyAttrOnOrder(attrVOS, cboList, classifyFullInfo,true);
//璁剧疆榛樿鍊�
batchSwitchAttrDefault(attrVOS, cboList);
+
//7.澶勭悊缁勫悎瑙勫垯
batchSwitchComponentAttrOnOrder(attrVOS, cboList);
+
//3.鍒ゆ柇鍏抽敭灞炴��
- CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList);
+ CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList,errorMap);
Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
if (!CollectionUtils.isEmpty(selfRepeatRowIndexList)) {
@@ -922,7 +963,7 @@
}
if (!CollectionUtils.isEmpty(keyAttrRepeatRowIndexList)) {
keyAttrRepeatRowIndexList.stream().forEach(rowIndex -> {
- errorMap.put(rowIndex, errorMap.getOrDefault(rowIndex, "") + ";鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅");
+ errorMap.put(rowIndex, "鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅;" + errorMap.getOrDefault(rowIndex, ""));
});
}
//4.鏍￠獙瑙勫垯
@@ -933,7 +974,7 @@
if (CollectionUtils.isEmpty(ruleOidMap.values())) {
throw new VciBaseException("瀵煎叆鐨勬暟鎹墍閫夋嫨鐨勫垎绫婚兘娌℃湁璁剧疆缂栫爜瑙勫垯");
}
- // TODO: 鏀圭敤oid鏌ヨ瑙勫垯鐨勶紝鍒敤id
+ // 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<>();
@@ -1029,7 +1070,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);
@@ -1292,7 +1333,7 @@
//2.鍒ゆ柇蹇呰緭椤广�傘�傞渶瑕佸叏閮ㄧ殑灞炴�э紝濡傛灉鏄繀杈擄紝浣嗘槸琛ㄥ崟閲岄潰涓嶆樉绀虹殑锛屽彧鑳芥槸鍒嗙被娉ㄥ叆鎴栬�呯粍鍚堣鍒�
batchCheckRequiredAttrOnOrder(templateVO,cboList,errorMap);
//3.鍒ゆ柇鍏抽敭灞炴��
- CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList);
+ CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList,errorMap);
Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
if(!CollectionUtils.isEmpty(selfRepeatRowIndexList)){
@@ -1302,7 +1343,7 @@
}
if(!CollectionUtils.isEmpty(keyAttrRepeatRowIndexList)){
keyAttrRepeatRowIndexList.stream().forEach(rowIndex->{
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅" );
+ errorMap.put(rowIndex,"鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅;" + errorMap.getOrDefault(rowIndex,""));
});
}
//鍒嗙被娉ㄥ叆
@@ -1529,7 +1570,6 @@
total += commonsMapper.queryCountBySql(countSql);
}
}else{
-
total = commonsMapper.queryCountBySql(countSql);
}
List<String> selectFieldList = new ArrayList<>();
@@ -1729,7 +1769,7 @@
).collect(Collectors.toList());
String fullPath = getFullPath(classifyFullInfo);
excelToCbo(classifyFullInfo,fieldIndexMap,rowDataList, codeClassifyTemplateVO,cboList,fullPath,!isImprot);
- Map<String,String> errorMap=new HashMap<>();
+ Map<String,String> errorMap=new ConcurrentHashMap<>();
Map<String/**璺緞**/, CodeClassifyVO> pathMap=new HashMap<>() ;
//鏍￠獙缂栫爜瑙勫垯鍜岀爜娈垫槸鍚︽纭�
Map<String, List<String>> ruleRowIndexMap = new ConcurrentHashMap<>();
@@ -1774,12 +1814,12 @@
//鏈�鍚庡紕缁勫悎瑙勫垯
batchSwitchComponentAttrOnOrder(attrVOS,cboList);
//3.鍒ゆ柇鍏抽敭灞炴��
- CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, codeClassifyTemplateVO, cboList);
+ CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, codeClassifyTemplateVO, cboList,errorMap);
Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
if(!CollectionUtils.isEmpty(keyAttrRepeatRowIndexList)){
keyAttrRepeatRowIndexList.stream().forEach(rowIndex->{
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅" );
+ errorMap.put(rowIndex,"鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅;" + errorMap.getOrDefault(rowIndex,""));
});
}
//4.鏍￠獙瑙勫垯
@@ -1908,7 +1948,7 @@
*/
@Override
public void batchSyncApplyCode(CodeOrderDTO orderDTO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs,boolean isCodeOrGroupCode) {
- Map<String,String> errorMap=new HashMap<>();
+ Map<String,String> errorMap=new ConcurrentHashMap<>();
VciBaseUtil.alertNotNull(orderDTO,"缂栫爜鐢宠鐩稿叧鐨勬暟鎹�",orderDTO.getCodeClassifyOid(),"涓婚搴撳垎绫讳富閿�");
CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
//瑙勫垯鐨勪富閿渶瑕佸幓鑾峰彇
@@ -1958,7 +1998,6 @@
//閮借浆鎹㈠畬浜嗐�傞渶瑕佹壒閲忔鏌�
//濡傛灉鍑洪敊浜嗭紝鎴戜滑渚濈劧鎵ц鏈夋晥鐨勬暟鎹紝鏃犳晥鐨勬暟鎹啓鍥炲埌excel涓�
-
Map<String,String> errorKeyMap=new HashMap<>();
//1.鍒嗙被娉ㄥ叆
batchSwitchClassifyAttrOnOrder(attrVOS,cboList,classifyFullInfo,false);
@@ -1981,9 +2020,10 @@
//鏈�鍚庡紕缁勫悎瑙勫垯
batchSwitchComponentAttrOnOrder(attrVOS,cboList);
//3.鍒ゆ柇鍏抽敭灞炴��
- CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList);
+ CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList,errorKeyMap);
Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
+
Map<String,List<String>>keyAttrOkOidTORepeatOidMap= keyResultVO.getKeyAttrOkOidTORepeatOidMap();
if(!CollectionUtils.isEmpty(selfRepeatRowIndexList)){
selfRepeatRowIndexList.stream().forEach(rowIndex->{
@@ -2013,7 +2053,11 @@
resultDataObjectDetailDO.setMsg(errorMap.getOrDefault(rowIndex,"") + ";鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅" );
resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
*/
- errorKeyMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅" );
+ Map<String, List<BaseModel>> indexTODataMap=keyResultVO.getIndexTODataMap();
+ if(indexTODataMap.containsKey(rowIndex)){
+ List<BaseModel> baseModelList= indexTODataMap.get(rowIndex);
+ }
+ errorKeyMap.put(rowIndex, "鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅;" + errorKeyMap.getOrDefault(rowIndex,""));
});
}
//鏍￠獙灞炴�ф槸鍚︽纭敊璇俊鎭�
@@ -2261,6 +2305,7 @@
}
return resultDataObjectDetailDOs;
}
+
/***
* 闆嗘垚鎵归噺鍚屾鏇存柊鎺ュ彛
* @param codeClassifyVO;
@@ -2556,6 +2601,7 @@
});
}
}
+
/**
* 杞崲缁勫悎瑙勫垯鐨勫��
*
@@ -2602,6 +2648,7 @@
});
}
}
+
/**
* 鏍￠獙鍏抽敭灞炴��
*
@@ -2630,7 +2677,6 @@
});
//娌℃湁闄愬埗鍒嗙被锛屼絾鏄竴涓ā鏉垮彧鍙兘鍦ㄤ竴涓笟鍔＄被鍨嬮噷闈紝鎵�浠ョ洿鎺ユ煡璇㈣繖涓笟鍔＄被鍨嬪嵆鍙�
-
if (!CollectionUtils.isEmpty(conditionMap)) {
String tableName="";
R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
@@ -2642,11 +2688,12 @@
}
}
if (StringUtils.isBlank(tableName)) {
- String errormsg="鏍规嵁涓氬姟绫诲瀷涓烘煡璇㈠埌鐩稿叧涓氬姟琛�";
+ String errormsg="鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿叧涓氬姟琛�";
errorMap.put(orderDTO.getId(),errorMap.getOrDefault(orderDTO.getId(),"")+errormsg);
return;
}
- final String[] sql = {"select count(*) from " + tableName + " t where 1 = 1 "};
+ //final String[] sql = {"select count(*) from " + tableName + " t where 1 = 1 "};
+ final String[] sql = {"select t.id from " + tableName + " t where 1 = 1 "};
conditionMap.forEach((key, value) -> {
if(StringUtils.isBlank(value)||value.equals(QueryOptionConstant.ISNULL)){
sql[0] += " and " + key + " is null ";
@@ -2661,17 +2708,24 @@
} else if (StringUtils.isNotBlank(orderDTO.getCopyFromVersion())) {
sql[0] += " and t.oid != '" + orderDTO.getCopyFromVersion() + "'";
}
+ // 涓嶉渶瑕佸弬涓庢牎楠岀殑瑙勫垯oid
+ String isParticipateCheckOids = classifyService.selectLeafByParentClassifyOid(classifyFullInfo.getTopClassifyVO().getOid(), classifyFullInfo.getCurrentClassifyVO().getOid());
+ if(Func.isNotBlank(isParticipateCheckOids)){
+ sql[0] += " and codeclsfid not in("+isParticipateCheckOids+")";
+ }
sql[0] += " and t.lastR = '1' and t.lastV = '1' ";
- if (commonsMapper.queryCountBySql(sql[0]) > 0) {
+ List<String> repeatData = commonsMapper.selectList(sql[0]);
+ if (!repeatData.isEmpty()) {
String ruleInfoMsg = keyRuleVO == null ? "" : "鏌ヨ瑙勫垯锛氬幓闄ょ┖鏍�--{0},蹇界暐澶у皬鍐�--{1},蹇界暐鍏ㄥ崐瑙�--{2},蹇界暐鍏ㄩ儴绌烘牸--{3}";
String[] objs = new String[]{trim ? "鏄�" : "鍚�", ignoreCase ? "鏄�" : "鍚�", ignoreWidth ? "鏄�" : "鍚�", trimAll ? "鏄�" : "鍚�"};
- String defaultValue=";鏍规嵁鎮ㄥ～鍐欑殑鍏抽敭灞炴�х殑鍐呭锛岀粨鍚堝叧閿睘鎬ф煡璇㈣鍒欙紝鍙戠幇杩欎釜鏁版嵁宸茬粡鍦ㄧ郴缁熶腑瀛樺湪浜嗐�傝淇!銆�";
+ String defaultValue=";鏍规嵁鎮ㄥ～鍐欑殑鍏抽敭灞炴�х殑鍐呭锛岀粨鍚堝叧閿睘鎬ф煡璇㈣鍒欙紝鍙戠幇杩欎釜鏁版嵁宸茬粡鍦ㄧ郴缁熶腑瀛樺湪浜�,鏁版嵁鐨勭紪鍙峰涓嬶細"+repeatData.stream().collect(Collectors.joining(","))+"銆傝淇!銆�";
String errormsg=defaultValue+ MessageFormat.format(ruleInfoMsg, objs);
errorMap.put(orderDTO.getId(),errorMap.getOrDefault(orderDTO.getId(),"")+errormsg);
// throw new VciBaseException("鏍规嵁鎮ㄥ～鍐欑殑鍏抽敭灞炴�х殑鍐呭锛岀粨鍚堝叧閿睘鎬ф煡璇㈣鍒欙紝鍙戠幇杩欎釜鏁版嵁宸茬粡鍦ㄧ郴缁熶腑瀛樺湪浜嗐�傝淇!銆�" + ruleInfoMsg, objs);
}
}
}
+
/**
* 鏍￠獙鏋氫妇鐨勫唴瀹�
*
@@ -2695,6 +2749,7 @@
});
}
}
+
/**
* 杞崲鏃堕棿鐨勬牸寮�
*
@@ -2756,10 +2811,10 @@
// if (lifeCycleVO != null) {
// cbo.setLcStatus(lifeCycleVO.getStartStatus());
// } else {
- cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
+ cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
// }
} else {
- cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
+ cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
}
}
@@ -2787,6 +2842,7 @@
orderDTO.getData().put(attrId, value);
}
}
+
/**
* 浠庣紪鐮佺敵璇蜂俊鎭璞′笂鑾峰彇鏌愪釜灞炴�х殑鍊�
*
@@ -2806,6 +2862,7 @@
}
return value;
}
+
/**
* 澶勭悊鍒嗙被娉ㄥ叆鐨勪俊鎭�
*
@@ -2851,6 +2908,7 @@
});
}
}
+
/***
*
* @param codeClassifyVO
@@ -2979,6 +3037,7 @@
}
});
}
+
/**
* excel杞崲涓篶bo鐨勫璞�
* @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
@@ -3091,6 +3150,7 @@
});
}
+
/**
* excel杞崲涓篶bo鐨勫璞�
* @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
@@ -3125,7 +3185,7 @@
Integer userSecret = VciBaseUtil.getCurrentUserSecret();
cbo.setAttributeValue(SECRET_FIELD,String.valueOf((userSecret==null || userSecret ==0)? UserSecretEnum.NONE.getValue():userSecret));
}
- cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
+ cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
}else{
//姝ゆ椂杩樻病鏈夎浆鎹㈣矾寰�
//cbo.setAttributeValue(CODE_FULL_PATH_FILED, childOidPathMap.getOrDefault(rowData.getData().getOrDefault(CODE_CLASSIFY_OID_FIELD,""),fullPath));
@@ -3140,6 +3200,7 @@
});
}
+
/**
* excel杞崲涓篶bo鐨勫璞�
* @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
@@ -3157,7 +3218,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) + "鍒楃殑鏍囬鍦ㄧ郴缁熶腑涓嶅瓨鍦�");
}
@@ -3182,7 +3243,7 @@
Integer userSecret = VciBaseUtil.getCurrentUserSecret();
cbo.setAttributeValue(SECRET_FIELD,String.valueOf((userSecret==null || userSecret ==0)? UserSecretEnum.NONE.getValue():userSecret));
}
- cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
+ cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
}else{
//姝ゆ椂杩樻病鏈夎浆鎹㈣矾寰�
//cbo.setAttributeValue(CODE_FULL_PATH_FILED, childOidPathMap.getOrDefault(rowData.getData().getOrDefault(CODE_CLASSIFY_OID_FIELD,""),fullPath));
@@ -3228,6 +3289,7 @@
}
}
}
+
/**
* 鎵归噺杞崲鏃堕棿閮戒负鎸囧畾鐨勬牸寮�
* @param attrVOS 妯℃澘灞炴��
@@ -3453,6 +3515,7 @@
}
}
+
/**
* 鎵归噺妫�鏌ヤ紒涓氱紪鐮佹槸鍚﹀瓨鍦�
* @param templateVO 妯℃澘鐨勬樉绀哄璞�
@@ -3514,6 +3577,7 @@
});
}
}
+
/***
* 鏍￠獙鍒嗙被瀵瑰簲鐨勬ā鏉夸俊鎭�
* @param titleRowData
@@ -3597,6 +3661,7 @@
}
return codeClassifyTemplateVOList ;
}
+
/**
* 浠庡睘鎬т笂鑾峰彇鍙傜収鐨勫唴瀹�
* @param attrVO 灞炴�х殑淇℃伅
@@ -3658,6 +3723,7 @@
}
return showText;
}
+
/**
* 澶勭悊鏋氫妇鐨勬樉绀哄璞�
* @param attrVOS 妯℃澘灞炴��
@@ -3714,11 +3780,12 @@
if(!CollectionUtils.isEmpty(nullRowIndex)){
String checkAttr = requiredAttrMap.values().stream().map(CodeClassifyTemplateAttrVO::getName).collect(Collectors.joining(","));
nullRowIndex.stream().forEach(rowIndex->{
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鏍￠獙瑙勫垯涓嶉�氳繃锛屾湁鏍￠獙鐨勫睘鎬т负" + checkAttr);
+ errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鏍￠獙瑙勫垯蹇呭～椤逛笉閫氳繃锛屽鏋滄湁蹇呭～灞炴�т负绌猴紝鍒欏～銆�/銆戜唬鏇�,鏈夋牎楠岀殑灞炴�т负" + checkAttr);
});
}
}
}
+
/**
* 澶勭悊鍒嗙被娉ㄥ叆
* @param attrVOS 妯℃澘灞炴��
@@ -3781,7 +3848,7 @@
* @param cboList 鎵归噺鐨勬暟鎹�
*/
private CodeImportResultVO batchCheckKeyAttrOnOrder(CodeClassifyFullInfoBO classifyFullInfo, CodeClassifyTemplateVO templateVO,
- List<ClientBusinessObject> cboList) {
+ List<ClientBusinessObject> cboList,Map<String,String> errorMap) {
//涓嶮dmEngineServiceImpl閲岀殑checkKeyAttrOnOrder鐩镐技
//鍏堣幏鍙栧叧閿睘鎬х殑瑙勫垯锛屼篃鍒╃敤缁ф壙鐨勬柟寮�
CodeKeyAttrRepeatVO keyRuleVO = keyRuleService.getRuleByClassifyFullInfo(classifyFullInfo);
@@ -3808,7 +3875,9 @@
//2.鍒ゆ柇鍏抽敭灞炴�у湪绯荤粺閲屾槸鍚﹂噸澶�
//鍥犱负鏁版嵁閲忓緢澶э紝鎵�浠ュ緱鎯冲姙娉曞苟琛�
//SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
- Map<String,List<BaseModel>> indexTODataMap=new HashMap<>();
+ Map<String,List<BaseModel>> indexTODataMap=new ConcurrentHashMap<>();
+ // 鏌ヨ涓嶉渶瑕佸弬涓庡叧閿睘鎬ф牎楠岀殑闄よ嚜宸变互澶栫殑鎵�鏈夊垎绫籵id
+ final String isParticipateCheckOids = classifyService.selectLeafByParentClassifyOid(classifyFullInfo.getTopClassifyVO().getOid(), classifyFullInfo.getCurrentClassifyVO().getOid());
List<ClientBusinessObject> repeatDataMap = cboList.parallelStream().filter(cbo -> {
//姣忚閮藉緱鏌ヨ.濡傛灉鍏朵腑鍑虹幇浜嗛敊璇紝鎴戜滑灏辩洿鎺ユ姏鍑哄紓甯革紝鍏朵綑鐨勬樉绀�
//VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
@@ -3822,22 +3891,29 @@
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){
- List<Map<String,String>> newDataList= commonsMapper.queryByOnlySqlForMap(sqlBO.getSqlUnPage());
- //List<ClientBusinessObject> newCboList= ChangeMapTOClientBusinessObjects(newDataList);
- List<BaseModel> newCboList=new ArrayList<>();
+ List<String> repeatData = commonsMapper.selectList(sqlBO.getSqlId());
+ if(!repeatData.isEmpty()){
+ final List<Map<String,String>> newDataList = commonsMapper.queryByOnlySqlForMap(sqlBO.getSqlUnPage());
+ //List<ClientBusinessObject> newCboList=ChangeMapTOClientBusinessObjects(newDataList);
+ List<BaseModel> newCboList = new ArrayList<>();
newDataList.stream().forEach(stringStringMap -> {
BaseModel baseModel=new BaseModel();
DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(stringStringMap,baseModel);
newCboList.add(baseModel);
});
+ // 娣诲姞閿欒鍊�
+ String rowIndex = cbo.getAttributeValue(IMPORT_ROW_INDEX);
+ errorMap.put(rowIndex, "閲嶅鐨勮褰曠紪鍙蜂负:"+repeatData.stream().collect(Collectors.joining(",")));
if(!CollectionUtils.isEmpty(newCboList)) {
indexTODataMap.put(cbo.getAttributeValue(IMPORT_ROW_INDEX), newCboList);
}
}
- return isKeyCheck;
+ return !repeatData.isEmpty();
}else{
return false;
}
@@ -3865,7 +3941,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 {
@@ -3948,9 +4024,11 @@
childOidPathMap.put(childPath.getOid(),thisClassifyPath);
});
}
+ String path=classifyFullInfo.getCurrentClassifyVO().getId();
+ //鏍规嵁瀹㈡埛閫夋嫨鐨勫垎绫昏矾寰勬湭id锛岃繕鏄痭ame纭畾璺緞鎷兼帴
+ childOidPathMap.put(classifyFullInfo.getCurrentClassifyVO().getOid(),fullPath);
return childOidPathMap;
}
-
/**
* 鑾峰彇瀵煎叆鐨勫唴瀹逛腑鍏抽敭灞炴�ч噸澶嶇殑琛屽彿
@@ -4005,7 +4083,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);
}
@@ -4020,6 +4098,7 @@
resultVO.setKeyAttrRepeatRowIndexList(selfRepeatRowIndexList);
resultVO.setKeyAttrOkOidTORepeatOidMap(keyAttrOkOidTORepeatOidMap);
}
+
/**
* excel鐨勬爣棰樹笂鑾峰彇瀛楁鎵�鍦ㄧ殑浣嶇疆
* @param titleRowData 鏍囬鐨勫唴瀹�
@@ -4134,6 +4213,7 @@
codeClassifyDatas.addAll(newCodeImprotDataVO);
log.info("222");
}
+
/***
* @param titleRowData
* @param newTemplateVO
@@ -4179,7 +4259,8 @@
codeImprotDataVO.setColNames(colNames);
codeImprotDataVO.getDatas().add(filedValueMap);
}
- /***
+
+ /**
* 姝ｇ‘閿欒鏁版嵁redis缂撳瓨
* @param uuid
* @param templateVO
@@ -4493,4 +4574,5 @@
mdmInterJtClient.receiveEditApply(oids,btmName);
}
}
+
}
--
Gitblit v1.9.3