From f07aca58c4e1d96c8e75c90b021b00c593bcffff Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 28 五月 2024 11:36:17 +0800
Subject: [PATCH] 1、平台接口修改以及web端后台的修改。 2、对平台的更新jar包上传。

---
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
index 3099962..5896187 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
@@ -1,7 +1,8 @@
 package com.vci.web.service.impl;
 
 import com.vci.client.common.providers.ServiceProvider;
-import com.vci.corba.common.VCIError;
+import com.vci.corba.common.PLException;
+import com.vci.corba.omd.btm.BizType;
 import com.vci.starter.web.annotation.log.VciUnLog;
 import com.vci.starter.web.enumpck.BooleanEnum;
 import com.vci.starter.web.exception.VciBaseException;
@@ -23,7 +24,6 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import com.vci.corba.omd.btm.BtmItem;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -91,9 +91,10 @@
     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()));
-        } catch (VCIError vciError) {
-           throw WebUtil.getVciBaseException(vciError);
+//            return btmDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getBTMService().getAllBtmItem("")).collect(Collectors.toList()));
+            return btmDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getBTMService().getBizTypes("")).collect(Collectors.toList()));
+        }  catch (PLException e) {
+            throw new RuntimeException(e);
         }
     }
 
@@ -116,7 +117,7 @@
      * @return 鏄剧ず瀵硅薄
      */
     @Override
-    public List<OsBtmTypeVO> btmDO2VOs(Collection<BtmItem> btmItems) {
+    public List<OsBtmTypeVO> btmDO2VOs(Collection<BizType> btmItems) {
         List<OsBtmTypeVO> VOS = new ArrayList<>();
         Optional.ofNullable(btmItems).orElseGet(()->new ArrayList<>()).stream().forEach(btmItem -> {
             OsBtmTypeVO vo = btmDO2VO(btmItem);
@@ -132,7 +133,7 @@
      * @return 鏄剧ず瀵硅薄
      */
     @Override
-    public OsBtmTypeVO btmDO2VO(BtmItem btmItem) {
+    public OsBtmTypeVO btmDO2VO(BizType btmItem) {
         OsBtmTypeVO vo = new OsBtmTypeVO();
         if(btmItem !=null){
             vo.setOid(btmItem.oid);

--
Gitblit v1.9.3