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 | 99 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 83 insertions(+), 16 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 61bc9e2..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,18 +1,19 @@
package com.vci.ubcs.code.controller;
import com.vci.ubcs.code.service.UniversalInterfaceI;
+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;
import javax.ws.rs.core.Context;
+import java.util.concurrent.ConcurrentHashMap;
/**
* 涓婚搴撳垎绫绘帶鍒跺櫒
@@ -37,16 +38,16 @@
/****
* 鐢宠鎺ュ彛
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @throws Throwable
*/
@PostMapping("/applyCode")
- public String applyCode(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType, ServletRequest request) {
+ public String applyCode(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType, HttpServletRequest request) {
String result="";
- HttpServletRequest httpServletRequest = (HttpServletRequest) request;
try {
+ this.setHttpToThreadLocal(request);
result = universalInterfaceI.applyCode(dataString, dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -57,18 +58,19 @@
/****
* 鏇存柊/鍒犻櫎/鐘舵�佹帴鍙�
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @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;
@@ -76,15 +78,16 @@
/****
* 鏌ヨ鍒嗙被鍙�
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @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();
@@ -95,15 +98,16 @@
/****
* 鏌ヨ鍒嗙被鍙�
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @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();
@@ -114,15 +118,16 @@
/****
* 鏌ヨ瑙勫垯
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @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();
@@ -131,4 +136,66 @@
return result;
}
+ /****
+ * 鏍囧噯鍖栫敵璇锋帴鍙�
+ * @param dataString 鏁版嵁淇℃伅
+ * @param dataType 鏁版嵁鏍煎紡绫诲瀷
+ * @return
+ * @throws Throwable
+ */
+ @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();
+ logger.error("queryData->"+e.getMessage());
+ }
+ 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;
+
+ }
+
+ /**
+ * 璁剧疆request锛屽埌ThreadLocal涓�
+ * @param request
+ */
+ public void setHttpToThreadLocal(HttpServletRequest request){
+ ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
+ threadLocal.set(request);
+ universalInterfaceI.setThreadLocal(threadLocal);
+ }
+
+ /***
+ *
+ * @param dataString
+ * @param dataType
+ * @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;
+ }
}
--
Gitblit v1.9.3