From 238121be19655f63a45fc9c9c3d864801eb4471b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 四月 2024 12:44:07 +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 | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 af68ccd..7e508cd 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;
@@ -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;
@@ -144,6 +143,7 @@
* @return
* @throws Throwable
*/
+ @PostMapping("/applyCodeForBZ")
public String applyCodeForBZ(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType, HttpServletRequest request){
String result="";
try {
@@ -154,6 +154,26 @@
logger.error("queryData->"+e.getMessage());
}
return result;
+ }
+
+ /****
+ * 浜哄憳闆嗘垚鎺ュ彛
+ * @param personData 鏁版嵁淇℃伅
+ * @return
+ * @throws Throwable
+ */
+ @PostMapping("/syncDataForPerson")
+ public ResultOrgData syncDataForPerson(@RequestBody PersonData personData,HttpServletRequest request){
+ this.setHttpToThreadLocal(request);
+ ResultOrgData result = new ResultOrgData();
+ try {
+ result= universalInterfaceI.syncDataForPerson(personData);
+ }catch (Throwable e){
+ e.printStackTrace();
+ logger.error("ResultOrgData->"+e.getMessage());
+ }
+ return result;
+
}
/**
@@ -175,8 +195,7 @@
*/
@PostMapping("/test")
public String test(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType,HttpServletRequest request){
- String result="tttt";
+ String result="{\"data\": {\"object\": {\"code\": \"0201040133\",\"oid\": \"0000001\",\"erroid\": \"0\",\"msg\": \"娴嬭瘯鎴愬姛\"}}}";
return result;
}
-
}
--
Gitblit v1.9.3