From 744819bfd6accd29a80a3494567cc2093cf3affa Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期四, 14 十一月 2024 15:27:46 +0800
Subject: [PATCH] 1、jar包更新 2、UI测试接口。获取产品和获取ebom
---
Bin/lib/service/OQService.jar | 0
Bin/lib/service/VciServiceMain.jar | 0
Bin/lib/client/plt-clientbase.jar | 0
Bin/lib/service/CacheService.jar | 0
Bin/lib/service/FrameService.jar | 0
Bin/lib/common/plt-slice.jar | 0
Bin/lib/service/OMDService.jar | 0
Bin/lib/service/WFService.jar | 0
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/test/DataTestController.java | 126 ++++++++++++++++++++++++++++++++++++++++++
Bin/lib/service/MsgService.jar | 0
Bin/lib/service/LogService.jar | 0
Bin/lib/service/WFPlugins.jar | 0
Bin/lib/thrid/jbpm-4.3.2.jar | 0
Bin/lib/service/UIService.jar | 0
Bin/lib/service/VolumeService.jar | 0
Bin/lib/service/BOFService.jar | 0
Bin/lib/common/plt-common.jar | 0
Bin/lib/client/plt-client.jar | 0
18 files changed, 126 insertions(+), 0 deletions(-)
diff --git a/Bin/lib/client/plt-client.jar b/Bin/lib/client/plt-client.jar
index 915c4c6..0ed34ed 100644
--- a/Bin/lib/client/plt-client.jar
+++ b/Bin/lib/client/plt-client.jar
Binary files differ
diff --git a/Bin/lib/client/plt-clientbase.jar b/Bin/lib/client/plt-clientbase.jar
index 5f4462c..f5fe71f 100644
--- a/Bin/lib/client/plt-clientbase.jar
+++ b/Bin/lib/client/plt-clientbase.jar
Binary files differ
diff --git a/Bin/lib/common/plt-common.jar b/Bin/lib/common/plt-common.jar
index c48fa29..c40fb28 100644
--- a/Bin/lib/common/plt-common.jar
+++ b/Bin/lib/common/plt-common.jar
Binary files differ
diff --git a/Bin/lib/common/plt-slice.jar b/Bin/lib/common/plt-slice.jar
index 6468ff3..9f1c115 100644
--- a/Bin/lib/common/plt-slice.jar
+++ b/Bin/lib/common/plt-slice.jar
Binary files differ
diff --git a/Bin/lib/service/BOFService.jar b/Bin/lib/service/BOFService.jar
index 129963c..c8d384c 100644
--- a/Bin/lib/service/BOFService.jar
+++ b/Bin/lib/service/BOFService.jar
Binary files differ
diff --git a/Bin/lib/service/CacheService.jar b/Bin/lib/service/CacheService.jar
index acb49a9..c43c863 100644
--- a/Bin/lib/service/CacheService.jar
+++ b/Bin/lib/service/CacheService.jar
Binary files differ
diff --git a/Bin/lib/service/FrameService.jar b/Bin/lib/service/FrameService.jar
index 45b254b..2ee8f0b 100644
--- a/Bin/lib/service/FrameService.jar
+++ b/Bin/lib/service/FrameService.jar
Binary files differ
diff --git a/Bin/lib/service/LogService.jar b/Bin/lib/service/LogService.jar
index d2e5841..553698c 100644
--- a/Bin/lib/service/LogService.jar
+++ b/Bin/lib/service/LogService.jar
Binary files differ
diff --git a/Bin/lib/service/MsgService.jar b/Bin/lib/service/MsgService.jar
index 5dd90e6..4b9e0bc 100644
--- a/Bin/lib/service/MsgService.jar
+++ b/Bin/lib/service/MsgService.jar
Binary files differ
diff --git a/Bin/lib/service/OMDService.jar b/Bin/lib/service/OMDService.jar
index e77decb..d04f097 100644
--- a/Bin/lib/service/OMDService.jar
+++ b/Bin/lib/service/OMDService.jar
Binary files differ
diff --git a/Bin/lib/service/OQService.jar b/Bin/lib/service/OQService.jar
index 3d8f673..7bb7d8f 100644
--- a/Bin/lib/service/OQService.jar
+++ b/Bin/lib/service/OQService.jar
Binary files differ
diff --git a/Bin/lib/service/UIService.jar b/Bin/lib/service/UIService.jar
index 845bbd9..29d7bd8 100644
--- a/Bin/lib/service/UIService.jar
+++ b/Bin/lib/service/UIService.jar
Binary files differ
diff --git a/Bin/lib/service/VciServiceMain.jar b/Bin/lib/service/VciServiceMain.jar
index 03229dc..1ee0cc9 100644
--- a/Bin/lib/service/VciServiceMain.jar
+++ b/Bin/lib/service/VciServiceMain.jar
Binary files differ
diff --git a/Bin/lib/service/VolumeService.jar b/Bin/lib/service/VolumeService.jar
index 52dd1dd..77b3b71 100644
--- a/Bin/lib/service/VolumeService.jar
+++ b/Bin/lib/service/VolumeService.jar
Binary files differ
diff --git a/Bin/lib/service/WFPlugins.jar b/Bin/lib/service/WFPlugins.jar
index 08ac518..18a0f12 100644
--- a/Bin/lib/service/WFPlugins.jar
+++ b/Bin/lib/service/WFPlugins.jar
Binary files differ
diff --git a/Bin/lib/service/WFService.jar b/Bin/lib/service/WFService.jar
index 6146f02..91a037f 100644
--- a/Bin/lib/service/WFService.jar
+++ b/Bin/lib/service/WFService.jar
Binary files differ
diff --git a/Bin/lib/thrid/jbpm-4.3.2.jar b/Bin/lib/thrid/jbpm-4.3.2.jar
index 49959a6..21ccd58 100644
--- a/Bin/lib/thrid/jbpm-4.3.2.jar
+++ b/Bin/lib/thrid/jbpm-4.3.2.jar
Binary files differ
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/test/DataTestController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/test/DataTestController.java
new file mode 100644
index 0000000..f71bb1b
--- /dev/null
+++ b/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;
+ }
+}
--
Gitblit v1.9.3