From 29ab7773efe351a879ce9b3c29ab3ca50f4e62cb Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期三, 15 一月 2025 21:36:08 +0800
Subject: [PATCH] 产品型号集成,类型转换,人员组织加日志,申请接口引用码段值校验

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java |   48 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java
index 695023c..45fbdb6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java
@@ -1,16 +1,16 @@
 package com.vci.ubcs.code.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.vci.ubcs.code.service.UniversalInterfaceI;
-import com.vci.ubcs.code.vo.webserviceModel.person.OrgData;
-import com.vci.ubcs.code.vo.webserviceModel.person.PersonData;
-import com.vci.ubcs.code.vo.webserviceModel.person.ResultOrgData;
+import com.vci.ubcs.code.vo.webserviceModel.person.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springblade.core.tool.utils.Func;
 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.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * 鐢宠浜哄憳閮ㄩ棬鎺у埗鍣�
@@ -21,25 +21,32 @@
 @RestController
 @RequestMapping("/codeApplyOrgPersonController")
 public class CodeApplyOrgPersonController {
+
 	/**
 	 * 鏃ュ織
 	 */
 	private Logger logger = LoggerFactory.getLogger(getClass());
+
 	/**
 	 * 鎺ュ彛闆嗘垚鏈嶅姟
 	 */
 	@Autowired
 	private UniversalInterfaceI universalInterfaceI;
+
 	/****
 	 * 浜哄憳鏁版嵁鍚屾
-	 * @param personData
+	 * @param personDataVO
 	 * @return
 	 * @throws Throwable
 	 */
 	@PostMapping("/syncDataForPerson")
-	public ResultOrgData syncDataForPerson(@RequestParam PersonData personData)  {
-		String result="";
+	public ResultOrgData syncDataForPerson(@RequestBody PersonDataVO personDataVO, HttpServletRequest request)  {
+		this.setHttpToThreadLocal(request);
 		try {
+			PersonData personData = new PersonData();
+			Func.copy(personDataVO,personData);
+			List<PersonMasterData> personMasterData = JSONObject.parseArray(personDataVO.getMasterData(), PersonMasterData.class);
+			personData.setMasterData(personMasterData);
 			return universalInterfaceI.syncDataForPerson(personData);
 		}catch (Throwable e){
 			e.printStackTrace();
@@ -50,14 +57,18 @@
 
 	/****
 	 * 閮ㄩ棬鏁版嵁鍚屾
-	 * @param orgData 閮ㄩ棬鏁版嵁
+	 * @param orgDataVO 閮ㄩ棬鏁版嵁
 	 * @return
 	 * @throws Throwable
 	 */
 	@PostMapping("/syncDataForOrg")
-	public ResultOrgData syncDataForOrg(@RequestParam OrgData orgData)  {
-		String result="";
+	public ResultOrgData syncDataForOrg(@RequestBody OrgDataVO orgDataVO, HttpServletRequest request)  {
+		this.setHttpToThreadLocal(request);
 		try {
+			OrgData orgData = new OrgData();
+			Func.copy(orgDataVO,orgData);
+			List<OrgMasterData> orgMasterData = JSONObject.parseArray(orgDataVO.getMasterData(), OrgMasterData.class);
+			orgData.setMasterData(orgMasterData);
 			return universalInterfaceI.syncDataForOrg(orgData);
 		}catch (Throwable e){
 			e.printStackTrace();
@@ -65,4 +76,15 @@
 			return new ResultOrgData();
 		}
 	}
+
+	/**
+	 * 璁剧疆request锛屽埌ThreadLocal涓�
+	 * @param request
+	 */
+	public void setHttpToThreadLocal(HttpServletRequest request){
+		ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
+		threadLocal.set(request);
+		universalInterfaceI.setThreadLocal(threadLocal);
+	}
+
 }

--
Gitblit v1.9.3