From 432a477d82c052e99e5a0fb3214ce4d990111592 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 28 九月 2023 14:15:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

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 e8056fe..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
@@ -571,7 +571,7 @@
 					String sendurl = url + "?" + DATA_PARAM_NAME + "=" + sendString;
 					//鎷兼帴param
 					for (DockingSysIntParamDTO sysIntParamVO : sysIntParamVOList) {
-						sendurl = sendurl + "&" + sysIntParamVO.getParamkey() + "=" + sysIntParamVO.getParamvalue();
+						sendurl = sendurl + "&" + sysIntParamVO.getParamKey() + "=" + sysIntParamVO.getParamValue();
 					}
 					paramString = sendurl;
 					backString = HttpUtils.get(sendurl);
@@ -579,7 +579,7 @@
 					MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
 					if(!CollectionUtils.isEmpty(sysIntParamVOList)) {
 						for (DockingSysIntParamDTO sysIntParamVO : sysIntParamVOList) {
-							params.add(sysIntParamVO.getParamkey(), sysIntParamVO.getParamvalue());
+							params.add(sysIntParamVO.getParamKey(), sysIntParamVO.getParamValue());
 						}
 					}
 					params.add(DATA_PARAM_NAME,sendString);
@@ -609,7 +609,7 @@
 			}else if (type.equals(URLTYPE_WEBSERVICE)) {//webserver璇锋眰
 				MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
 				for (DockingSysIntParamDTO sysIntParamVO : sysIntParamVOList) {
-					params.add(sysIntParamVO.getParamkey(), sysIntParamVO.getParamvalue());
+					params.add(sysIntParamVO.getParamKey(), sysIntParamVO.getParamValue());
 				}
 				paramString = sendString;
 				MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
@@ -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;

--
Gitblit v1.9.3