dangsn
2024-11-14 744819bfd6accd29a80a3494567cc2093cf3affa
1、jar包更新
2、UI测试接口。获取产品和获取ebom
已修改17个文件
已添加1个文件
126 ■■■■■ 文件已修改
Bin/lib/client/plt-client.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/client/plt-clientbase.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/common/plt-common.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/common/plt-slice.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/service/BOFService.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/service/CacheService.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/service/FrameService.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/service/LogService.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/service/MsgService.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/service/OMDService.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/service/OQService.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/service/UIService.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/service/VciServiceMain.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/service/VolumeService.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/service/WFPlugins.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/service/WFService.jar 补丁 | 查看 | 原始文档 | blame | 历史
Bin/lib/thrid/jbpm-4.3.2.jar 补丁 | 查看 | 原始文档 | blame | 历史
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/test/DataTestController.java 126 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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-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;
    }
}