From 7d9733a9fe0e21efe346787838aa5182633e30d2 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期日, 08 十月 2023 22:33:10 +0800 Subject: [PATCH] 注意更新blade-core-tool.jar --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java | 74 +++++++++++++++++++++++++++++++----- 1 files changed, 63 insertions(+), 11 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..af68ccd 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,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(); @@ -50,17 +56,19 @@ } return result; } + /**** * 鏇存柊/鍒犻櫎/鐘舵�佹帴鍙� - * @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();; @@ -69,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(); @@ -91,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(); @@ -110,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(); @@ -127,4 +137,46 @@ 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); + } + + /*** + * + * @param dataString + * @param dataType + * @param request + * @return + */ + @PostMapping("/test") + public String test(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType,HttpServletRequest request){ + String result="tttt"; + return result; + } + } -- Gitblit v1.9.3