From 2a88f1118840323953d0fd28bdf03787bfd655de Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 05 九月 2023 08:48:32 +0800
Subject: [PATCH] 接口管理模块属性对象改成驼峰形式,定时推送测试

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.xml  |   27 +++++++++
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java     |    6 +
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.json |  122 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 153 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.json
new file mode 100644
index 0000000..be1085d
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.json
@@ -0,0 +1,122 @@
+{
+    "data": {
+        "object": {
+            "code": "02010200028",
+            "status": "Released",
+            "library": "wupin",
+            "classCode": "020102",
+            "pro": [
+                {
+                    "filedName": "xiaoshouwl",
+                    "outname": "閿�鍞墿鏂�",
+                    "filedValue": "false"
+                },
+                {
+                    "filedName": "xinghaoguige",
+                    "outname": "瑙勬牸鍨嬪彿",
+                    "filedValue": ""
+                },
+                {
+                    "filedName": "createtime",
+                    "outname": "鍒涘缓鏃堕棿",
+                    "filedValue": ""
+                },
+                {
+                    "filedName": "creator",
+                    "outname": "鍒涘缓浜�",
+                    "filedValue": "weidy"
+                },
+                {
+                    "filedName": "lastmodifier",
+                    "outname": "鏈�鍚庝慨鏀逛汉",
+                    "filedValue": ""
+                },
+                {
+                    "filedName": "secondfl",
+                    "outname": "浜岀骇绠$悊鍒嗙被",
+                    "filedValue": "鍒嗙被鏍戜笂娌℃湁灞傜骇[none]"
+                },
+                {
+                    "filedName": "caigouwl",
+                    "outname": "閲囪喘鐗╂枡",
+                    "filedValue": "false"
+                },
+                {
+                    "filedName": "tuhao",
+                    "outname": "鍥惧彿",
+                    "filedValue": "TH-0033"
+                },
+                {
+                    "filedName": "kucunwl",
+                    "outname": "搴撳瓨鐗╂枡",
+                    "filedValue": "false"
+                },
+                {
+                    "filedName": "shifoupihaoguanli",
+                    "outname": "鏄惁鎵瑰彿绠$悊",
+                    "filedValue": "false"
+                },
+                {
+                    "filedName": "thrifl",
+                    "outname": "涓夌骇绠$悊鍒嗙被",
+                    "filedValue": "鍒嗙被鏍戜笂娌℃湁灞傜骇[none]"
+                },
+                {
+                    "filedName": "revisionvalue",
+                    "outname": "鐗堟湰",
+                    "filedValue": ""
+                },
+                {
+                    "filedName": "firstfl",
+                    "outname": "涓�绾х鐞嗗垎绫�",
+                    "filedValue": "鍒嗙被鏍戜笂娌℃湁灞傜骇[none]"
+                },
+                {
+                    "filedName": "chukufangshi",
+                    "outname": "鍑哄簱鏂瑰紡",
+                    "filedValue": "鍏堣繘鍏堝嚭"
+                },
+                {
+                    "filedName": "hesuanfenlei",
+                    "outname": "鏍哥畻鍒嗙被",
+                    "filedValue": ""
+                },
+                {
+                    "filedName": "jiliangdw",
+                    "outname": "璁¢噺鍗曚綅",
+                    "filedValue": ""
+                },
+                {
+                    "filedName": "oldcode",
+                    "outname": "鍘嗗彶缂栧彿",
+                    "filedValue": ""
+                },
+                {
+                    "filedName": "materialclassify",
+                    "outname": "鐗╂枡鍒嗙被",
+                    "filedValue": "020102"
+                },
+                {
+                    "filedName": "id",
+                    "outname": "浠e彿",
+                    "filedValue": "02010200028"
+                },
+                {
+                    "filedName": "morengongys",
+                    "outname": "渚涘簲鍟�",
+                    "filedValue": ""
+                },
+                {
+                    "filedName": "lcstatus",
+                    "outname": "鐘舵��",
+                    "filedValue": "Released"
+                },
+                {
+                    "filedName": "zuixiaoqiding",
+                    "outname": "鏈�灏忚捣璁㈤噺",
+                    "filedValue": ""
+                }
+            ]
+        }
+    }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.xml
new file mode 100644
index 0000000..b95f145
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<data>
+    <object code="02010200028" status="Released" library="wupin" classCode="020102">
+        <pro filedName="xiaoshouwl" outname="閿�鍞墿鏂�" filedValue="false"/>
+        <pro filedName="xinghaoguige" outname="瑙勬牸鍨嬪彿" filedValue=""/>
+        <pro filedName="createtime" outname="鍒涘缓鏃堕棿" filedValue=""/>
+        <pro filedName="creator" outname="鍒涘缓浜�" filedValue="weidy"/>
+        <pro filedName="lastmodifier" outname="鏈�鍚庝慨鏀逛汉" filedValue=""/>
+        <pro filedName="secondfl" outname="浜岀骇绠$悊鍒嗙被" filedValue="鍒嗙被鏍戜笂娌℃湁灞傜骇[none]"/>
+        <pro filedName="caigouwl" outname="閲囪喘鐗╂枡" filedValue="false"/>
+        <pro filedName="tuhao" outname="鍥惧彿" filedValue="TH-0033"/>
+        <pro filedName="kucunwl" outname="搴撳瓨鐗╂枡" filedValue="false"/>
+        <pro filedName="shifoupihaoguanli" outname="鏄惁鎵瑰彿绠$悊" filedValue="false"/>
+        <pro filedName="thrifl" outname="涓夌骇绠$悊鍒嗙被" filedValue="鍒嗙被鏍戜笂娌℃湁灞傜骇[none]"/>
+        <pro filedName="revisionvalue" outname="鐗堟湰" filedValue=""/>
+        <pro filedName="firstfl" outname="涓�绾х鐞嗗垎绫�" filedValue="鍒嗙被鏍戜笂娌℃湁灞傜骇[none]"/>
+        <pro filedName="chukufangshi" outname="鍑哄簱鏂瑰紡" filedValue="鍏堣繘鍏堝嚭"/>
+        <pro filedName="hesuanfenlei" outname="鏍哥畻鍒嗙被" filedValue=""/>
+        <pro filedName="jiliangdw" outname="璁¢噺鍗曚綅" filedValue=""/>
+        <pro filedName="oldcode" outname="鍘嗗彶缂栧彿" filedValue=""/>
+        <pro filedName="materialclassify" outname="鐗╂枡鍒嗙被" filedValue="020102"/>
+        <pro filedName="id" outname="浠e彿" filedValue="02010200028"/>
+        <pro filedName="morengongys" outname="渚涘簲鍟�" filedValue=""/>
+        <pro filedName="lcstatus" outname="鐘舵��" filedValue="Released"/>
+        <pro filedName="zuixiaoqiding" outname="鏈�灏忚捣璁㈤噺" filedValue=""/>
+    </object>
+</data>
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 ab87e4d..97f1620 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
@@ -360,8 +360,10 @@
 				});
 				//鏌ヨ鎺ㄩ�佹帴鍙e弬鏁�
 				DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid);
-
-				boolean isGroupCodeFlage= dockingSystemConfig.getIsGroupCodeFlag().equals("true")?true:false;
+				boolean isGroupCodeFlage=false;
+				if(dockingSystemConfig!=null) {
+					isGroupCodeFlage = StringUtils.isBlank(dockingSystemConfig.getIsGroupCodeFlag())?false: Boolean.getBoolean(dockingSystemConfig.getIsGroupCodeFlag());
+				}
 				if(isGroupCodeFlage){
 					code=data.getOrDefault("groupcode","");
 				}

--
Gitblit v1.9.3