From 247aa6397ebdb5249a1213af11aaaf560568b0c3 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期五, 02 八月 2024 15:43:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 89 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
index 9ec152c..ef49c4b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
@@ -1,8 +1,10 @@
package com.vci.web.service.impl;
-import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
+import com.vci.corba.omd.atm.AttributeDef;
import com.vci.corba.omd.btm.BizType;
+import com.vci.corba.omd.ltm.LinkType;
+import com.vci.pagemodel.*;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.exception.VciBaseException;
@@ -11,10 +13,10 @@
import com.vci.starter.web.util.BeanUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.pageModel.*;
import com.vci.web.service.*;
import com.vci.web.util.ConcurrentDateFormat;
import com.vci.web.util.Func;
+import com.vci.web.util.PlatformClientUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,8 +44,8 @@
/**
* 骞冲彴鐨勮皟鐢ㄥ伐鍏风被
*/
- //@Autowired
- //private PlatformClientUtil platformClientUtil;
+ @Autowired
+ private PlatformClientUtil platformClientUtil;
/**
* 灞炴�х殑鏈嶅姟
@@ -86,9 +88,7 @@
@VciUnLog
public List<OsBtmTypeVO> selectAllBtm() {
try {
- // return btmDO2VOs(Arrays.stream(platformClientUtil.getBtmService().getAllBtmItem("")).collect(Collectors.toList()));
-// return btmDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getBTMService().getAllBtmItem("")).collect(Collectors.toList()));
- return btmDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getBTMService().getBizTypes("")).collect(Collectors.toList()));
+ return btmDO2VOs(Arrays.stream(platformClientUtil.getBtmService().getBizTypes("")).collect(Collectors.toList()));
} catch (PLException e) {
throw new RuntimeException(e);
}
@@ -338,6 +338,88 @@
}
/**
+ * 淇敼涓氬姟绫诲瀷涓搴斿睘鎬у悕鐨勫睘鎬�
+ * @param apName
+ * @return
+ * @throws PLException
+ */
+ @Override
+ public boolean alterAp(String apName) throws PLException {
+ String[] btmNames = null;
+ List<String> btmNameList = new ArrayList<String>();
+ AttributeDef abItem = null;
+ try {
+ abItem = platformClientUtil.getAttributeService().getAttributeDefByName(apName);
+ } catch (PLException e1) {
+ e1.printStackTrace();
+ }
+ if(abItem == null || abItem.equals("")){
+ return true;
+ }
+ try {
+ btmNames = platformClientUtil.getBtmService().getBTNamesByAPName(apName);
+ } catch (PLException e) {
+ e.printStackTrace();
+ }
+ if(btmNames == null || btmNames.length <= 0){
+ return true;
+ }
+
+ btmNameList = Arrays.asList(btmNames);
+ for(Iterator<String> i = btmNameList.iterator(); i.hasNext();){
+ String btmName = i.next();
+ try {
+ platformClientUtil.getBtmService().modifyBTAttribute(btmName, apName);
+ } catch (PLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ String erreMsg = "璋冩暣涓氬姟绫诲瀷涓��"+apName+"銆戝睘鎬ф椂鍑虹幇閿欒锛屽師鍥狅細"+e.getMessage();
+ logger.error(erreMsg);
+ throw new PLException("500",new String[]{erreMsg});
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 鍒ゆ柇璇ュ睘鎬ф槸鍚﹀凡缁忓湪涓氬姟绫诲瀷涓骇鐢熶簡鏁版嵁
+ * @param abName
+ * @return
+ * @throws PLException
+ */
+ @Override
+ public boolean hasInstance(String abName) throws PLException {
+ String[] btmNames = platformClientUtil.getBtmService().getBTNamesByAPName(abName);
+ if(btmNames == null || btmNames.length == 0){
+ return false;
+ }
+ for(int i = 0; i < btmNames.length; i++){
+ String btmName = btmNames[i];
+ boolean flag;
+ flag = platformClientUtil.getBtmService().hasData(btmName);
+ if(flag){
+ return flag;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 鑾峰彇鍚嶅瓧浠ilter寮�濮嬬殑涓氬姟绫诲瀷(for 鏌ヨ)锛屼富瑕佺敤浜庡睘鎬ф睜鐨勪笟鍔$被鍨嬮�夋嫨瀵硅瘽妗�
+ * 鑾峰彇鍏ㄩ儴涓氬姟绫诲瀷锛屼紶鍙俧ilter涓�""
+ * @param btmName
+ * @return
+ * @throws PLException
+ */
+ @Override
+ public BizType[] getBizTypes(String btmName) throws PLException {
+ if(null == btmName){
+ btmName = "";
+ }
+ return platformClientUtil.getBtmService().getBizTypes(btmName);
+ }
+
+ /**
* 鍙傜収涓氬姟绫诲瀷
*
* @param conditionMap 鏌ヨ鏉′欢
--
Gitblit v1.9.3