From 5677cf19400eca6985fb9cd5d501b35691cdf193 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 10 三月 2024 20:18:04 +0800
Subject: [PATCH] 集成相关代码更改

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java |   71 ++++++++++++++++++++++++++++++-----
 1 files changed, 61 insertions(+), 10 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 be849ff..4c0649e 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,15 +1,14 @@
 package com.vci.ubcs.code.controller;
 
 import com.vci.ubcs.code.service.UniversalInterfaceI;
+import com.vci.ubcs.code.vo.webserviceModel.person.PersonData;
+import com.vci.ubcs.code.vo.webserviceModel.person.ResultOrgData;
 import org.apache.tools.ant.taskdefs.condition.Http;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -39,7 +38,7 @@
 
 	/****
 	 * 鐢宠鎺ュ彛
-	 * @param dataString 灞炴�т俊鎭�
+	 * @param dataString 鏁版嵁淇℃伅
 	 * @param dataType 鏁版嵁鏍煎紡绫诲瀷
 	 * @return
 	 * @throws Throwable
@@ -59,7 +58,7 @@
 
 	/****
 	 * 鏇存柊/鍒犻櫎/鐘舵�佹帴鍙�
-	 * @param dataString 灞炴�т俊鎭�
+	 * @param dataString 鏁版嵁淇℃伅
 	 * @param dataType 鏁版嵁鏍煎紡绫诲瀷
 	 * @return
 	 * @throws Throwable
@@ -71,7 +70,7 @@
 			this.setHttpToThreadLocal(request);
 			result= universalInterfaceI.syncEditData(dataString,dataType);
 		}catch (Throwable e){
-			e.printStackTrace();;
+			e.printStackTrace();
 			logger.error("syncData->"+e.getMessage());
 		}
 		return result;
@@ -79,7 +78,7 @@
 
 	/****
 	 * 鏌ヨ鍒嗙被鍙�
-	 * @param dataString 灞炴�т俊鎭�
+	 * @param dataString 鏁版嵁淇℃伅
 	 * @param dataType 鏁版嵁鏍煎紡绫诲瀷
 	 * @return
 	 * @throws Throwable
@@ -99,7 +98,7 @@
 
 	/****
 	 * 鏌ヨ鍒嗙被鍙�
-	 * @param dataString 灞炴�т俊鎭�
+	 * @param dataString 鏁版嵁淇℃伅
 	 * @param dataType 鏁版嵁鏍煎紡绫诲瀷
 	 * @return
 	 * @throws Throwable
@@ -119,7 +118,7 @@
 
 	/****
 	 * 鏌ヨ瑙勫垯
-	 * @param dataString 灞炴�т俊鎭�
+	 * @param dataString 鏁版嵁淇℃伅
 	 * @param dataType 鏁版嵁鏍煎紡绫诲瀷
 	 * @return
 	 * @throws Throwable
@@ -137,6 +136,46 @@
 		return result;
 	}
 
+	/****
+	 * 鏍囧噯鍖栫敵璇锋帴鍙�
+	 * @param dataString 鏁版嵁淇℃伅
+	 * @param dataType 鏁版嵁鏍煎紡绫诲瀷
+	 * @return
+	 * @throws Throwable
+	 */
+	@PostMapping("/applyCodeForBZ")
+	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;
+	}
+
+	/****
+	 * 浜哄憳闆嗘垚鎺ュ彛
+	 * @param personData 鏁版嵁淇℃伅
+	 * @return
+	 * @throws Throwable
+	 */
+	@PostMapping("/syncDataForPerson")
+	public ResultOrgData syncDataForPerson(@RequestBody PersonData personData){
+
+		ResultOrgData result = new ResultOrgData();
+		try {
+			result= universalInterfaceI.syncDataForPerson(personData);
+		}catch (Throwable e){
+			e.printStackTrace();
+			logger.error("ResultOrgData->"+e.getMessage());
+		}
+		return result;
+
+	}
+
 	/**
 	 * 璁剧疆request锛屽埌ThreadLocal涓�
 	 * @param request
@@ -147,4 +186,16 @@
 		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