田源
2024-04-07 a60abbdf6b963cf52113eec518aaeef72a6c99f5
Merge remote-tracking branch 'origin/master'
已修改5个文件
77 ■■■■■ 文件已修改
Source/platformProject/pom.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/platformProject/vci-platform-server-starter/pom.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/platformProject/vci-platform-web/pom.xml 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIDataController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/platformProject/pom.xml
@@ -2,12 +2,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <modules>
        <module>vci-platform-web</module>
        <module>vci-platform-starter</module>
        <module>vci-platform-server-starter</module>
    </modules>
    <groupId>com.vci</groupId>
    <artifactId>platform-parent</artifactId>
    <version>2022.1-SNAPSHOT</version>
@@ -18,7 +21,8 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <java.version>1.8</java.version>
    </properties>
    <distributionManagement>
    <!-- <distributionManagement>
        <repository>
            <id>rdc-releases</id>
            <url>http://nexus.vci-tech.com:9000/repository/maven-releases/</url>
@@ -27,7 +31,19 @@
            <id>rdc-snapshots</id>
            <url>http://nexus.vci-tech.com:9000/repository/maven-snapshots/</url>
        </snapshotRepository>
    </distributionManagement>-->
    <!-- Maven分发构件的位置,私服地址 -->
    <distributionManagement>
        <repository>
            <id>rdc-releases</id>
            <url>http://dev.yunkeruida.top:9000/repository/maven-releases/</url>
        </repository>
        <snapshotRepository>
            <id>rdc-snapshots</id>
            <url>http://dev.yunkeruida.top:9000/repository/maven-snapshots/</url>
        </snapshotRepository>
    </distributionManagement>
    <dependencyManagement>
        <dependencies>
            <dependency>
Source/platformProject/vci-platform-server-starter/pom.xml
@@ -104,7 +104,6 @@
            <artifactId>UIService-server</artifactId>
            <version>2024.RELEASE</version>
            <scope>system</scope>
            <systemPath>D:/work/newplatform/Bin/lib/service/UIService.jar</systemPath>
        </dependency>
        <dependency><!--UI工厂,部分jar引用-->
            <groupId>com.vci.platform</groupId>
Source/platformProject/vci-platform-web/pom.xml
@@ -11,7 +11,7 @@
    <artifactId>vci-platform-web</artifactId>
   <dependencies>
    <dependencies>
       <dependency>
           <groupId>com.vci</groupId>
           <artifactId>vci-starter-parent</artifactId>
@@ -21,9 +21,7 @@
       <dependency>
           <groupId>com.vci.corba</groupId>
           <artifactId>plt-slice</artifactId>
           <version>1.0</version>
           <scope>system</scope>
           <systemPath>D:/work/newplatform/Bin/lib/common/plt-slice.jar</systemPath>
           <version>1.0.RELEASE</version>
       </dependency>
       <dependency>
@@ -154,24 +152,18 @@
       <dependency>
           <groupId>com.vci.client</groupId>
           <artifactId>plt-clientbase</artifactId>
           <version>1.0</version>
           <scope>system</scope>
           <systemPath>D:/work/newplatform/Bin/lib/client/plt-clientbase.jar</systemPath>
           <version>1.0.RELEASE</version>
       </dependency>
       <dependency>
           <groupId>com.zeroc</groupId>
           <artifactId>icegridgui.jar</artifactId>
           <version>1.0</version>
           <scope>system</scope>
           <systemPath>D:/work/newplatform/Bin/lib/common/icegridgui.jar</systemPath>
           <artifactId>icegridgui</artifactId>
           <version>1.0.RELEASE</version>
       </dependency>
       <dependency>
           <groupId>com.vci.common</groupId>
           <artifactId>plt-common.jar</artifactId>
           <version>1.0</version>
           <scope>system</scope>
           <systemPath>D:/work/newplatform/Bin/lib/common/plt-common.jar</systemPath>
       </dependency>
        <dependency>
            <groupId>com.vci.common</groupId>
            <artifactId>plt-common</artifactId>
            <version>1.0.RELEASE</version>
        </dependency>
       <dependency>
           <groupId>com.vci</groupId>
           <artifactId>vci-platform-starter</artifactId>
@@ -250,4 +242,5 @@
        </plugins>
    </build>
</project>
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIDataController.java
@@ -1,5 +1,6 @@
package com.vci.web.controller;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.pagemodel.*;
import com.vci.web.dto.*;
@@ -64,6 +65,7 @@
     * @return 树的数据
     */
    @PostMapping("/getDataForTree")
    @VciUnCheckRight
    @VciBusinessLog(operateName = "树的查询",description = "${param.btmname}")
    public List<Tree> getDataForTree(UITreeQuery treeQuery){
        return uiDataService.getDataForTree(treeQuery);
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -1194,19 +1194,20 @@
        if(StringUtils.isBlank(componentOid)){
            return null;
        }
//        if(!QUERY_BY_CACHE){
//            try {
//                return uiComponentDO2VO(platformClientUtil.getPortalService().getPLPageDefinationById(componentOid),true);
//            } catch (VCIError vciError) {
//                throw WebUtil.getVciBaseException(vciError);
//            }
//        }else{
//            List<UIComponentVO> componentVOS = self.selectAllUIComponent();
//            List<UIComponentVO> componentVOList = Optional.ofNullable(componentVOS).orElseGet(() -> new ArrayList<>()).stream().filter(s -> s.getOid().equalsIgnoreCase(componentOid)).collect(Collectors.toList());
//            if(!CollectionUtils.isEmpty(componentVOList)){
//                return componentVOList.get(0);
//            }
//        }
        if(!QUERY_BY_CACHE){
            try {
                platformClientUtil.getPortalService().getPLPageDefinationById(componentOid);
                return uiComponentDO2VO(null,true);
            } catch (VCIError vciError) {
                throw WebUtil.getVciBaseException(vciError);
            }
        }else{
            List<UIComponentVO> componentVOS = self.selectAllUIComponent();
            List<UIComponentVO> componentVOList = Optional.ofNullable(componentVOS).orElseGet(() -> new ArrayList<>()).stream().filter(s -> s.getOid().equalsIgnoreCase(componentOid)).collect(Collectors.toList());
            if(!CollectionUtils.isEmpty(componentVOList)){
                return componentVOList.get(0);
            }
        }
        return null;
    }