From d560ea0f6d13c6bc309cd41603fe4bc8914a2c12 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 28 九月 2023 11:31:15 +0800
Subject: [PATCH] 集成接口参数配置修改
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java | 18 +++++++++---------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 2 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 3 ++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 2 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmEngineConstant.java | 2 +-
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/data.xml | 27 +++++++++++++++++++++++++++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/result.xml | 5 +++++
7 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/data.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/data.xml
new file mode 100644
index 0000000..f6b1b5e
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/data.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<data>
+ <object itemId="" code="0020010012000000003330010243" status="Released" library="wupin" classCode="020201">
+ <pro filedName="xiaoshouwl" outname="閿�鍞墿鏂�" filedValue="22"/>
+ <pro filedName="xinghaoguige" outname="瑙勬牸鍨嬪彿" filedValue=""/>
+ <pro filedName="createtime" outname="鍒涘缓鏃堕棿" filedValue="2023-09-05 21:37:37.668"/>
+ <pro filedName="creator" outname="鍒涘缓浜�" filedValue="0"/>
+ <pro filedName="lastmodifier" outname="鏈�鍚庝慨鏀逛汉" filedValue="0"/>
+ <pro filedName="secondfl" outname="浜岀骇绠＄悊鍒嗙被" filedValue="鏍囧噯浠�"/>
+ <pro filedName="caigouwl" outname="閲囪喘鐗╂枡" filedValue="22"/>
+ <pro filedName="tuhao" outname="鍥惧彿" filedValue="2"/>
+ <pro filedName="kucunwl" outname="搴撳瓨鐗╂枡" filedValue="2"/>
+ <pro filedName="shifoupihaoguanli" outname="鏄惁鎵瑰彿绠＄悊" filedValue="22"/>
+ <pro filedName="thrifl" outname="涓夌骇绠＄悊鍒嗙被" filedValue="閿�"/>
+ <pro filedName="revisionvalue" outname="鐗堟湰" filedValue=""/>
+ <pro filedName="firstfl" outname="涓�绾х鐞嗗垎绫�" filedValue="鐗╁搧"/>
+ <pro filedName="chukufangshi" outname="鍑哄簱鏂瑰紡" filedValue=""/>
+ <pro filedName="hesuanfenlei" outname="鏍哥畻鍒嗙被" filedValue="F06FFFA8-F334-0CB6-9147-4A14DCC09B08"/>
+ <pro filedName="jiliangdw" outname="璁￠噺鍗曚綅" filedValue="1673904662408990721"/>
+ <pro filedName="oldcode" outname="鍘嗗彶缂栧彿" filedValue="22"/>
+ <pro filedName="materialclassify" outname="鐗╂枡鍒嗙被" filedValue="020201"/>
+ <pro filedName="id" outname="浠ｅ彿" filedValue="0020010012000000003330010243"/>
+ <pro filedName="morengongys" outname="渚涘簲鍟�" filedValue=""/>
+ <pro filedName="lcstatus" outname="鐘舵��" filedValue="Released"/>
+ <pro filedName="zuixiaoqiding" outname="鏈�灏忚捣璁㈤噺" filedValue="2"/>
+ </object>
+</data>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/result.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/result.xml
new file mode 100644
index 0000000..e2a957e
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/result.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<data>
+ <object erroid="0" msg="娴嬭瘯鎴愬姛" code="0201040133" itemId="0000001">
+ </object>
+</data>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java
index ecbe6cc..7dacd4b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java
@@ -14,7 +14,7 @@
* 鏁版嵁oid
*/
@XStreamAsAttribute
- private String oid;
+ private String itemid;
/***
* 閿欒鏍囪瘑
*/
@@ -34,15 +34,15 @@
this.code = code;
}
- public String getOid() {
- return oid;
- }
+ public String getItemid() {
+ return itemid;
+ }
- public void setOid(String oid) {
- this.oid = oid;
- }
+ public void setItemid(String itemid) {
+ this.itemid = itemid;
+ }
- public String getErroid() {
+ public String getErroid() {
return erroid;
}
@@ -62,7 +62,7 @@
public String toString() {
return "ResultNodeObjectDTO{" +
"code='" + code + '\'' +
- ", oid='" + oid + '\'' +
+ ", oid='" + itemid + '\'' +
", erroid='" + erroid + '\'' +
", msg='" + msg + '\'' +
'}';
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmEngineConstant.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmEngineConstant.java
index 1662da4..da07ebe 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmEngineConstant.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmEngineConstant.java
@@ -42,7 +42,7 @@
/**
* 鐮佹鐨勯暱搴︾殑瀛楁锛�-杩欎笉鏄暟鎹簱閲岀殑瀛楁
*/
- public static final String CODE_SEC_LENGTH_FIELD = "codeSecLengthField";
+ public static final String CODE_SEC_LENGTH_FIELD = "codeseclengthfield";
/**
* 瀵嗙骇鐨勫瓧娈�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
index 470898d..a1a876f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -516,7 +516,7 @@
resultNodeObjectDTO.setErroid("1");
resultNodeObjectDTO.setMsg(msg);
resultNodeObjectDTO.setCode(dockingSystemConfig.getPushType().equalsIgnoreCase("2")?dockingTask.getClassifyId():dockingTask.getId());
- resultNodeObjectDTO.setOid(dockingTask.getBtmOid());
+ resultNodeObjectDTO.setItemid(dockingTask.getBtmOid());
resultNodeObjectDTOS.add(resultNodeObjectDTO);
}finally {
boolean isSend = false;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
index e5fb2ce..e0ac426 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -645,7 +645,7 @@
resultNodeObjectDTO.setErroid("1");
resultNodeObjectDTO.setMsg(msg);
resultNodeObjectDTO.setCode(dockingSystemConfigDTO.getClassifyId());
- resultNodeObjectDTO.setOid(dockingSystemConfigDTO.getClassifyOid());
+ resultNodeObjectDTO.setItemid(dockingSystemConfigDTO.getClassifyOid());
resultNodeObjectDTOS.add(resultNodeObjectDTO);
}finally {
boolean isSend = false;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 0befb67..581d243 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -1394,7 +1394,8 @@
//set缁欒〃鏍奸厤缃睘鎬�
uiFormReferVO.setTableConfig(uiTableConfigVO);
//瀛楁鍚嶄笉涓�鑷达紝闇�瑕佹墜鍔╯et
- uiFormReferVO.setMuti(Func.toBoolean(codeReferConfig.getIsMuti()));
+
+ uiFormReferVO.setMuti(StringUtils.isBlank(codeReferConfig.getIsMuti())?false:true);
uiFormReferVO.setInitSort(new UIFieldSortVO(codeReferConfig.getSortField(),codeReferConfig.getSortType()));
// 绛涢�夋潯浠�
HashMap<String, String> whereMap = new HashMap<>();
--
Gitblit v1.9.3