Merge remote-tracking branch 'origin/master'

 Bin/lib/client/plt-client.jar

Binary files differ

 Bin/lib/client/plt-clientbase.jar

Binary files differ

 Bin/lib/common/plt-common.jar

Binary files differ

 Bin/lib/common/plt-slice.jar

Binary files differ

 Bin/lib/service/BOFService.jar

Binary files differ

 Bin/lib/service/CacheService.jar

Binary files differ

 Bin/lib/service/FrameService.jar

Binary files differ

 Bin/lib/service/LogService.jar

Binary files differ

 Bin/lib/service/MsgService.jar

Binary files differ

 Bin/lib/service/OMDService.jar

Binary files differ

 Bin/lib/service/OQService.jar

Binary files differ

 Bin/lib/service/UIService.jar

Binary files differ

 Bin/lib/service/VciServiceMain.jar

Binary files differ

 Bin/lib/service/VolumeService.jar

Binary files differ

 Bin/lib/service/WFPlugins.jar

Binary files differ

 Bin/lib/service/WFService.jar

Binary files differ

 Bin/lib/thrid/jbpm-4.3.2.jar

Binary files differ

 Source/plt-web/plt-web-parent/plt-poi/pom.xml

ÎļþÒÑɾ³ý

 Source/plt-web/plt-web-parent/plt-web-api/pom.xml

@@ -22,10 +22,6 @@
            <artifactId>plt-web-base</artifactId>
        </dependency>
        <dependency>
            <groupId>com.vci</groupId>
            <artifactId>plt-poi</artifactId>
        </dependency>
        <dependency>
            <groupId>org.apache.ant</groupId>
            <artifactId>ant</artifactId>
            <version>1.8.2</version>

 Source/plt-web/plt-web-parent/plt-web-base/pom.xml

@@ -15,6 +15,7 @@
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <poi.version>4.1.0</poi.version>
    </properties>

    <dependencies>
@@ -90,6 +91,36 @@
            <artifactId>jackson-core</artifactId>
            <version>2.13.3</version>
        </dependency>

        <!--读取work-->
        <dependency>
            <groupId>com.aspose</groupId>
            <artifactId>aspose-words</artifactId>
            <version>18.10.RELEASE</version>
        </dependency>

        <!--需要读取excel-->
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi</artifactId>
            <version>${poi.version}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-excelant</artifactId>
            <version>${poi.version}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml-schemas</artifactId>
            <version>${poi.version}</version>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi-ooxml</artifactId>
            <version>${poi.version}</version>
        </dependency>

    </dependencies>

</project>

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/aspose/words/zzZLS.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/annotation/ExcelColumn.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/annotation/ExcelRefer.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/annotation/ExcelTitle.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/AppendDataExcelOption.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/DownloadTempOption.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/ExcelColumnMap.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/ReadExcelOption.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/SheetDataSet.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/SheetRowData.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/VciCellStyle.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/VciPoiFont.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/WriteExcelData.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/bo/WriteExcelOption.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/constant/ExcelLangCodeConstant.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/util/ExcelUtil.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/util/PoiImportProcesser.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/poi/util/PoiTemplateProcesser.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/word/bo/WordMergeListDataSource.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/word/bo/WordMergeStartTableDataBO.java

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/word/util/WordUtil.java

 Source/plt-web/plt-web-parent/plt-web/pom.xml

@@ -39,24 +39,6 @@
                    <groupId>com.vci</groupId>
                    <artifactId>plt-web-base</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>com.vci</groupId>
                    <artifactId>plt-poi</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.vci</groupId>
            <artifactId>plt-poi</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-starter-thymeleaf</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>com.vci</groupId>
                    <artifactId>plt-web-base</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/test/DataTestController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,126 @@
package com.vci.test;

import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.Tree;
import com.vci.web.service.WebBoServiceI;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @Description æµ‹è¯•æŽ§åˆ¶å™¨
 * @Author dangsn
 * @Date 2024/11/14 10:08
 */
@RestController
@RequestMapping("/dataTestController")
public class DataTestController {

    @Resource
    private WebBoServiceI boServiceI;

    /**
     * èŽ·å–产品
     * @return
     */
    @VciUnCheckRight
    @GetMapping("/getProduct")
    public BaseResult getProduct(){
        String sql = "select * from platformbtm_workcontext where workcontexttype = 'product'";
        List<Map> productList = boServiceI.queryByOnlySqlForMap(sql);
        BaseResult baseResult = new BaseResult();
        baseResult.setSuccess(true);
        baseResult.setCode(200);
        baseResult.setData(productList);
        return baseResult;
    }

    /**
     * èŽ·å–ebom信息
     * @param parentOid ä¸Šçº§ä¿¡æ¯
     * @return
     */
    @VciUnCheckRight
    @GetMapping("/getEbomInfo")
    public BaseResult getEbomInfo(String productNo, String productOid, String parentOid){
        if(StringUtils.isBlank(productNo)){
            return BaseResult.fail("产品编号为空！");
        }
        if(StringUtils.isBlank(productOid)){
            return BaseResult.fail("产品主键为空！");
        }
        BaseResult baseResult = new BaseResult();
        List<Map> ebomList;
        if(StringUtils.isBlank(parentOid)){
            String sql = "select * from platformbtm_part t where t.ownproduct = '"+productOid+"' and t.code = '"+productNo+"'";
            ebomList = boServiceI.queryByOnlySqlForMap(sql);

        }else{
            String sql = "select p.*,e.oid as eoid from platformbtm_part p left join platformlt_ebom e on p.oid = e.t_oid \n" +
                    "where e.f_oid = '"+parentOid+"' and e.workcontextoid = '"+productOid+"' \n" +
                    "and p.islastr = '1' and p.islastv = '1' order by p.code asc";
            ebomList = boServiceI.queryByOnlySqlForMap(sql);
        }
        List<Tree> treeList = new ArrayList<>();
        if(!CollectionUtils.isEmpty(ebomList)){
            for(Map ebom : ebomList){
                String oid = ebom.get("OID").toString();
                String id = ebom.get("CODE").toString();
                String name = ebom.get("NAME").toString();
                String revisionvalue = ebom.get("REVISIONVALUE").toString();
                String versionrule = ebom.get("VERSIONRULE").toString();
                String versionvalue = ebom.get("VERSIONVALUE").toString();
                String parttype = ebom.get("PARTTYPE").toString();
                String lcStatus = ebom.get("LCSTATUS").toString();
                String parttypetext = "";
                String lcStatusText = "";
                if(parttype.equals("20")){
                    parttypetext = "产品";
                }
                if(parttype.equals("6")){
                    parttypetext = "装配件";
                }
                if(parttype.equals("7")){
                    parttypetext = "零件";
                }
                if(parttype.equals("8")){
                    parttypetext = "标准件";
                }
                if(lcStatus.equals("Editing")){
                    lcStatusText = "编辑中";
                }
                if(lcStatus.equals("Published")){
                    lcStatusText = "已发布";
                }
                Tree tree = new Tree();
                tree.setLeaf(false);
                tree.setExpanded(false);
                tree.setOid(oid);
                tree.setId(id);
                tree.setText(id+" "+name+"["+parttypetext+"]["+revisionvalue+versionrule+versionvalue+"]【"+lcStatusText+"】");
                if(StringUtils.isNotBlank(parentOid)){
                    tree.setParentId(parentOid);
                }
                if(ebom.containsKey("EOID")){
                    Map<String, String> atrrMap = new HashMap<>();
                    atrrMap.put("eoid", ebom.get("EOID").toString());
                    tree.setAttributes(atrrMap);
                }
                treeList.add(tree);
            }
        }
        baseResult.setData(treeList);
        baseResult.setSuccess(true);
        baseResult.setCode(200);
        return baseResult;
    }
}

 Source/plt-web/plt-web-parent/pom.xml

@@ -13,7 +13,6 @@
        <module>plt-web</module>
        <module>plt-starter</module>
        <module>plt-web-base</module>
        <module>plt-poi</module>
        <module>plt-web-api</module>
    </modules>

@@ -156,11 +155,6 @@
                <artifactId>plt-web-base</artifactId>
                <version>2024.1-SNAPSHOT</version>
            </dependency>
            <dependency>
                <groupId>com.vci</groupId>
                <artifactId>plt-poi</artifactId>
                <version>2024.1-SNAPSHOT</version>
            </dependency>

            <!--spring相关-->
            <dependency>
@@ -196,13 +190,21 @@

    <!-- Maven分发构件的位置，私服地址 -->
    <distributionManagement>
        <repository>
        <!--<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>-->
        <repository>
            <id>rdc-releases</id>
            <url>http://192.168.0.66:9000/repository/maven-releases/</url>
        </repository>
        <snapshotRepository>
            <id>rdc-snapshots</id>
            <url>http://192.168.0.66:9000/repository/maven-snapshots/</url>
        </snapshotRepository>
    </distributionManagement>