From 89e0771dbaba5678debfc783a4359fb36730b812 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 31 一月 2024 12:14:43 +0800
Subject: [PATCH] bug列表296首页统计查询配置方式调整一下，配置方式和主数据授权按钮查询冲突，业务类型提示信息修改
---
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 651433a..fe24a1a 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
@@ -1,6 +1,5 @@
package com.vci.ubcs.ddl.service.impl;
-
import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
import com.vci.ubcs.ddl.bo.DdlTableBO;
@@ -33,8 +32,8 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
+import java.rmi.ServerException;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
@@ -81,25 +80,25 @@
private final Map<String, LinkTypeVO> idLinkMap = new ConcurrentHashMap<>();
- private void putBtm(@NotNull BtmTypeVO... voList) throws Throwable {
+ private void putBtm(@NotNull BtmTypeVO... voList) throws ServiceException {
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 Throwable("涓氬姟绫诲瀷:[" + collect + "]姝ｅ湪琚叾浠栫敤鎴锋搷浣�");
+ throw new ServiceException("涓氬姟绫诲瀷:[" + collect + "]姝ｅ湪琚叾浠栫敤鎴锋搷浣�");
}
}
- private void putLink(@NotNull LinkTypeVO... voList) throws Throwable {
+ private void putLink(@NotNull LinkTypeVO... voList) throws ServiceException {
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 Throwable("閾炬帴绫诲瀷:[" + collect + "]姝ｅ湪琚叾浠栫敤鎴锋搷浣�");
+ throw new ServiceException("閾炬帴绫诲瀷:[" + collect + "]姝ｅ湪琚叾浠栫敤鎴锋搷浣�");
}
}
@@ -765,9 +764,9 @@
if (StringUtils.isNotBlank(s.getModifyAttributes()) || StringUtils.isNotBlank(s.getDeleteAttributes())) {
//闇�瑕佸幓鍒ゆ柇鏄惁鍙互鏇存敼
if (checkTableHasDataByTableName(s.getTableName())) {
- //鏈夋暟鎹殑璇濓紝寰楅渶瑕佸垽鏂睘鎬ф槸鍚﹀彲浠ヤ慨鏀�
+ //鏈夋暟鎹殑璇濓紝寰楅渶瑕佸垽鏂睘鎬ф槸鍚﹀彲浠ュ垹闄�
if (StringUtils.isNotBlank(s.getDeleteAttributes())) {
- s.setHandleResult("琛ㄦ牸瀛樺湪鏁版嵁锛屼笉鍏佽鍒犻櫎瀛楁");
+ s.setHandleResult("琛ㄦ牸瀛樺湪鏁版嵁锛屼笉鍏佽鍒犻櫎"+ s.getDeleteAttributes() +"瀛楁");
return;
}
List<DdlTableInDataBaseBO> columnInDbList = selectTableColumnInfo(s.getTableName());
@@ -976,7 +975,7 @@
* @return 鎵ц缁撴灉
*/
@Override
- public R<List<ModifyAttributeInfo>> submit(BtmAndLinkTypeDdlDTO ddlDTO) throws Throwable {
+ public R<List<ModifyAttributeInfo>> submit(BtmAndLinkTypeDdlDTO ddlDTO) throws ServerException {
try {
List<ModifyAttributeInfo> changedList = new ArrayList<>();
if (!CollectionUtils.isEmpty(ddlDTO.getBtmTypeList())) {
@@ -991,8 +990,13 @@
changedList.addAll(checkDifferent(null,linkTypeList));
removeLink(linkTypeList.toArray(new LinkTypeVO[0]));
}
- String msg = changedList.isEmpty() ? "鏁版嵁搴撴搷浣滄垚鍔�" : changedList.get(0).getHandleResult();
- R<List<ModifyAttributeInfo>> result = R.success(msg);
+ String msg = "鏁版嵁搴撴搷浣滄垚鍔�";
+ R<List<ModifyAttributeInfo>> result = new R<>();
+ if((!changedList.isEmpty())&&Func.isEmpty(changedList.get(0).getHandleResult())){
+ result = R.success(msg);
+ }else {
+ result = R.fail(changedList.get(0).getHandleResult());
+ }
result.setData(changedList);
return result;
} catch (Exception e) {
--
Gitblit v1.9.3