From 7324a4e5ae8e0c7039896a14370bf6844ad17462 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 九月 2023 11:36:54 +0800
Subject: [PATCH] 代码提交

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java |   54 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 29 insertions(+), 25 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 3026afe..be849ff 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,7 +1,7 @@
 package com.vci.ubcs.code.controller;
 
 import com.vci.ubcs.code.service.UniversalInterfaceI;
-import com.vci.ubcs.code.vo.webserviceModel.PersonData;
+import org.apache.tools.ant.taskdefs.condition.Http;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springblade.core.tool.api.R;
@@ -10,6 +10,11 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 涓婚搴撳垎绫绘帶鍒跺櫒
@@ -20,15 +25,18 @@
 @RestController
 @RequestMapping("/codeSyncUniversalController")
 public class CodeSyncUniversalController {
+
 	/**
 	 * 鏃ュ織
 	 */
 	private Logger logger = LoggerFactory.getLogger(getClass());
+
 	/**
 	 * 鎺ュ彛闆嗘垚鏈嶅姟
 	 */
 	@Autowired
 	private UniversalInterfaceI universalInterfaceI;
+
 	/****
 	 * 鐢宠鎺ュ彛
 	 * @param dataString 灞炴�т俊鎭�
@@ -37,33 +45,16 @@
 	 * @throws Throwable
 	 */
 	@PostMapping("/applyCode")
-	public String applyCode(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType)  {
+	public String applyCode(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType, HttpServletRequest request)  {
 		String result="";
 		try {
+			this.setHttpToThreadLocal(request);
 			result = universalInterfaceI.applyCode(dataString, dataType);
 		}catch (Throwable e){
 			e.printStackTrace();
 			logger.error("applyCode->"+e.getMessage());
 		}
 		return result;
-	}
-
-	/****
-	 * 鐢宠鎺ュ彛
-	 * @param personData 鐢宠
-	 * @return
-	 * @throws Throwable
-	 */
-	@PostMapping("/applyCodeForPerson")
-	public R applyCodeForPerson(@RequestParam PersonData personData)  {
-		String result="";
-		try {
-			return universalInterfaceI.applyCodeForPerson(personData);
-		}catch (Throwable e){
-			e.printStackTrace();
-			logger.error("applyCodeForPerson->"+e.getMessage());
-			return R.fail("applyCodeForPerson->"+e.getMessage());
-		}
 	}
 
 	/****
@@ -74,9 +65,10 @@
 	 * @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();;
@@ -84,7 +76,6 @@
 		}
 		return result;
 	}
-
 
 	/****
 	 * 鏌ヨ鍒嗙被鍙�
@@ -94,9 +85,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();
@@ -113,9 +105,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();
@@ -132,9 +125,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();
@@ -143,4 +137,14 @@
 		return result;
 	}
 
+	/**
+	 * 璁剧疆request锛屽埌ThreadLocal涓�
+	 * @param request
+	 */
+	public void setHttpToThreadLocal(HttpServletRequest request){
+		ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
+		threadLocal.set(request);
+		universalInterfaceI.setThreadLocal(threadLocal);
+	}
+
 }

--
Gitblit v1.9.3