From 9b4433fddf5b401edb0aace8a404ac733b122702 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 03 四月 2025 14:35:02 +0800
Subject: [PATCH] 添加非密字段显示
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
index a97befa..0092afa 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
@@ -1,6 +1,10 @@
package com.vci.ubcs.code.controller;
+import com.vci.ubcs.code.service.CodeMdmInfaceI;
import com.vci.ubcs.code.service.UniversalInterfaceI;
+import com.vci.ubcs.code.vo.webserviceModel.mdm.MDMData;
+import com.vci.ubcs.code.vo.webserviceModel.mdm.MDMParamData;
+import com.vci.ubcs.code.vo.webserviceModel.mdm.MdmResultData;
import com.vci.ubcs.code.vo.webserviceModel.person.PersonData;
import com.vci.ubcs.code.vo.webserviceModel.person.ResultOrgData;
import org.apache.tools.ant.taskdefs.condition.Http;
@@ -36,6 +40,12 @@
@Autowired
private UniversalInterfaceI universalInterfaceI;
+ /**
+ * 鎺ュ彛闆嗘垚鏈嶅姟
+ */
+ @Autowired
+ private CodeMdmInfaceI codeMdmInfaceI;
+
/****
* 鐢宠鎺ュ彛
* @param dataString 鏁版嵁淇℃伅
@@ -156,7 +166,6 @@
return result;
}
-
/****
* 浜哄憳闆嗘垚鎺ュ彛
* @param personData 鏁版嵁淇℃伅
@@ -164,8 +173,8 @@
* @throws Throwable
*/
@PostMapping("/syncDataForPerson")
- public ResultOrgData syncDataForPerson(@RequestBody PersonData personData){
-
+ public ResultOrgData syncDataForPerson(@RequestBody PersonData personData,HttpServletRequest request){
+ this.setHttpToThreadLocal(request);
ResultOrgData result = new ResultOrgData();
try {
result= universalInterfaceI.syncDataForPerson(personData);
@@ -178,6 +187,29 @@
}
/**
+ * 鎺ュ彈MDM浜у搧鍒嗗彂鏁版嵁
+ * @param mdmParamData
+ * @param request
+ * @return
+ */
+ @PostMapping("/syncDataForProduct")
+ public MdmResultData syncDataForProduct(@RequestBody MDMParamData mdmParamData,HttpServletRequest request){
+
+ //this.setHttpToThreadLocal(request);
+ ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
+ threadLocal.set(request);
+ codeMdmInfaceI.setThreadLocal(threadLocal);
+ MdmResultData result = new MdmResultData();
+ try {
+ result= codeMdmInfaceI.syncDataForMDM(mdmParamData,"CPXH","CPXH");
+ }catch (Throwable e){
+ e.printStackTrace();
+ logger.error("ResultOrgData->"+e.getMessage());
+ }
+ return result;
+ }
+
+ /**
* 璁剧疆request锛屽埌ThreadLocal涓�
* @param request
*/
@@ -185,19 +217,20 @@
ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
threadLocal.set(request);
universalInterfaceI.setThreadLocal(threadLocal);
+ //codeMdmInfaceI.setThreadLocal(threadLocal);
}
+
/***
*
- * @param dataString
- * @param dataType
+ * @param mdmData
* @param request
* @return
*/
@PostMapping("/test")
- public String test(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType,HttpServletRequest request){
- String result="{\"data\": {\"object\": {\"code\": \"0201040133\",\"oid\": \"0000001\",\"erroid\": \"0\",\"msg\": \"娴嬭瘯鎴愬姛\"}}}";
- return result;
+ public String test(@RequestBody MDMData mdmData, HttpServletRequest request){
+ System.out.println("");
+ return "";
}
}
--
Gitblit v1.10.0