【modify】加密的数据接收类更名,单独成立一个包
【modify】user无用的字段用sysUser删除
This commit is contained in:
+20
-22
@@ -7,16 +7,14 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.jero.common.util.DateUtils;
|
||||
import com.jero.common.util.UUIDGenerator;
|
||||
import com.jero.common.util.UUIDUtils;
|
||||
import com.jero.config.sign.util.HttpUtils;
|
||||
import com.jero.modules.docking.iam.dto.IamCommonAcceptDto;
|
||||
import com.jero.modules.docking.iam.dto.IamOrgAcceptDto;
|
||||
import com.jero.modules.docking.iam.dto.IamUserAcceptDto;
|
||||
import com.jero.modules.docking.iam.po.AcceptPoSystemPo;
|
||||
import com.jero.modules.docking.iam.po.encrypt.AcceptEncryptPo;
|
||||
import com.jero.modules.docking.iam.po.MessageHeader;
|
||||
import com.jero.modules.docking.iam.po.MessageTabels;
|
||||
import com.jero.modules.docking.iam.po.MessageTabelsHeader;
|
||||
import com.jero.modules.docking.iam.po.encrypt.MessageEncryptTabels;
|
||||
import com.jero.modules.docking.iam.po.encrypt.MessageEncryptTabelsHeader;
|
||||
import com.jero.modules.docking.utils.DockingConstant;
|
||||
import org.apache.poi.ss.formula.functions.T;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@@ -27,9 +25,9 @@ public class TestClient {
|
||||
|
||||
public static void main(String[] args) throws JsonProcessingException {
|
||||
TestClient testClient = new TestClient();
|
||||
// testClient.sendSchemaService(); // 字段映射接口测试
|
||||
testClient.sendUserCreate(); // 创建用户接口测试
|
||||
// testClient.sendUserUpdate(); // 更新用户接口测试
|
||||
testClient.sendSchemaService(); // 字段映射接口测试
|
||||
// testClient.sendUserCreate(); // 创建用户接口测试
|
||||
testClient.sendUserUpdate(); // 更新用户接口测试
|
||||
testClient.sendOrgCreate(); // 组织创建接口测试
|
||||
}
|
||||
|
||||
@@ -38,7 +36,7 @@ public class TestClient {
|
||||
* @param encryptData
|
||||
* @return
|
||||
*/
|
||||
private AcceptPoSystemPo handlerPoPackage(String encryptData) {
|
||||
private AcceptEncryptPo handlerPoPackage(String encryptData) {
|
||||
MessageHeader messageHeader = new MessageHeader();
|
||||
messageHeader.setInterfaceID("SRMSUSERCREATE");
|
||||
messageHeader.setUUID(UUIDGenerator.generate());
|
||||
@@ -50,17 +48,17 @@ public class TestClient {
|
||||
messageHeader.setSendDate(DateUtils.formatDate(curDate, "YYYYMMDD"));
|
||||
messageHeader.setSendTime(DateUtils.formatDate(curDate, "HHmmss"));
|
||||
|
||||
MessageTabelsHeader messageTabelsHeader = new MessageTabelsHeader();
|
||||
messageTabelsHeader.setData(encryptData);
|
||||
MessageEncryptTabelsHeader messageEncryptTabelsHeader = new MessageEncryptTabelsHeader();
|
||||
messageEncryptTabelsHeader.setData(encryptData);
|
||||
|
||||
MessageTabels messageTabels = new MessageTabels();
|
||||
messageTabels.setHeader(messageTabelsHeader);
|
||||
MessageEncryptTabels messageEncryptTabels = new MessageEncryptTabels();
|
||||
messageEncryptTabels.setHeader(messageEncryptTabelsHeader);
|
||||
|
||||
AcceptPoSystemPo acceptPoSystemPo = new AcceptPoSystemPo();
|
||||
acceptPoSystemPo.setMessageHeader(messageHeader);
|
||||
acceptPoSystemPo.setMessageTabels(messageTabels);
|
||||
AcceptEncryptPo acceptEncryptPo = new AcceptEncryptPo();
|
||||
acceptEncryptPo.setMessageHeader(messageHeader);
|
||||
acceptEncryptPo.setMessageEncryptTabels(messageEncryptTabels);
|
||||
|
||||
return acceptPoSystemPo;
|
||||
return acceptEncryptPo;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -79,7 +77,7 @@ public class TestClient {
|
||||
String sendData = objectMapper.writeValueAsString(iamCommonAcceptDto);
|
||||
String encryptData = BamboocloudFacade.encrypt(sendData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
|
||||
|
||||
AcceptPoSystemPo sendPoDataEntity = handlerPoPackage(encryptData);
|
||||
AcceptEncryptPo sendPoDataEntity = handlerPoPackage(encryptData);
|
||||
String sendPoDataJson = objectMapper.writeValueAsString(sendPoDataEntity);
|
||||
|
||||
String response = HttpUtil.post(url, sendPoDataJson);
|
||||
@@ -119,7 +117,7 @@ public class TestClient {
|
||||
String encryptData = BamboocloudFacade.encrypt(sendData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
|
||||
|
||||
// 封装 AcceptPoSystemPo 为PO层套壳
|
||||
AcceptPoSystemPo sendPoDataEntity = handlerPoPackage(encryptData);
|
||||
AcceptEncryptPo sendPoDataEntity = handlerPoPackage(encryptData);
|
||||
String sendPoDataJson = objectMapper.writeValueAsString(sendPoDataEntity);
|
||||
|
||||
// 发送数据
|
||||
@@ -148,13 +146,13 @@ public class TestClient {
|
||||
String encryptData = BamboocloudFacade.encrypt(sendData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
|
||||
|
||||
// 封装 AcceptPoSystemPo 为PO层套壳
|
||||
AcceptPoSystemPo sendPoDataEntity = handlerPoPackage(encryptData);
|
||||
AcceptEncryptPo sendPoDataEntity = handlerPoPackage(encryptData);
|
||||
String sendPoDataJson = objectMapper.writeValueAsString(sendPoDataEntity);
|
||||
|
||||
// 发送数据
|
||||
String url = "http://localhost:8184/laws-sinotruk/sync/iam/UserUpdateService";
|
||||
String response = HttpUtil.post(url, sendPoDataJson);
|
||||
System.out.println("用户创建接口响应:" + response);
|
||||
System.out.println("用户更新接口响应:" + response);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -183,7 +181,7 @@ public class TestClient {
|
||||
String encryptData = BamboocloudFacade.encrypt(sendData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
|
||||
|
||||
// 封装 AcceptPoSystemPo 为PO层套壳
|
||||
AcceptPoSystemPo sendPoDataEntity = handlerPoPackage(encryptData);
|
||||
AcceptEncryptPo sendPoDataEntity = handlerPoPackage(encryptData);
|
||||
String sendPoDataJson = objectMapper.writeValueAsString(sendPoDataEntity);
|
||||
|
||||
// 发送数据
|
||||
|
||||
+51
-52
@@ -1,7 +1,6 @@
|
||||
package com.jero.modules.docking.iam.controller;
|
||||
|
||||
import cn.hutool.core.text.CharSequenceUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
@@ -12,9 +11,9 @@ import com.jero.modules.docking.iam.dto.IamOrgAcceptDto;
|
||||
import com.jero.modules.docking.iam.dto.IamUserAcceptDto;
|
||||
import com.jero.modules.docking.iam.dto.response.*;
|
||||
import com.jero.modules.docking.iam.exception.IamGlobalException;
|
||||
import com.jero.modules.docking.iam.po.AcceptPoSystemPo;
|
||||
import com.jero.modules.docking.iam.po.encrypt.AcceptEncryptPo;
|
||||
import com.jero.modules.docking.iam.po.MessageHeader;
|
||||
import com.jero.modules.docking.iam.po.SendPoSystemPo;
|
||||
import com.jero.modules.docking.iam.po.encrypt.SendPoEncryptPo;
|
||||
import com.jero.modules.docking.iam.service.SyncIamService;
|
||||
import com.jero.modules.docking.utils.BamboocloudUtils;
|
||||
import com.jero.modules.docking.utils.DockingConstant;
|
||||
@@ -46,16 +45,16 @@ public class SyncIamController {
|
||||
private SyncIamService syncIamService;
|
||||
|
||||
@PostMapping({"/SchemaService"})
|
||||
public SendPoSystemPo schemaService(@RequestBody AcceptPoSystemPo iamCommon) throws JsonProcessingException {
|
||||
public SendPoEncryptPo schemaService(@RequestBody AcceptEncryptPo iamCommon) throws JsonProcessingException {
|
||||
if (iamCommon == null
|
||||
|| iamCommon.getMessageTabels() == null
|
||||
|| iamCommon.getMessageTabels().getHeader() == null
|
||||
|| iamCommon.getMessageTabels().getHeader().getData() == null){
|
||||
|| iamCommon.getMessageEncryptTabels() == null
|
||||
|| iamCommon.getMessageEncryptTabels().getHeader() == null
|
||||
|| iamCommon.getMessageEncryptTabels().getHeader().getData() == null){
|
||||
throw new IamGlobalException(null, "参数传递错误,未收到参数");
|
||||
}
|
||||
|
||||
// 对核心数据解密
|
||||
String bodyParam = iamCommon.getMessageTabels().getHeader().getData();
|
||||
String bodyParam = iamCommon.getMessageEncryptTabels().getHeader().getData();
|
||||
String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
|
||||
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
@@ -69,24 +68,24 @@ public class SyncIamController {
|
||||
|
||||
// 处理统一响应PO层,并加密业务字段
|
||||
MessageHeader acceptMessageHeader = iamCommon.getMessageHeader();
|
||||
SendPoSystemPo sendPoSystemPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamSchemaResponse);
|
||||
SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamSchemaResponse);
|
||||
|
||||
return sendPoSystemPo;
|
||||
return sendPoEncryptPo;
|
||||
}
|
||||
|
||||
@PostMapping({"/UserCreateService"})
|
||||
public SendPoSystemPo userCreateService(@RequestBody AcceptPoSystemPo iamUserInfo) throws JsonProcessingException {
|
||||
public SendPoEncryptPo userCreateService(@RequestBody AcceptEncryptPo iamUserInfo) throws JsonProcessingException {
|
||||
IamUserAcceptDto userAcceptDto = null;
|
||||
try {
|
||||
if (iamUserInfo == null
|
||||
|| iamUserInfo.getMessageTabels() == null
|
||||
|| iamUserInfo.getMessageTabels().getHeader() == null
|
||||
|| iamUserInfo.getMessageTabels().getHeader().getData() == null){
|
||||
|| iamUserInfo.getMessageEncryptTabels() == null
|
||||
|| iamUserInfo.getMessageEncryptTabels().getHeader() == null
|
||||
|| iamUserInfo.getMessageEncryptTabels().getHeader().getData() == null){
|
||||
throw new IamGlobalException(null, "参数传递错误,未收到参数");
|
||||
}
|
||||
|
||||
// 对核心数据解密
|
||||
String bodyParam = iamUserInfo.getMessageTabels().getHeader().getData();
|
||||
String bodyParam = iamUserInfo.getMessageEncryptTabels().getHeader().getData();
|
||||
String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
|
||||
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
@@ -100,8 +99,8 @@ public class SyncIamController {
|
||||
|
||||
// 处理统一响应PO层,并加密业务字段
|
||||
MessageHeader acceptMessageHeader = iamUserInfo.getMessageHeader();
|
||||
SendPoSystemPo sendPoSystemPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamUserCreateResponse);
|
||||
return sendPoSystemPo;
|
||||
SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamUserCreateResponse);
|
||||
return sendPoEncryptPo;
|
||||
} catch (DuplicateKeyException duplicateKeyException) {
|
||||
log.error("数据库值重复:{}", duplicateKeyException.getMessage());
|
||||
if (userAcceptDto != null) {
|
||||
@@ -113,16 +112,16 @@ public class SyncIamController {
|
||||
}
|
||||
|
||||
@PostMapping({"/UserUpdateService"})
|
||||
public SendPoSystemPo userUpdateService(@RequestBody AcceptPoSystemPo iamUserInfo) throws JsonProcessingException {
|
||||
public SendPoEncryptPo userUpdateService(@RequestBody AcceptEncryptPo iamUserInfo) throws JsonProcessingException {
|
||||
if (iamUserInfo == null
|
||||
|| iamUserInfo.getMessageTabels() == null
|
||||
|| iamUserInfo.getMessageTabels().getHeader() == null
|
||||
|| iamUserInfo.getMessageTabels().getHeader().getData() == null){
|
||||
|| iamUserInfo.getMessageEncryptTabels() == null
|
||||
|| iamUserInfo.getMessageEncryptTabels().getHeader() == null
|
||||
|| iamUserInfo.getMessageEncryptTabels().getHeader().getData() == null){
|
||||
throw new IamGlobalException(null, "参数传递错误,未收到参数");
|
||||
}
|
||||
|
||||
// 对核心数据解密
|
||||
String bodyParam = iamUserInfo.getMessageTabels().getHeader().getData();
|
||||
String bodyParam = iamUserInfo.getMessageEncryptTabels().getHeader().getData();
|
||||
String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
|
||||
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
@@ -136,22 +135,22 @@ public class SyncIamController {
|
||||
|
||||
// 处理统一响应PO层,并加密业务字段
|
||||
MessageHeader acceptMessageHeader = iamUserInfo.getMessageHeader();
|
||||
SendPoSystemPo sendPoSystemPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamCommonResponseDto);
|
||||
SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamCommonResponseDto);
|
||||
|
||||
return sendPoSystemPo;
|
||||
return sendPoEncryptPo;
|
||||
}
|
||||
|
||||
@PostMapping({"/UserDeleteService"})
|
||||
public SendPoSystemPo userDeleteService(@RequestBody AcceptPoSystemPo iamUserInfo) throws JsonProcessingException {
|
||||
public SendPoEncryptPo userDeleteService(@RequestBody AcceptEncryptPo iamUserInfo) throws JsonProcessingException {
|
||||
if (iamUserInfo == null
|
||||
|| iamUserInfo.getMessageTabels() == null
|
||||
|| iamUserInfo.getMessageTabels().getHeader() == null
|
||||
|| iamUserInfo.getMessageTabels().getHeader().getData() == null){
|
||||
|| iamUserInfo.getMessageEncryptTabels() == null
|
||||
|| iamUserInfo.getMessageEncryptTabels().getHeader() == null
|
||||
|| iamUserInfo.getMessageEncryptTabels().getHeader().getData() == null){
|
||||
throw new IamGlobalException(null, "参数传递错误,未收到参数");
|
||||
}
|
||||
|
||||
// 对核心数据解密
|
||||
String bodyParam = iamUserInfo.getMessageTabels().getHeader().getData();
|
||||
String bodyParam = iamUserInfo.getMessageEncryptTabels().getHeader().getData();
|
||||
String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
|
||||
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
@@ -165,9 +164,9 @@ public class SyncIamController {
|
||||
|
||||
// 处理统一响应PO层,并加密业务字段
|
||||
MessageHeader acceptMessageHeader = iamUserInfo.getMessageHeader();
|
||||
SendPoSystemPo sendPoSystemPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamCommonResponseDto);
|
||||
SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamCommonResponseDto);
|
||||
|
||||
return sendPoSystemPo;
|
||||
return sendPoEncryptPo;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -178,18 +177,18 @@ public class SyncIamController {
|
||||
*/
|
||||
@PostMapping({"/OrgCreateService"})
|
||||
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
||||
public SendPoSystemPo orgCreateService(@RequestBody AcceptPoSystemPo iamOrgInfo) throws JsonProcessingException {
|
||||
public SendPoEncryptPo orgCreateService(@RequestBody AcceptEncryptPo iamOrgInfo) throws JsonProcessingException {
|
||||
IamOrgAcceptDto orgAcceptDto = null;
|
||||
try {
|
||||
if (iamOrgInfo == null
|
||||
|| iamOrgInfo.getMessageTabels() == null
|
||||
|| iamOrgInfo.getMessageTabels().getHeader() == null
|
||||
|| iamOrgInfo.getMessageTabels().getHeader().getData() == null){
|
||||
|| iamOrgInfo.getMessageEncryptTabels() == null
|
||||
|| iamOrgInfo.getMessageEncryptTabels().getHeader() == null
|
||||
|| iamOrgInfo.getMessageEncryptTabels().getHeader().getData() == null){
|
||||
throw new IamGlobalException(null, "参数传递错误,未收到参数");
|
||||
}
|
||||
|
||||
// 对核心数据解密
|
||||
String bodyParam = iamOrgInfo.getMessageTabels().getHeader().getData();
|
||||
String bodyParam = iamOrgInfo.getMessageEncryptTabels().getHeader().getData();
|
||||
String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
|
||||
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
@@ -203,8 +202,8 @@ public class SyncIamController {
|
||||
|
||||
// 处理统一响应PO层,并加密业务字段
|
||||
MessageHeader acceptMessageHeader = iamOrgInfo.getMessageHeader();
|
||||
SendPoSystemPo sendPoSystemPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamOrgCreateResponse);
|
||||
return sendPoSystemPo;
|
||||
SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamOrgCreateResponse);
|
||||
return sendPoEncryptPo;
|
||||
} catch (DuplicateKeyException duplicateKeyException) {
|
||||
log.error("数据库值重复:{}", duplicateKeyException.getMessage());
|
||||
if (orgAcceptDto != null) {
|
||||
@@ -223,16 +222,16 @@ public class SyncIamController {
|
||||
*/
|
||||
@PostMapping({"/OrgUpdateService"})
|
||||
@CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true)
|
||||
public SendPoSystemPo orgUpdateService(@RequestBody AcceptPoSystemPo iamOrgInfo) throws JsonProcessingException {
|
||||
public SendPoEncryptPo orgUpdateService(@RequestBody AcceptEncryptPo iamOrgInfo) throws JsonProcessingException {
|
||||
if (iamOrgInfo == null
|
||||
|| iamOrgInfo.getMessageTabels() == null
|
||||
|| iamOrgInfo.getMessageTabels().getHeader() == null
|
||||
|| iamOrgInfo.getMessageTabels().getHeader().getData() == null){
|
||||
|| iamOrgInfo.getMessageEncryptTabels() == null
|
||||
|| iamOrgInfo.getMessageEncryptTabels().getHeader() == null
|
||||
|| iamOrgInfo.getMessageEncryptTabels().getHeader().getData() == null){
|
||||
throw new IamGlobalException(null, "参数传递错误,未收到参数");
|
||||
}
|
||||
|
||||
// 对核心数据解密
|
||||
String bodyParam = iamOrgInfo.getMessageTabels().getHeader().getData();
|
||||
String bodyParam = iamOrgInfo.getMessageEncryptTabels().getHeader().getData();
|
||||
String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
|
||||
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
@@ -246,22 +245,22 @@ public class SyncIamController {
|
||||
|
||||
// 处理统一响应PO层,并加密业务字段
|
||||
MessageHeader acceptMessageHeader = iamOrgInfo.getMessageHeader();
|
||||
SendPoSystemPo sendPoSystemPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamCommonResponseDto);
|
||||
SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamCommonResponseDto);
|
||||
|
||||
return sendPoSystemPo;
|
||||
return sendPoEncryptPo;
|
||||
}
|
||||
|
||||
@PostMapping({"/OrgDeleteService"})
|
||||
public SendPoSystemPo orgDeleteService(@RequestBody AcceptPoSystemPo iamOrgInfo) throws JsonProcessingException {
|
||||
public SendPoEncryptPo orgDeleteService(@RequestBody AcceptEncryptPo iamOrgInfo) throws JsonProcessingException {
|
||||
if (iamOrgInfo == null
|
||||
|| iamOrgInfo.getMessageTabels() == null
|
||||
|| iamOrgInfo.getMessageTabels().getHeader() == null
|
||||
|| iamOrgInfo.getMessageTabels().getHeader().getData() == null){
|
||||
|| iamOrgInfo.getMessageEncryptTabels() == null
|
||||
|| iamOrgInfo.getMessageEncryptTabels().getHeader() == null
|
||||
|| iamOrgInfo.getMessageEncryptTabels().getHeader().getData() == null){
|
||||
throw new IamGlobalException(null, "参数传递错误,未收到参数");
|
||||
}
|
||||
|
||||
// 对核心数据解密
|
||||
String bodyParam = iamOrgInfo.getMessageTabels().getHeader().getData();
|
||||
String bodyParam = iamOrgInfo.getMessageEncryptTabels().getHeader().getData();
|
||||
String bodyParamDecrypt = BamboocloudUtils.getPlaintext(bodyParam, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
|
||||
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
@@ -275,9 +274,9 @@ public class SyncIamController {
|
||||
|
||||
// 处理统一响应PO层,并加密业务字段
|
||||
MessageHeader acceptMessageHeader = iamOrgInfo.getMessageHeader();
|
||||
SendPoSystemPo sendPoSystemPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamCommonResponseDto);
|
||||
SendPoEncryptPo sendPoEncryptPo = this.syncIamService.handlerGloablResponse(acceptMessageHeader, iamCommonResponseDto);
|
||||
|
||||
return sendPoSystemPo;
|
||||
return sendPoEncryptPo;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+4
-3
@@ -1,18 +1,19 @@
|
||||
package com.jero.modules.docking.iam.po;
|
||||
package com.jero.modules.docking.iam.po.encrypt;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.jero.modules.docking.iam.po.MessageHeader;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 和PO系统做数据交互的最外层壳,做数据接收用
|
||||
*/
|
||||
@Data
|
||||
public class AcceptPoSystemPo {
|
||||
public class AcceptEncryptPo {
|
||||
|
||||
@JsonProperty("MessageHeader")
|
||||
private MessageHeader messageHeader;
|
||||
|
||||
@JsonProperty("Tables")
|
||||
private MessageTabels messageTabels;
|
||||
private MessageEncryptTabels messageEncryptTabels;
|
||||
|
||||
}
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package com.jero.modules.docking.iam.po;
|
||||
package com.jero.modules.docking.iam.po.encrypt;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
@@ -7,9 +7,9 @@ import lombok.Data;
|
||||
* PO系统交互必须的实体,包含接口传递的正式数据(仅为套的一层壳)
|
||||
*/
|
||||
@Data
|
||||
public class MessageTabels {
|
||||
public class MessageEncryptTabels {
|
||||
|
||||
@JsonProperty("Header")
|
||||
private MessageTabelsHeader header;
|
||||
private MessageEncryptTabelsHeader header;
|
||||
|
||||
}
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package com.jero.modules.docking.iam.po;
|
||||
package com.jero.modules.docking.iam.po.encrypt;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
@@ -7,7 +7,7 @@ import lombok.Data;
|
||||
* 接受数据的tables中的header层
|
||||
*/
|
||||
@Data
|
||||
public class MessageTabelsHeader {
|
||||
public class MessageEncryptTabelsHeader {
|
||||
|
||||
@JsonProperty("data")
|
||||
private String data;
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package com.jero.modules.docking.iam.po;
|
||||
package com.jero.modules.docking.iam.po.encrypt;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import lombok.Data;
|
||||
@@ -7,12 +7,12 @@ import lombok.Data;
|
||||
* 返回数据的Return层
|
||||
*/
|
||||
@Data
|
||||
public class SendReturnsPo {
|
||||
public class SendEncryptReturnsPo {
|
||||
|
||||
@JsonProperty("data")
|
||||
private String data;
|
||||
|
||||
public SendReturnsPo(String data){
|
||||
public SendEncryptReturnsPo(String data){
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
+4
-3
@@ -1,18 +1,19 @@
|
||||
package com.jero.modules.docking.iam.po;
|
||||
package com.jero.modules.docking.iam.po.encrypt;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.jero.modules.docking.iam.po.MessageHeader;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 和PO系统做数据交互的最外层壳,做数据发送用
|
||||
*/
|
||||
@Data
|
||||
public class SendPoSystemPo {
|
||||
public class SendPoEncryptPo {
|
||||
|
||||
@JsonProperty("MessageHeader")
|
||||
private MessageHeader messageHeader;
|
||||
|
||||
@JsonProperty("Returns")
|
||||
private SendReturnsPo returns;
|
||||
private SendEncryptReturnsPo returns;
|
||||
|
||||
}
|
||||
+7
-15
@@ -1,14 +1,11 @@
|
||||
package com.jero.modules.docking.iam.service;
|
||||
|
||||
import cn.hutool.core.lang.Validator;
|
||||
import cn.hutool.core.text.CharSequenceUtil;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.bamboocloud.codec.BamboocloudFacade;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.jero.common.aspect.annotation.Translation;
|
||||
import com.jero.common.constant.CommonConstant;
|
||||
import com.jero.common.util.DateUtils;
|
||||
import com.jero.common.util.PasswordUtil;
|
||||
@@ -25,22 +22,17 @@ import com.jero.modules.docking.iam.dto.bpmc.UserRoleDto;
|
||||
import com.jero.modules.docking.iam.dto.response.*;
|
||||
import com.jero.modules.docking.iam.exception.IamGlobalException;
|
||||
import com.jero.modules.docking.iam.po.MessageHeader;
|
||||
import com.jero.modules.docking.iam.po.SendPoSystemPo;
|
||||
import com.jero.modules.docking.iam.po.SendReturnsPo;
|
||||
import com.jero.modules.docking.iam.po.encrypt.SendPoEncryptPo;
|
||||
import com.jero.modules.docking.iam.po.encrypt.SendEncryptReturnsPo;
|
||||
import com.jero.modules.docking.utils.DockingConstant;
|
||||
import com.jero.modules.system.controller.DuplicateCheckController;
|
||||
import com.jero.modules.system.entity.*;
|
||||
import com.jero.modules.system.model.DuplicateCheckVo;
|
||||
import com.jero.modules.system.service.*;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.security.core.parameters.P;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.print.Doc;
|
||||
import java.lang.reflect.Field;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
@@ -539,8 +531,8 @@ public class SyncIamService {
|
||||
* @return
|
||||
* @throws JsonProcessingException
|
||||
*/
|
||||
public SendPoSystemPo handlerGloablResponse(MessageHeader acceptMessageHeader, Object object) throws JsonProcessingException {
|
||||
SendPoSystemPo sendPoSystemPo = new SendPoSystemPo();
|
||||
public SendPoEncryptPo handlerGloablResponse(MessageHeader acceptMessageHeader, Object object) throws JsonProcessingException {
|
||||
SendPoEncryptPo sendPoEncryptPo = new SendPoEncryptPo();
|
||||
|
||||
MessageHeader sendMessageHeader = new MessageHeader();
|
||||
sendMessageHeader.setInterfaceID(acceptMessageHeader.getInterfaceID());
|
||||
@@ -558,10 +550,10 @@ public class SyncIamService {
|
||||
// 加密PO层外的业务数据
|
||||
String encryptData = BamboocloudFacade.encrypt(returnData, DockingConstant.IAM_ENCRYPT_SECRET, DockingConstant.IAM_ENCRYPT_TYPE);
|
||||
|
||||
sendPoSystemPo.setMessageHeader(sendMessageHeader);
|
||||
sendPoSystemPo.setReturns(new SendReturnsPo(encryptData));
|
||||
sendPoEncryptPo.setMessageHeader(sendMessageHeader);
|
||||
sendPoEncryptPo.setReturns(new SendEncryptReturnsPo(encryptData));
|
||||
|
||||
return sendPoSystemPo;
|
||||
return sendPoEncryptPo;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user