From 0496aed6e04c5084f05ce1035ba9ec38e3d4e9c7 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期五, 01 十一月 2024 15:17:41 +0800
Subject: [PATCH] 集成获取mdm分发通用数据格式接口集成
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 94 insertions(+), 13 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 71cb533..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,15 +1,18 @@
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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
@@ -37,6 +40,12 @@
@Autowired
private UniversalInterfaceI universalInterfaceI;
+ /**
+ * 鎺ュ彛闆嗘垚鏈嶅姟
+ */
+ @Autowired
+ private CodeMdmInfaceI codeMdmInfaceI;
+
/****
* 鐢宠鎺ュ彛
* @param dataString 鏁版嵁淇℃伅
@@ -48,9 +57,7 @@
public String applyCode(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType, HttpServletRequest request) {
String result="";
try {
- ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
- threadLocal.set(request);
- universalInterfaceI.setThreadLocal(threadLocal);
+ this.setHttpToThreadLocal(request);
result = universalInterfaceI.applyCode(dataString, dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -67,12 +74,13 @@
* @throws Throwable
*/
@PostMapping("/syncData")
- public String syncData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) {
+ public String syncData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) {
String result="";
try {
+ this.setHttpToThreadLocal(request);
result= universalInterfaceI.syncEditData(dataString,dataType);
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
logger.error("syncData->"+e.getMessage());
}
return result;
@@ -86,9 +94,10 @@
* @throws Throwable
*/
@PostMapping("/queryClassify")
- public String queryClassify(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
+ public String queryClassify(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) throws Throwable {
String result="";
try {
+ this.setHttpToThreadLocal(request);
result = universalInterfaceI.queryClassify(dataString, dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -105,9 +114,10 @@
* @throws Throwable
*/
@PostMapping("/queryData")
- public String queryData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
+ public String queryData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) throws Throwable {
String result="";
try {
+ this.setHttpToThreadLocal(request);
result= universalInterfaceI.queryData(dataString,dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -124,9 +134,10 @@
* @throws Throwable
*/
@PostMapping("/queryClassifyRule")
- public String queryClassifyRule(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
+ public String queryClassifyRule(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request) throws Throwable {
String result="";
try {
+ this.setHttpToThreadLocal(request);
result= universalInterfaceI.queryClassifyRule(dataString,dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -142,9 +153,11 @@
* @return
* @throws Throwable
*/
- public String applyCodeForBZ(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType){
+ @PostMapping("/applyCodeForBZ")
+ public String applyCodeForBZ(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request){
String result="";
try {
+ this.setHttpToThreadLocal(request);
result= universalInterfaceI.applyCodeForBZ(dataString,dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -152,4 +165,72 @@
}
return result;
}
+
+ /****
+ * 浜哄憳闆嗘垚鎺ュ彛
+ * @param personData 鏁版嵁淇℃伅
+ * @return
+ * @throws Throwable
+ */
+ @PostMapping("/syncDataForPerson")
+ public ResultOrgData syncDataForPerson(@RequestBody PersonData personData,HttpServletRequest request){
+ this.setHttpToThreadLocal(request);
+ ResultOrgData result = new ResultOrgData();
+ try {
+ result= universalInterfaceI.syncDataForPerson(personData);
+ }catch (Throwable e){
+ e.printStackTrace();
+ logger.error("ResultOrgData->"+e.getMessage());
+ }
+ return result;
+
+ }
+
+ /**
+ * 鎺ュ彈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
+ */
+ public void setHttpToThreadLocal(HttpServletRequest request){
+ ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
+ threadLocal.set(request);
+ universalInterfaceI.setThreadLocal(threadLocal);
+ //codeMdmInfaceI.setThreadLocal(threadLocal);
+ }
+
+
+
+ /***
+ *
+ * @param mdmData
+ * @param request
+ * @return
+ */
+ @PostMapping("/test")
+ public String test(@RequestBody MDMData mdmData, HttpServletRequest request){
+ System.out.println("");
+ return "";
+ }
}
--
Gitblit v1.9.3