From 8403e0407d0980d258f24cdbdf761b85590ee0b0 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 7 Nov 2023 14:38:04 +0800 Subject: [PATCH] =?UTF-8?q?fix(iam):=20=E6=9D=83=E9=99=90=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=A3=E6=8E=A5=E6=94=B6=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iam/controller/SyncIamController.java | 12 ++++++------ .../docking/iam/dto/bpmc/ResourceDto.java | 2 ++ .../modules/docking/iam/dto/bpmc/RoleDto.java | 2 ++ .../docking/iam/dto/bpmc/RoleResourceDto.java | 2 ++ .../docking/iam/dto/bpmc/UserRoleDto.java | 4 ++-- .../docking/iam/po/decrypt/AcceptDecryptPo.java | 4 ++-- .../iam/po/decrypt/MessageDecryptTabels.java | 5 ++--- .../iam/po/decrypt/MessageTablesData.java | 17 +++++++++++++++++ 8 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageTablesData.java diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/SyncIamController.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/SyncIamController.java index e83860e5..fbbb7cf0 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/SyncIamController.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/SyncIamController.java @@ -5,18 +5,17 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.jero.common.constant.CacheConstant; -import com.jero.common.constant.CommonConstant; import com.jero.modules.base.service.BaseCommonService; -import com.jero.modules.docking.iam.dto.bpmc.*; 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.dto.bpmc.*; 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.decrypt.AcceptDecryptPo; import com.jero.modules.docking.iam.po.decrypt.SendPoDecryptPo; import com.jero.modules.docking.iam.po.encrypt.AcceptEncryptPo; -import com.jero.modules.docking.iam.po.MessageHeader; import com.jero.modules.docking.iam.po.encrypt.SendPoEncryptPo; import com.jero.modules.docking.iam.service.SyncIamService; import com.jero.modules.docking.utils.BamboocloudUtils; @@ -295,7 +294,7 @@ public class SyncIamController { * 通过type字段来区分 */ @PostMapping({"/bpmcCreate"}) - public SendPoDecryptPo bpmcCreate(@RequestBody AcceptDecryptPo acceptDecryptPo) throws JsonProcessingException { + public SendPoDecryptPo bpmcCreate(@RequestBody AcceptDecryptPo acceptDecryptPo) throws JsonProcessingException { if (acceptDecryptPo == null || acceptDecryptPo.getMessageDecryptTabels() == null || acceptDecryptPo.getMessageDecryptTabels().getHeader() == null){ @@ -303,8 +302,10 @@ public class SyncIamController { } log.info("统一权限服务平台请求数据:{}", acceptDecryptPo.toString()); + ObjectMapper objectMapper = new ObjectMapper(); + BpmcAcceptDto bpmcAcceptDto = objectMapper.readValue(acceptDecryptPo.getMessageDecryptTabels().getHeader().getData(), BpmcAcceptDto.class); - BpmcAcceptDto bpmcAcceptDto = acceptDecryptPo.getMessageDecryptTabels().getHeader(); +// BpmcAcceptDto bpmcAcceptDto = acceptDecryptPo.getMessageDecryptTabels().getHeader(); MessageHeader messageHeader = acceptDecryptPo.getMessageHeader(); if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getType())){ @@ -346,7 +347,6 @@ public class SyncIamController { BpmcResponseDto bpmcResponseDto = BpmcResponseDto.success(); - ObjectMapper objectMapper = new ObjectMapper(); // 分接口类型分别处理 if (bpmcAcceptDto.getType().equals(DockingConstant.BPMC_TYPE_ROLE)){ RoleDto roleDto = objectMapper.readValue(bpmcAcceptDto.getEntity(), RoleDto.class); diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/ResourceDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/ResourceDto.java index 84bde6be..157d7965 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/ResourceDto.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/ResourceDto.java @@ -1,5 +1,6 @@ package com.jero.modules.docking.iam.dto.bpmc; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import java.util.Date; @@ -8,6 +9,7 @@ import java.util.Date; * 统一权限服务平台的菜单实体 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class ResourceDto { private String id; diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleDto.java index 156d555b..1a4284e5 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleDto.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleDto.java @@ -1,5 +1,6 @@ package com.jero.modules.docking.iam.dto.bpmc; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import java.util.Date; @@ -8,6 +9,7 @@ import java.util.Date; * 统一权限服务平台的角色实体 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class RoleDto { private String id; diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleResourceDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleResourceDto.java index 9afbcdae..30a798f3 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleResourceDto.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/RoleResourceDto.java @@ -1,11 +1,13 @@ package com.jero.modules.docking.iam.dto.bpmc; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; /** * 统一权限服务平台的 角色-菜单关联 实体 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class RoleResourceDto { /** diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/UserRoleDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/UserRoleDto.java index a5143183..82cb8d5e 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/UserRoleDto.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/bpmc/UserRoleDto.java @@ -1,13 +1,13 @@ package com.jero.modules.docking.iam.dto.bpmc; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; -import java.util.Date; - /** * 统一权限服务平台的 用户-角色关联 实体 */ @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class UserRoleDto { /** diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/AcceptDecryptPo.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/AcceptDecryptPo.java index bff3c556..891d2911 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/AcceptDecryptPo.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/AcceptDecryptPo.java @@ -8,12 +8,12 @@ import lombok.Data; * 和PO系统做数据交互的最外层壳，做数据接收用 */ @Data -public class AcceptDecryptPo { +public class AcceptDecryptPo { @JsonProperty("MessageHeader") private MessageHeader messageHeader; @JsonProperty("Tables") - private MessageDecryptTabels messageDecryptTabels; + private MessageDecryptTabels messageDecryptTabels; } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageDecryptTabels.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageDecryptTabels.java index 4364a654..8be046df 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageDecryptTabels.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageDecryptTabels.java @@ -7,9 +7,8 @@ import lombok.Data; * PO系统交互必须的实体，包含接口传递的正式数据（仅为套的一层壳） */ @Data -public class MessageDecryptTabels { +public class MessageDecryptTabels { @JsonProperty("Header") - private T header; - + private MessageTablesData header; } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageTablesData.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageTablesData.java new file mode 100644 index 00000000..57908672 --- /dev/null +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/po/decrypt/MessageTablesData.java @@ -0,0 +1,17 @@ +package com.jero.modules.docking.iam.po.decrypt; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +/** + * @ClassName: MessageTablesData + * @Description: + * @Author: yjz + * @Date: 2023-11-07 14:21 + * @Version: 1.0 + **/ +@Data +public class MessageTablesData { + @JsonProperty("data") + private String data; +}