From 12d164daa92b00a315d08359f9320037e60a738e Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 05 七月 2023 16:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
index bc9b2ad..eb74293 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
@@ -83,25 +83,25 @@
private final Map<String, LinkTypeVO> idLinkMap = new ConcurrentHashMap<>();
- private void putBtm(@NotNull BtmTypeVO... voList) throws ServiceException {
+ private void putBtm(@NotNull BtmTypeVO... voList) throws Throwable {
String collect = Arrays.stream(voList).map(BtmTypeVO::getId).filter(idBtmMap::containsKey).collect(Collectors.joining(","));
if (StringUtils.isBlank(collect)) {
Arrays.stream(voList).forEach(vo -> {
idBtmMap.put(vo.getId(), vo);
});
} else {
- throw new ServiceException("涓氬姟绫诲瀷:[" + collect + "]姝ｅ湪琚叾浠栫敤鎴锋搷浣�");
+ throw new Throwable("涓氬姟绫诲瀷:[" + collect + "]姝ｅ湪琚叾浠栫敤鎴锋搷浣�");
}
}
- private void putLink(@NotNull LinkTypeVO... voList) throws ServiceException {
+ private void putLink(@NotNull LinkTypeVO... voList) throws Throwable {
String collect = Arrays.stream(voList).map(LinkTypeVO::getId).filter(idLinkMap::containsKey).collect(Collectors.joining(","));
if (StringUtils.isBlank(collect)) {
Arrays.stream(voList).forEach(vo -> {
idLinkMap.put(vo.getId(), vo);
});
} else {
- throw new ServiceException("閾炬帴绫诲瀷:[" + collect + "]姝ｅ湪琚叾浠栫敤鎴锋搷浣�");
+ throw new Throwable("閾炬帴绫诲瀷:[" + collect + "]姝ｅ湪琚叾浠栫敤鎴锋搷浣�");
}
}
@@ -978,7 +978,7 @@
* @return 鎵ц缁撴灉
*/
@Override
- public R<List<ModifyAttributeInfo>> submit(BtmAndLinkTypeDdlDTO ddlDTO) {
+ public R<List<ModifyAttributeInfo>> submit(BtmAndLinkTypeDdlDTO ddlDTO) throws Throwable {
try {
List<ModifyAttributeInfo> changedList = new ArrayList<>();
if (!CollectionUtils.isEmpty(ddlDTO.getBtmTypeList())) {
@@ -996,7 +996,7 @@
R<List<ModifyAttributeInfo>> result = R.success("鏁版嵁搴撴搷浣滄垚鍔�");
result.setData(changedList);
return result;
- } catch (VciBaseException e) {
+ } catch (Exception e) {
try {
// 寤鸿〃澶辫触鏈夊紓甯革紝鎹曡幏鍚庤繑鍥烇紝骞堕噴鏀剧嚎绋嬩腑鐨勫唴瀹�
if (!CollectionUtils.isEmpty(ddlDTO.getBtmTypeList())) {
@@ -1009,8 +1009,6 @@
}catch (ServiceException e2){
throw new RuntimeException(e2.getMessage());
}
- } catch (ServiceException e) {
- throw new RuntimeException(e.getMessage());
}
}
--
Gitblit v1.9.3