From 33f5b404064d528da54157a786031503ff723932 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 三月 2024 08:58:49 +0800
Subject: [PATCH] 集成相关更改
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgDataVO.java | 49 +++++++++
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java | 1
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgData.java | 69 ++-----------
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonData.java | 69 ++-----------
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonDataVO.java | 62 ++++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyOrgPersonController.java | 26 +++-
8 files changed, 154 insertions(+), 126 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgData.java
index 232275a..d99dd50 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgData.java
@@ -1,92 +1,46 @@
package com.vci.ubcs.code.vo.webserviceModel.person;
+import lombok.Data;
+
import java.util.List;
+@Data
public class OrgData {
+
/**
* 鏁版嵁瀹℃壒鐘舵��0锛氬鎵规甯革紝1锛氬鎵规嫆缁�
*/
private int code;
+
/***
* 瀹℃壒鎷掔粷鏃剁殑璇︽儏淇℃伅
*/
private String msg;
+
/**
* 闆嗘垚绯荤粺缂栫爜
*/
private String systemCode;
+
/**
* 涓绘暟鎹ā鍨嬬殑缂栫爜
*/
private String mdType;
+
/***
* 鏁版嵁鍒嗗彂鎵�瑙﹀彂鐨勭被鍨� 鎵嬪姩鍒嗗彂:distribute_manual,
*/
private String action;
+
/***
* 娑堣垂绯荤粺涓厤缃殑鍒嗗彂浠ょ墝
*/
private String distributeToken;
+
/***
* 鍒嗗彂浜哄憳鏁版嵁淇℃伅
*/
- private List<OrgMasterData> masterData ;
-
- public int getCode() {
- return code;
- }
-
- public void setCode(int code) {
- this.code = code;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- public String getSystemCode() {
- return systemCode;
- }
-
- public void setSystemCode(String systemCode) {
- this.systemCode = systemCode;
- }
-
- public String getMdType() {
- return mdType;
- }
-
- public void setMdType(String mdType) {
- this.mdType = mdType;
- }
-
- public String getAction() {
- return action;
- }
-
- public void setAction(String action) {
- this.action = action;
- }
-
- public String getDistributeToken() {
- return distributeToken;
- }
-
- public void setDistributeToken(String distributeToken) {
- this.distributeToken = distributeToken;
- }
-
- public List<OrgMasterData> getMasterData() {
- return masterData;
- }
-
- public void setMasterData(List<OrgMasterData> masterData) {
- this.masterData = masterData;
- }
+ private List<OrgMasterData> masterData;
@Override
public String toString() {
@@ -100,4 +54,5 @@
", masterData=" + masterData +
'}';
}
+
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgDataVO.java
new file mode 100644
index 0000000..f7e9bd0
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgDataVO.java
@@ -0,0 +1,49 @@
+package com.vci.ubcs.code.vo.webserviceModel.person;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ludc
+ * @date 2024/3/20 16:28
+ */
+@Data
+public class OrgDataVO {
+
+ /**
+ * 鏁版嵁瀹℃壒鐘舵��0锛氬鎵规甯革紝1锛氬鎵规嫆缁�
+ */
+ private int code;
+
+ /***
+ * 瀹℃壒鎷掔粷鏃剁殑璇︽儏淇℃伅
+ */
+ private String msg;
+
+ /**
+ * 闆嗘垚绯荤粺缂栫爜
+ */
+ private String systemCode;
+
+ /**
+ * 涓绘暟鎹ā鍨嬬殑缂栫爜
+ */
+ private String mdType;
+
+ /***
+ * 鏁版嵁鍒嗗彂鎵�瑙﹀彂鐨勭被鍨� 鎵嬪姩鍒嗗彂:distribute_manual,
+ */
+ private String action;
+
+ /***
+ * 娑堣垂绯荤粺涓厤缃殑鍒嗗彂浠ょ墝
+ */
+ private String distributeToken;
+
+ /***
+ * 鍒嗗彂浜哄憳鏁版嵁淇℃伅
+ */
+ private String masterData;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
index 4ee33f1..9c47ad8 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/OrgMasterData.java
@@ -9,7 +9,6 @@
/**
* 闅跺睘鍗曚綅鍚嶇О/鎵�灞炲叕鍙�
*/
-
private String company_name;
/**
* 閮ㄩ棬缂栫爜
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonData.java
index c5491b7..8b3d897 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonData.java
@@ -1,95 +1,49 @@
package com.vci.ubcs.code.vo.webserviceModel.person;
+import lombok.Data;
+
import java.util.List;
/***
* 涓庝汉鍔涜祫婧愰泦鎴愮殑鏁版嵁瀵硅薄
*/
+@Data
public class PersonData {
+
/**
* 鏁版嵁瀹℃壒鐘舵��0锛氬鎵规甯革紝1锛氬鎵规嫆缁�
*/
private int code;
+
/***
* 瀹℃壒鎷掔粷鏃剁殑璇︽儏淇℃伅
*/
private String msg;
+
/**
* 闆嗘垚绯荤粺缂栫爜
*/
private String systemCode;
+
/**
* 涓绘暟鎹ā鍨嬬殑缂栫爜
*/
private String mdType;
+
/***
* 鏁版嵁鍒嗗彂鎵�瑙﹀彂鐨勭被鍨� 鎵嬪姩鍒嗗彂:distribute_manual,
*/
private String action;
+
/***
* 娑堣垂绯荤粺涓厤缃殑鍒嗗彂浠ょ墝
*/
private String distributeToken;
+
/***
* 鍒嗗彂浜哄憳鏁版嵁淇℃伅
*/
- private List<PersonMasterData> masterData ;
-
- public int getCode() {
- return code;
- }
-
- public void setCode(int code) {
- this.code = code;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- public String getSystemCode() {
- return systemCode;
- }
-
- public void setSystemCode(String systemCode) {
- this.systemCode = systemCode;
- }
-
- public String getMdType() {
- return mdType;
- }
-
- public void setMdType(String mdType) {
- this.mdType = mdType;
- }
-
- public String getAction() {
- return action;
- }
-
- public void setAction(String action) {
- this.action = action;
- }
-
- public String getDistributeToken() {
- return distributeToken;
- }
-
- public void setDistributeToken(String distributeToken) {
- this.distributeToken = distributeToken;
- }
-
- public List<PersonMasterData> getMasterData() {
- return masterData;
- }
-
- public void setMasterData(List<PersonMasterData> masterData) {
- this.masterData = masterData;
- }
+ private List<PersonMasterData> masterData;
@Override
public String toString() {
@@ -103,4 +57,5 @@
", masterData=" + masterData +
'}';
}
+
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonDataVO.java
new file mode 100644
index 0000000..5223442
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/person/PersonDataVO.java
@@ -0,0 +1,62 @@
+package com.vci.ubcs.code.vo.webserviceModel.person;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ludc
+ * @date 2024/3/20 16:39
+ */
+@Data
+public class PersonDataVO {
+
+ /**
+ * 鏁版嵁瀹℃壒鐘舵��0锛氬鎵规甯革紝1锛氬鎵规嫆缁�
+ */
+ private int code;
+
+ /***
+ * 瀹℃壒鎷掔粷鏃剁殑璇︽儏淇℃伅
+ */
+ private String msg;
+
+ /**
+ * 闆嗘垚绯荤粺缂栫爜
+ */
+ private String systemCode;
+
+ /**
+ * 涓绘暟鎹ā鍨嬬殑缂栫爜
+ */
+ private String mdType;
+
+ /***
+ * 鏁版嵁鍒嗗彂鎵�瑙﹀彂鐨勭被鍨� 鎵嬪姩鍒嗗彂:distribute_manual,
+ */
+ private String action;
+
+ /***
+ * 娑堣垂绯荤粺涓厤缃殑鍒嗗彂浠ょ墝
+ */
+ private String distributeToken;
+
+ /***
+ * 鍒嗗彂浜哄憳鏁版嵁淇℃伅
+ */
+ private String masterData;
+
+ @Override
+ public String toString() {
+ return "PersonData{" +
+ "code='" + code + '\'' +
+ ", msg='" + msg + '\'' +
+ ", systemCode='" + systemCode + '\'' +
+ ", mdType='" + mdType + '\'' +
+ ", action='" + action + '\'' +
+ ", distributeToken='" + distributeToken + '\'' +
+ ", masterData=" + masterData +
+ '}';
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
index a9ea031..734f872 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
@@ -103,7 +103,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆dockingPreApplyForm")
public R<IPage<DockingPreApplyFormVO>> page(DockingPreApplyForm dockingPreApplyForm, Query query) {
- IPage<DockingPreApplyForm> pages = dockingPreApplyFormService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingPreApplyForm));
+ IPage<DockingPreApplyForm> pages = dockingPreApplyFormService.page(Condition.getPage(query.setDescs("createTime")), Condition.getQueryWrapper(dockingPreApplyForm));
return R.data(DockingPreApplyFormWrapper.build().pageVO(pages));
}
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 4000224..23fc0bb 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,15 +1,17 @@
package com.vci.ubcs.code.controller;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.shaded.com.google.gson.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.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* 鐢宠浜哄憳閮ㄩ棬鎺у埗鍣�
@@ -34,15 +36,18 @@
/****
* 浜哄憳鏁版嵁鍚屾
- * @param personData
+ * @param personDataVO
* @return
* @throws Throwable
*/
@PostMapping("/syncDataForPerson")
- public ResultOrgData syncDataForPerson(@RequestBody PersonData personData, HttpServletRequest request) {
+ public ResultOrgData syncDataForPerson(@RequestBody PersonDataVO personDataVO, HttpServletRequest request) {
this.setHttpToThreadLocal(request);
- String result="";
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();
@@ -53,15 +58,18 @@
/****
* 閮ㄩ棬鏁版嵁鍚屾
- * @param orgData 閮ㄩ棬鏁版嵁
+ * @param orgDataVO 閮ㄩ棬鏁版嵁
* @return
* @throws Throwable
*/
@PostMapping("/syncDataForOrg")
- public ResultOrgData syncDataForOrg(@RequestBody OrgData orgData, HttpServletRequest request) {
+ public ResultOrgData syncDataForOrg(@RequestBody OrgDataVO orgDataVO, HttpServletRequest request) {
this.setHttpToThreadLocal(request);
- String result="";
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();
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index e7e6129..9528c9e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -972,7 +972,7 @@
}
}catch (Throwable e){
success.set(false);
- message="浜哄憳鏁版嵁鎺ュ彈澶辫触:"+e.getMessage();
+ message="閮ㄩ棬鏁版嵁鎺ュ彈澶辫触:"+e.getMessage();
//缁勭粐杩斿洖缁撴灉
boolean finalSuccess = success.get();
String finalMessage = message;
--
Gitblit v1.9.3