From fb120532c97a55a846471e03eb2873fece9fdac1 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 10 十月 2023 11:42:20 +0800
Subject: [PATCH] 定时器推送更将增加集成系统唯一标识字段以便对方系统更新数据

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 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 71cb533..44ea636 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
@@ -48,9 +48,7 @@
 	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);
+			this.setHttpToThreadLocal(request);
 			result = universalInterfaceI.applyCode(dataString, dataType);
 		}catch (Throwable e){
 			e.printStackTrace();
@@ -67,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();;
@@ -86,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();
@@ -105,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();
@@ -124,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();
@@ -142,9 +144,10 @@
 	 * @return
 	 * @throws Throwable
 	 */
-	public String applyCodeForBZ(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType){
+	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();
@@ -152,4 +155,27 @@
 		}
 		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="{\"data\": {\"object\": {\"code\": \"0201040133\",\"oid\": \"0000001\",\"erroid\": \"0\",\"msg\": \"娴嬭瘯鎴愬姛\"}}}";
+		return result;
+	}
 }

--
Gitblit v1.9.3