From 80b6cbfc9c861469146318d0b3dd5f8b8b525b8a Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期五, 01 十一月 2024 15:11:19 +0800 Subject: [PATCH] Revert "集成获取mdm分发通用数据格式接口集成" --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java | 45 +++++---------------------------------------- 1 files changed, 5 insertions(+), 40 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 0092afa..7e508cd 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,10 +1,6 @@ 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; @@ -39,12 +35,6 @@ */ @Autowired private UniversalInterfaceI universalInterfaceI; - - /** - * 鎺ュ彛闆嗘垚鏈嶅姟 - */ - @Autowired - private CodeMdmInfaceI codeMdmInfaceI; /**** * 鐢宠鎺ュ彛 @@ -187,29 +177,6 @@ } /** - * 鎺ュ彈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 */ @@ -217,20 +184,18 @@ ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>(); threadLocal.set(request); universalInterfaceI.setThreadLocal(threadLocal); - //codeMdmInfaceI.setThreadLocal(threadLocal); } - - /*** * - * @param mdmData + * @param dataString + * @param dataType * @param request * @return */ @PostMapping("/test") - public String test(@RequestBody MDMData mdmData, HttpServletRequest request){ - System.out.println(""); - return ""; + 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; } } -- Gitblit v1.9.3