From 38b3548433f54e9e13583f7c51d8512b0a9021cf Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 22 九月 2023 08:59:32 +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 | 83 ++++++++++++++++++++++++++---------------
1 files changed, 53 insertions(+), 30 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..eb94cfc 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,26 +25,30 @@
@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 {
+ this.setHttpToThreadLocal(request);
result = universalInterfaceI.applyCode(dataString, dataType);
}catch (Throwable e){
e.printStackTrace();
@@ -49,34 +58,17 @@
}
/****
- * 鐢宠鎺ュ彛
- * @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());
- }
- }
-
- /****
* 鏇存柊/鍒犻櫎/鐘舵�佹帴鍙�
- * @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();;
@@ -85,18 +77,18 @@
return result;
}
-
/****
* 鏌ヨ鍒嗙被鍙�
- * @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();
@@ -107,15 +99,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();
@@ -126,15 +119,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();
@@ -143,4 +137,33 @@
return result;
}
+ /****
+ * 鏍囧噯鍖栫敵璇锋帴鍙�
+ * @param dataString 鏁版嵁淇℃伅
+ * @param dataType 鏁版嵁鏍煎紡绫诲瀷
+ * @return
+ * @throws Throwable
+ */
+ 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;
+ }
+
+ /**
+ * 璁剧疆request锛屽埌ThreadLocal涓�
+ * @param request
+ */
+ public void setHttpToThreadLocal(HttpServletRequest request){
+ ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
+ threadLocal.set(request);
+ universalInterfaceI.setThreadLocal(threadLocal);
+ }
+
}
--
Gitblit v1.9.3