From 7647ae9a3db4712b4154adc6317584b66429212b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 18 九月 2023 15:05:11 +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 |   91 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 90 insertions(+), 1 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 ea037a8..b82489f 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;
@@ -9,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;
 
 /**
  * 涓婚搴撳垎绫绘帶鍒跺櫒
@@ -19,15 +25,18 @@
 @RestController
 @RequestMapping("/codeSyncUniversalController")
 public class CodeSyncUniversalController {
+
 	/**
 	 * 鏃ュ織
 	 */
 	private Logger logger = LoggerFactory.getLogger(getClass());
+
 	/**
 	 * 鎺ュ彛闆嗘垚鏈嶅姟
 	 */
 	@Autowired
 	private UniversalInterfaceI universalInterfaceI;
+
 	/****
 	 * 鐢宠鎺ュ彛
 	 * @param dataString 灞炴�т俊鎭�
@@ -36,9 +45,12 @@
 	 * @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();
@@ -46,4 +58,81 @@
 		}
 		return result;
 	}
+
+	/****
+	 * 鏇存柊/鍒犻櫎/鐘舵�佹帴鍙�
+	 * @param dataString 灞炴�т俊鎭�
+	 * @param dataType 鏁版嵁鏍煎紡绫诲瀷
+	 * @return
+	 * @throws Throwable
+	 */
+	@PostMapping("/syncData")
+	public String syncData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType)  {
+		String result="";
+		try {
+			result= universalInterfaceI.syncEditData(dataString,dataType);
+		}catch (Throwable e){
+			e.printStackTrace();;
+			logger.error("syncData->"+e.getMessage());
+		}
+		return result;
+	}
+
+	/****
+	 * 鏌ヨ鍒嗙被鍙�
+	 * @param dataString 灞炴�т俊鎭�
+	 * @param dataType 鏁版嵁鏍煎紡绫诲瀷
+	 * @return
+	 * @throws Throwable
+	 */
+	@PostMapping("/queryClassify")
+	public String queryClassify(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
+		String result="";
+		try {
+			result = universalInterfaceI.queryClassify(dataString, dataType);
+		}catch (Throwable e){
+			e.printStackTrace();
+			logger.error("queryClassify->"+e.getMessage());
+		}
+		return result;
+	}
+
+	/****
+	 * 鏌ヨ鍒嗙被鍙�
+	 * @param dataString 灞炴�т俊鎭�
+	 * @param dataType 鏁版嵁鏍煎紡绫诲瀷
+	 * @return
+	 * @throws Throwable
+	 */
+	@PostMapping("/queryData")
+	public String queryData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
+		String result="";
+		try {
+			result= universalInterfaceI.queryData(dataString,dataType);
+		}catch (Throwable e){
+			e.printStackTrace();
+			logger.error("queryData->"+e.getMessage());
+		}
+		return result;
+	}
+
+	/****
+	 * 鏌ヨ瑙勫垯
+	 * @param dataString 灞炴�т俊鎭�
+	 * @param dataType 鏁版嵁鏍煎紡绫诲瀷
+	 * @return
+	 * @throws Throwable
+	 */
+	@PostMapping("/queryClassifyRule")
+	public String queryClassifyRule(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
+		String result="";
+		try {
+			result= universalInterfaceI.queryClassifyRule(dataString,dataType);
+		}catch (Throwable e){
+			e.printStackTrace();
+			logger.error("queryData->"+e.getMessage());
+		}
+		return result;
+	}
+
 }

--
Gitblit v1.9.3