From 32f44760ceff18655a547b71b3795d81c6f0565e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 22 Feb 2024 16:01:40 +0800
Subject: [PATCH] =?UTF-8?q?IAM=20=E8=BF=94=E5=9B=9E=E5=80=BC=20returnCode?=
 =?UTF-8?q?=20=E6=94=B9=E4=B8=BA=20resultCode=20=E4=BD=9C=E8=80=85=20Xia?=
 =?UTF-8?q?=20Zekun=20<xiazekun@sinotruk.com>=EF=BC=8C2024/2/21=2016:08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docking/iam/controller/SyncIamController.java     | 11 ++++++-----
 .../docking/iam/dto/response/BpmcResponseDto.java     |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

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 7dd4778d..50c9c97f 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
@@ -336,7 +336,7 @@ public class SyncIamController {
         SendPoEncryptPo sendPoEncryptPo = new SendPoEncryptPo();
 
         if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getType())){
-            bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE);
+            bpmcResponseDto.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE);
             bpmcResponseDto.setMessage("接口类型（type）未传参，请检查");
             log.error(bpmcResponseDto.getMessage());
             sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto);
@@ -345,7 +345,7 @@ public class SyncIamController {
         }
 
         if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getEntity())){
-            bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE);
+            bpmcResponseDto.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE);
             bpmcResponseDto.setMessage("数据实体（entity）未传参，请检查");
             log.error(bpmcResponseDto.getMessage());
             sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto);
@@ -354,7 +354,7 @@ public class SyncIamController {
         }
 
         if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getAction())){
-            bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE);
+            bpmcResponseDto.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE);
             bpmcResponseDto.setMessage("操作方式（action）未传参，请检查");
             log.error(bpmcResponseDto.getMessage());
             sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto);
@@ -363,7 +363,7 @@ public class SyncIamController {
         }
 
         if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getSignature())){
-            bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE);
+            bpmcResponseDto.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE);
             bpmcResponseDto.setMessage("签名（signature）未传参，请检查");
             log.error(bpmcResponseDto.getMessage());
             sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto);
@@ -374,7 +374,7 @@ public class SyncIamController {
         // 验证签名
         String validateSign = SHA256Util.getSHA256StrJava(bpmcAcceptDto.getEntity() + bpmcAppkey + bpmcAcceptDto.getTimestamp());
         if (!bpmcAcceptDto.getSignature().equals(validateSign)){
-            bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE);
+            bpmcResponseDto.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE);
             bpmcResponseDto.setMessage("签名校验不通过，请检查");
             log.error(bpmcResponseDto.getMessage());
             sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto);
@@ -418,6 +418,7 @@ public class SyncIamController {
         sendPoEncryptPo.getReturns().setData(JSON.toJSONString(bpmcResponseDto));
         return sendPoEncryptPo;
     }
+
     private BpmcResponseDto bpmcTypeRoleResource(ObjectMapper objectMapper, BpmcAcceptDto bpmcAcceptDto, BpmcResponseDto bpmcResponseDto) throws JsonProcessingException {
         List<RoleResourceDto> roleResourceDtoList =  objectMapper.readValue(bpmcAcceptDto.getEntity(), new TypeReference<List<RoleResourceDto>>() {});
         // 根据新增/删除调用不同的业务处理代码
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/BpmcResponseDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/BpmcResponseDto.java
index b99cf01f..22a8c64f 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/BpmcResponseDto.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/BpmcResponseDto.java
@@ -5,12 +5,12 @@ import lombok.Data;
 @Data
 public class BpmcResponseDto {
 
-    private String returnCode;
+    private String resultCode;
 
     @Override
     public String toString() {
         return "{" +
-                "returnCode:'" + returnCode + '\'' +
+                "resultCode:'" + resultCode + '\'' +
                 ", message:'" + message + '\'' +
                 '}';
     }
@@ -18,7 +18,7 @@ public class BpmcResponseDto {
     private String message;
     public static BpmcResponseDto success(){
         BpmcResponseDto bpmcResponseDto = new BpmcResponseDto();
-        bpmcResponseDto.returnCode = "200"; // 成功时固定为200
+        bpmcResponseDto.resultCode = "200"; // 成功时固定为200
         bpmcResponseDto.message = "操作成功";
 
         return bpmcResponseDto;
@@ -26,7 +26,7 @@ public class BpmcResponseDto {
 
     public static BpmcResponseDto error(String message){
         BpmcResponseDto bpmcResponseDto = new BpmcResponseDto();
-        bpmcResponseDto.returnCode = "500"; // 失败时固定为500
+        bpmcResponseDto.resultCode = "500"; // 失败时固定为500
         bpmcResponseDto.message = message;
 
         return bpmcResponseDto;