From c48c1a085137ab9970877ede443c6a9c359c454c Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期四, 21 九月 2023 11:36:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 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 585558a..71cb533 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,7 @@
package com.vci.ubcs.code.controller;
import com.vci.ubcs.code.service.UniversalInterfaceI;
+import org.apache.tools.ant.taskdefs.condition.Http;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.core.tool.api.R;
@@ -13,6 +14,7 @@
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.Context;
+import java.util.concurrent.ConcurrentHashMap;
/**
* 涓婚搴撳垎绫绘帶鍒跺櫒
@@ -23,26 +25,32 @@
@RestController
@RequestMapping("/codeSyncUniversalController")
public class CodeSyncUniversalController {
+
/**
* 鏃ュ織
*/
private Logger logger = LoggerFactory.getLogger(getClass());
+
/**
* 鎺ュ彛闆嗘垚鏈嶅姟
*/
@Autowired
private UniversalInterfaceI universalInterfaceI;
+
/****
* 鐢宠鎺ュ彛
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @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 {
+ ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
+ threadLocal.set(request);
+ universalInterfaceI.setThreadLocal(threadLocal);
result = universalInterfaceI.applyCode(dataString, dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -50,9 +58,10 @@
}
return result;
}
+
/****
* 鏇存柊/鍒犻櫎/鐘舵�佹帴鍙�
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @throws Throwable
@@ -69,10 +78,9 @@
return result;
}
-
/****
* 鏌ヨ鍒嗙被鍙�
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @throws Throwable
@@ -91,7 +99,7 @@
/****
* 鏌ヨ鍒嗙被鍙�
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @throws Throwable
@@ -110,7 +118,7 @@
/****
* 鏌ヨ瑙勫垯
- * @param dataString 灞炴�т俊鎭�
+ * @param dataString 鏁版嵁淇℃伅
* @param dataType 鏁版嵁鏍煎紡绫诲瀷
* @return
* @throws Throwable
@@ -127,4 +135,21 @@
return result;
}
+ /****
+ * 鏍囧噯鍖栫敵璇锋帴鍙�
+ * @param dataString 鏁版嵁淇℃伅
+ * @param dataType 鏁版嵁鏍煎紡绫诲瀷
+ * @return
+ * @throws Throwable
+ */
+ public String applyCodeForBZ(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType){
+ String result="";
+ try {
+ result= universalInterfaceI.applyCodeForBZ(dataString,dataType);
+ }catch (Throwable e){
+ e.printStackTrace();
+ logger.error("queryData->"+e.getMessage());
+ }
+ return result;
+ }
}
--
Gitblit v1.9.3