From ba345976f0a6a67bcb20627e33251ded000a3d8f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期六, 25 五月 2024 22:40:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 2
Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/impl/UniversalInterfaceImplServiceLocator.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 15 +++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java | 2
Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/controller/TestCalledIntegrationController.java | 5 +
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 9 +-
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java | 1
Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/impl/CalledIntegrationServiceImpl.java | 119 +++++++++++++++++++++++++++++++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 1
Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/ICalledIntegrationService.java | 5 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 3 -
11 files changed, 145 insertions(+), 19 deletions(-)
diff --git a/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/controller/TestCalledIntegrationController.java b/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/controller/TestCalledIntegrationController.java
index ac20822..351bf7b 100644
--- a/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/controller/TestCalledIntegrationController.java
+++ b/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/controller/TestCalledIntegrationController.java
@@ -5,6 +5,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.net.MalformedURLException;
@@ -28,5 +29,9 @@
calledIntegrationService.sendApplyCodeByWebService();
}
+ @GetMapping("/sendApplyCodeByWebServicexml")
+ public void sendApplyCodeByWebServicexml(@RequestParam("frequency") Integer frequency) throws MalformedURLException, RemoteException {
+ calledIntegrationService.sendApplyCodeByWebServicexml(frequency);
+ }
}
diff --git a/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/ICalledIntegrationService.java b/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/ICalledIntegrationService.java
index e6e8d9c..705d586 100644
--- a/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/ICalledIntegrationService.java
+++ b/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/ICalledIntegrationService.java
@@ -21,6 +21,9 @@
void sendApplyCodeByWebService() throws MalformedURLException, RemoteException;
-
+ /**
+ * 缂栫爜绯荤粺锛岀粺涓�鐢宠鎺ュ彛,鐢╓ebService鏂瑰紡璋冪敤xml
+ */
+ void sendApplyCodeByWebServicexml(int frequency) throws MalformedURLException, RemoteException;
}
diff --git a/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/impl/CalledIntegrationServiceImpl.java b/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/impl/CalledIntegrationServiceImpl.java
index 8f42089..e9bb79c 100644
--- a/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/impl/CalledIntegrationServiceImpl.java
+++ b/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/impl/CalledIntegrationServiceImpl.java
@@ -151,6 +151,125 @@
}
/**
+ * 瀵圭紪鐮佺郴缁熺粺涓�鐢宠鎺ュ彛璋冪敤,WebService鏂瑰紡
+ */
+ @Override
+ public void sendApplyCodeByWebServicexml(int frequency) throws MalformedURLException, RemoteException {
+ //浣跨敤sopui鐢熸垚璋冪敤webservice鎺ュ彛鐨勪唬鐮�
+ String dataType = "xml"; //鎴栬�厁ml
+ String dataString = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<data systemId=\"PDM\">\n" +
+ " <user ip=\"130.31.92.101\" trueName=\"鐜嬬惇\" userName=\"19851584\"/>\n" +
+ " <classifys>\n" +
+ " <classify classCode=\"1025\" fullclsfNamePath=\"\" library=\"10\">\n" +
+ " <sections>\n" +
+ " <section name=\"鍒嗙被\" value=\"1025\"/>\n" +
+ " </sections>\n" +
+ " <objects>\n" +
+ " <object code=\"\" creator=\"19851584\" id=\"2548M16G02\" operate=\"create\" status=\"Released\">\n" +
+ " <prop key=\"partclassification\" text=\"鍒嗙被\" value=\"1025\"/>\n" +
+ " <prop key=\"c6e_drawingNo\" text=\"鍥惧彿\" value=\"2548M16G02\"/>\n" +
+ " <prop key=\"c6e_partClass\" text=\"Part鍒嗙被\" value=\"璁捐闆剁粍浠禱"/>\n" +
+ " <prop key=\"c6e_partName\" text=\"鍚嶇О\" value=\"楂樺帇娑¤疆闈欐瀵嗗皝鍦圽"/>\n" +
+ " <prop key=\"c6e_hash\" text=\"鍝堝笇鐮乗" value=\"/\"/>\n" +
+ " </object>\n" +
+ " <object code=\"\" creator=\"19851584\" id=\"2548M16P06\" operate=\"create\" status=\"Released\">\n" +
+ " <prop key=\"partclassification\" text=\"鍒嗙被\" value=\"1025\"/>\n" +
+ " <prop key=\"c6e_drawingNo\" text=\"鍥惧彿\" value=\"2548M16P06\"/>\n" +
+ " <prop key=\"c6e_partClass\" text=\"Part鍒嗙被\" value=\"璁捐闆剁粍浠禱"/>\n" +
+ " <prop key=\"c6e_partName\" text=\"鍚嶇О\" value=\"娉曞叞鐩榎"/>\n" +
+ " <prop key=\"c6e_hash\" text=\"鍝堝笇鐮乗" value=\"/\"/>\n" +
+ " </object>\n" +
+ " <object code=\"\" creator=\"19851584\" id=\"2548M16P02\" operate=\"create\" status=\"Released\">\n" +
+ " <prop key=\"partclassification\" text=\"鍒嗙被\" value=\"1025\"/>\n" +
+ " <prop key=\"c6e_drawingNo\" text=\"鍥惧彿\" value=\"2548M16P02\"/>\n" +
+ " <prop key=\"c6e_partClass\" text=\"Part鍒嗙被\" value=\"璁捐闆剁粍浠禱"/>\n" +
+ " <prop key=\"c6e_partName\" text=\"鍚嶇О\" value=\"鐒婃帴娉曞叞鐩榎"/>\n" +
+ " <prop key=\"c6e_hash\" text=\"鍝堝笇鐮乗" value=\"/\"/>\n" +
+ " </object>\n" +
+ " <object code=\"\" creator=\"19851584\" id=\"2548M16P05\" operate=\"create\" status=\"Released\">\n" +
+ " <prop key=\"partclassification\" text=\"鍒嗙被\" value=\"1025\"/>\n" +
+ " <prop key=\"c6e_drawingNo\" text=\"鍥惧彿\" value=\"2548M16P05\"/>\n" +
+ " <prop key=\"c6e_partClass\" text=\"Part鍒嗙被\" value=\"璁捐闆剁粍浠禱"/>\n" +
+ " <prop key=\"c6e_partName\" text=\"鍚嶇О\" value=\"闃查缃‐"/>\n" +
+ " <prop key=\"c6e_hash\" text=\"鍝堝笇鐮乗" value=\"/\"/>\n" +
+ " </object>\n" +
+ " <object code=\"\" creator=\"19851584\" id=\"2548M16P03\" operate=\"create\" status=\"Released\">\n" +
+ " <prop key=\"partclassification\" text=\"鍒嗙被\" value=\"1025\"/>\n" +
+ " <prop key=\"c6e_drawingNo\" text=\"鍥惧彿\" value=\"2548M16P03\"/>\n" +
+ " <prop key=\"c6e_partClass\" text=\"Part鍒嗙被\" value=\"璁捐闆剁粍浠禱"/>\n" +
+ " <prop key=\"c6e_partName\" text=\"鍚嶇О\" value=\"灏佷弗铚傜獫\"/>\n" +
+ " <prop key=\"c6e_hash\" text=\"鍝堝笇鐮乗" value=\"/\"/>\n" +
+ " </object>\n" +
+ " <object code=\"\" creator=\"19851584\" id=\"2548M16P04\" operate=\"create\" status=\"Released\">\n" +
+ " <prop key=\"partclassification\" text=\"鍒嗙被\" value=\"1025\"/>\n" +
+ " <prop key=\"c6e_drawingNo\" text=\"鍥惧彿\" value=\"2548M16P04\"/>\n" +
+ " <prop key=\"c6e_partClass\" text=\"Part鍒嗙被\" value=\"璁捐闆剁粍浠禱"/>\n" +
+ " <prop key=\"c6e_partName\" text=\"鍚嶇О\" value=\"铚傜獫灏佷弗杈筡"/>\n" +
+ " <prop key=\"c6e_hash\" text=\"鍝堝笇鐮乗" value=\"/\"/>\n" +
+ " </object>\n" +
+ " <object code=\"\" creator=\"19851584\" id=\"2551M46P01\" operate=\"create\" status=\"Released\">\n" +
+ " <prop key=\"partclassification\" text=\"鍒嗙被\" value=\"1025\"/>\n" +
+ " <prop key=\"c6e_drawingNo\" text=\"鍥惧彿\" value=\"2551M46P01\"/>\n" +
+ " <prop key=\"c6e_partClass\" text=\"Part鍒嗙被\" value=\"璁捐闆剁粍浠禱"/>\n" +
+ " <prop key=\"c6e_partName\" text=\"鍚嶇О\" value=\"澹充綋鍥哄畾鐜痋"/>\n" +
+ " <prop key=\"c6e_hash\" text=\"鍝堝笇鐮乗" value=\"/\"/>\n" +
+ " </object>\n" +
+ " <object code=\"\" creator=\"19851584\" id=\"2552M51G07\" operate=\"create\" status=\"Released\">\n" +
+ " <prop key=\"partclassification\" text=\"鍒嗙被\" value=\"1025\"/>\n" +
+ " <prop key=\"c6e_drawingNo\" text=\"鍥惧彿\" value=\"2552M51G07\"/>\n" +
+ " <prop key=\"c6e_partClass\" text=\"Part鍒嗙被\" value=\"璁捐闆剁粍浠禱"/>\n" +
+ " <prop key=\"c6e_partName\" text=\"鍚嶇О\" value=\"鍘嬫皵鏈烘満鍖ｅ熬閮ㄤ腑蹇冩敮鏋禱"/>\n" +
+ " <prop key=\"c6e_hash\" text=\"鍝堝笇鐮乗" value=\"/\"/>\n" +
+ " </object>\n" +
+ " <object code=\"\" creator=\"19851584\" id=\"2552M51P08\" operate=\"create\" status=\"Released\">\n" +
+ " <prop key=\"partclassification\" text=\"鍒嗙被\" value=\"1025\"/>\n" +
+ " <prop key=\"c6e_drawingNo\" text=\"鍥惧彿\" value=\"2552M51P08\"/>\n" +
+ " <prop key=\"c6e_partClass\" text=\"Part鍒嗙被\" value=\"璁捐闆剁粍浠禱"/>\n" +
+ " <prop key=\"c6e_partName\" text=\"鍚嶇О\" value=\"鍘嬫皵鏈烘満鍖ｅ熬閮ㄤ腑蹇冩敮鏋禱"/>\n" +
+ " <prop key=\"c6e_hash\" text=\"鍝堝笇鐮乗" value=\"/\"/>\n" +
+ " </object>\n" +
+ " <object code=\"\" creator=\"19851584\" id=\"2552M51P02\" operate=\"create\" status=\"Released\">\n" +
+ " <prop key=\"partclassification\" text=\"鍒嗙被\" value=\"1025\"/>\n" +
+ " <prop key=\"c6e_drawingNo\" text=\"鍥惧彿\" value=\"2552M51P02\"/>\n" +
+ " <prop key=\"c6e_partClass\" text=\"Part鍒嗙被\" value=\"璁捐闆剁粍浠禱"/>\n" +
+ " <prop key=\"c6e_partName\" text=\"鍚嶇О\" value=\"鍘嬫皵鏈哄熬閮ㄤ腑蹇冩敮鏋禱"/>\n" +
+ " <prop key=\"c6e_hash\" text=\"鍝堝笇鐮乗" value=\"/\"/>\n" +
+ " </object>\n" +
+ " <object code=\"\" creator=\"19851584\" id=\"4127T52P06\" operate=\"create\" status=\"Released\">\n" +
+ " <prop key=\"partclassification\" text=\"鍒嗙被\" value=\"1025\"/>\n" +
+ " <prop key=\"c6e_drawingNo\" text=\"鍥惧彿\" value=\"4127T52P06\"/>\n" +
+ " <prop key=\"c6e_partClass\" text=\"Part鍒嗙被\" value=\"璁捐闆剁粍浠禱"/>\n" +
+ " <prop key=\"c6e_partName\" text=\"鍚嶇О\" value=\"閿�瀛怽"/>\n" +
+ " <prop key=\"c6e_hash\" text=\"鍝堝笇鐮乗" value=\"/\"/>\n" +
+ " </object>\n" +
+ " </objects>\n" +
+ " </classify>\n" +
+ " <classify classCode=\"1040\" fullclsfNamePath=\"\" library=\"10\">\n" +
+ " <sections>\n" +
+ " <section name=\"鍒嗙被\" value=\"1040\"/>\n" +
+ " </sections>\n" +
+ " <objects>\n" +
+ " <object code=\"\" creator=\"19851584\" id=\"LEAP 1B-ZP1\" operate=\"create\" status=\"Released\">\n" +
+ " <prop key=\"partclassification\" text=\"鍒嗙被\" value=\"1040\"/>\n" +
+ " <prop key=\"c6e_drawingNo\" text=\"鍥惧彿\" value=\"LEAP 1B-ZP1\"/>\n" +
+ " <prop key=\"c6e_partClass\" text=\"Part鍒嗙被\" value=\"鍒堕�犺繃绋嬩欢\"/>\n" +
+ " <prop key=\"c6e_hash\" text=\"鍝堝笇鐮乗" value=\"/\"/>\n" +
+ " <prop key=\"c6e_partName\" text=\"鍚嶇О\" value=\"LEAP 1B鍙戝姩鏈轰氦浠樹欢\"/>\n" +
+ " </object>\n" +
+ " </objects>\n" +
+ " </classify>\n" +
+ " </classifys>\n" +
+ "</data>";
+
+ for (int i = 0; i <= frequency; i++) {
+ String res = universalInterface.applyCode(dataString,dataType);
+ System.out.println("绗�"+i+"娆℃墽琛岋紝杩斿洖缁撴灉锛�"+res);
+ }
+ System.out.println("=================END=======================");
+ }
+
+ /**
* 瀵规爣鍑嗙敵鐮佹帴鍙ｈ皟鐢ㄧず渚嬶細rest鏂瑰紡锛岃皟鐢ㄦ柟寮忓拰缁熶竴鐢崇爜鎺ュ彛娌℃湁鍖哄埆锛屽彧鏄弬鏁颁笂鏈夋墍璋冩暣
*/
public void sendApplyCodeBZByRest(){
diff --git a/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/impl/UniversalInterfaceImplServiceLocator.java b/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/impl/UniversalInterfaceImplServiceLocator.java
index eff3ad7..6f39392 100644
--- a/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/impl/UniversalInterfaceImplServiceLocator.java
+++ b/Source/ExampleIntegratedPushCalled/src/main/java/com/vci/ubcs/example/service/impl/UniversalInterfaceImplServiceLocator.java
@@ -34,7 +34,7 @@
}
// Use to get a proxy class for UniversalInterfaceImplPort
- private String UniversalInterfaceImplPort_address = "http://localhost:37000/ubcs-code/services/universalInterface";
+ private String UniversalInterfaceImplPort_address = "http://192.168.0.104/ubcs-code/services/universalInterface";
public String getUniversalInterfaceImplPortAddress() {
return UniversalInterfaceImplPort_address;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index 4e4877b..9522cb8 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -87,20 +87,19 @@
baseModel.setFirstV("1");
baseModel.setLastR("1");
baseModel.setLastV("1");
- baseModel.setRevisionSeq(1);
// TODO:鐩墠鍙湁缂栫爜瑙勫垯涓湁鐢ㄥ埌锛屽悗鏈熼渶瑕佸幓鎺夎繖娈典唬鐮佺殑璇濓紝灏辨妸浠栧姞鍦ㄧ紪鐮佽鍒欐柊澧炰腑鍘�
if(Func.isBlank(baseModel.getOwner())){
// 璁剧疆鎵�鏈夎��
baseModel.setOwner(Func.isNotEmpty(user) ? user.getUserId().toString():AuthUtil.getUserId().toString());
}
-
baseModel.setVersionSeq(1);
- baseModel.setVersionRule("0");
baseModel.setVersionValue("1");
- baseModel.setRevisionOid(VciBaseUtil.getPk());
- baseModel.setLastModifier(account);
+ baseModel.setVersionRule("0");
+ baseModel.setRevisionSeq(1);
baseModel.setRevisionValue("1");
baseModel.setRevisionRule("1");
+ baseModel.setRevisionOid(VciBaseUtil.getPk());
+ baseModel.setLastModifier(account);
baseModel.setTenantId(Func.isNotEmpty(user) ? user.getTenantId():AuthUtil.getTenantId());
}catch (VciBaseException e){
e.printStackTrace();
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 38b03e2..43a3678 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -72,12 +72,9 @@
import java.awt.event.ItemEvent;
import java.io.File;
import java.util.*;
-import java.util.concurrent.ForkJoinPool;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
import static com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant.*;
-import static com.vci.ubcs.starter.web.util.VciBaseUtil.getTableName;
@Service
public class CodeClassifyServiceImpl extends ServiceImpl<CodeClassifyMapper, CodeClassify> implements ICodeClassifyService {
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 9177504..22f9c36 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
@@ -2424,7 +2424,7 @@
//閮借浆鎹㈠畬浜嗐�傞渶瑕佹壒閲忔鏌�
//濡傛灉鍑洪敊浜嗭紝鎴戜滑渚濈劧鎵ц鏈夋晥鐨勬暟鎹紝鏃犳晥鐨勬暟鎹啓鍥炲埌excel涓�
- Map<String, String> errorKeyMap = new HashMap<>();
+ Map<String, String> errorKeyMap = new ConcurrentHashMap<>();
//1.鍒嗙被娉ㄥ叆
batchSwitchClassifyAttrOnOrder(attrVOS, cboList, classifyFullInfo, false);
//boolean
@@ -2447,6 +2447,7 @@
batchSwitchComponentAttrOnOrder(attrVOS, cboList);
//3.鍒ゆ柇鍏抽敭灞炴��
CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList, false, errorKeyMap);
+ log.info("================鏌ラ噸鍚庣殑errorKeyMap閿欒淇℃伅================="+JSON.toJSONString(errorKeyMap));
Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
@@ -2688,7 +2689,6 @@
}
}
-
}
/***
@@ -4423,9 +4423,11 @@
* @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
* @param templateVO 妯℃澘鐨勫唴瀹癸紝蹇呴』鍖呭惈妯℃澘灞炴��
* @param cboList 鎵归噺鐨勬暟鎹�
- */
+ * @param isEdit 鏄惁鏄慨鏀�
+ * @param errorMap 蹇呴』蹇呴』蹇呴』鏄嚎绋嬪畨鍏ㄧ殑闆嗗悎
+ * */
private CodeImportResultVO batchCheckKeyAttrOnOrder(CodeClassifyFullInfoBO classifyFullInfo, CodeClassifyTemplateVO templateVO,
- List<ClientBusinessObject> cboList, boolean isEdit, Map<String, String> errorMap) {
+ List<ClientBusinessObject> cboList, boolean isEdit, Map<String, String> errorMap/*蹇呴』瑕佹槸绾跨▼瀹夊叏鐨勯泦鍚�*/) {
//涓嶮dmEngineServiceImpl閲岀殑checkKeyAttrOnOrder鐩镐技
//鍏堣幏鍙栧叧閿睘鎬х殑瑙勫垯锛屼篃鍒╃敤缁ф壙鐨勬柟寮�
CodeKeyAttrRepeatVO keyRuleVO = keyRuleService.getRuleByClassifyFullInfo(classifyFullInfo);
@@ -4478,7 +4480,7 @@
// TODO:Thread limit exceeded replacing blocked 寮傚父鏄繖閮ㄥ垎浠ｇ爜鎶涘嚭鐨�
// ,鎵�浠ユ殏鏃跺皢parallelStream鏀规垚浜唖tream锛屾敼鎴愪簡stream涔嬪悗鍙戠幇宸ㄦ參
// customForkJoinPool鎺у埗骞跺彂搴�
- List<ClientBusinessObject> finalCboList = cboList;
+ final List<ClientBusinessObject> finalCboList = cboList;
Map<String, List<CodeSynonym>> finalCodeSynonymMaps = codeSynonymMaps;
List<ClientBusinessObject> repeatDataMap = (List<ClientBusinessObject>) customForkJoinPool.submit(() -> {
finalCboList.parallelStream().filter(cbo -> {
@@ -4522,6 +4524,7 @@
});
// 娣诲姞閿欒鍊�
String rowIndex = cbo.getAttributeValue(IMPORT_ROW_INDEX);
+ log.info("=============鍏抽敭灞炴�ф煡璇㈤噸澶嶇殑============="+JSON.toJSONString(repeatData));
errorMap.put(rowIndex, "閲嶅鐨勮褰曠紪鍙蜂负:" + repeatData.stream().collect(Collectors.joining(",")));
if (!CollectionUtils.isEmpty(newCboList)) {
indexTODataMap.put(cbo.getAttributeValue(IMPORT_ROW_INDEX), newCboList);
@@ -5365,7 +5368,7 @@
List<String> codeList = cboList.stream().map(ClientBusinessObject::getId).collect(Collectors.toList());
List<Map<String, String>> dataList = new ArrayList<>();
- Map<String, String> errorMap = new HashMap<>();
+ Map<String, String> errorMap = new ConcurrentHashMap<>();
batchSwitchCheckExist(errorMap, cboList, classifyFullInfo, templateVO, execGroupCodePortDataDTO, fieldIndexMap);
//鍒ゆ柇蹇呰緭椤�
batchCheckRequiredAttrOnOrder(templateVO, cboList, errorMap);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
index 14524ab..f9c3efc 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.code.service.impl;
+import com.alibaba.fastjson.JSON;
import com.vci.ubcs.code.algorithm.CustomSerialEnum;
import com.vci.ubcs.code.annotation.MdmSerialAlgorithm;
import com.vci.ubcs.code.annotation.MdmSerialAlgorithmMethod;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index 79a077a..a543a17 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -293,7 +293,7 @@
passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT), this.getRequest());
}catch (Throwable e){
errorid[0] ="1";
- throw new Throwable("鐢ㄦ埛閴存潈澶辫触.");
+ throw new Throwable("鐢ㄦ埛閴存潈澶辫触锛屽師鍥狅細"+e.getMessage());
}
List<ClassfyVO> classVOList = classfysVO.getClassify();
//InterParameterVO finalInterParameterVO = interParameterVO;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java
index 29359d0..e55465e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java
@@ -18,8 +18,6 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.code.entity.CodeRule;
-import com.vci.ubcs.code.enumpack.CodeClassifyTemplateLC;
-import com.vci.ubcs.code.lifecycle.CodeRuleLC;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.enums.EnumEnum;
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java
index a535ce9..514bd57 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java
@@ -65,6 +65,7 @@
public class MenuController extends BladeController {
private final IMenuService menuService;
+
private final ITopMenuService topMenuService;
/**
--
Gitblit v1.9.3