From cd637951a3083fa23ce4f66cac26a60b0ddceed3 Mon Sep 17 00:00:00 2001 From: yanglin Date: Thu, 27 Feb 2025 16:05:33 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3300:=20=E8=B0=83=E6=95=B4=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanopart/ess/server/ess/EssService.java | 22 ++++++++++++++----- .../ess/controller/CallbackController.java | 16 ++++++++++---- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java index 55dd32a0..920fed46 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java @@ -62,7 +62,10 @@ public class EssService { @BizTransactional public String createConsoleLoginUrl(CreateConsoleLoginUrlRequest request) { - String subject = idbuilder().append(request.getOuId()).append(request.getPersonId()).build(); + String subject = idbuilder() // + .append(request.getOuId()) // + .append(request.getPersonId()) // + .build(); essLogDao.logRequest("createConsoleLoginUrl", subject, request); OrgAndPerson orgAndPerson = orgManager.createConsoleLoginUrl(request); return essClient.createConsoleLoginUrl(orgAndPerson.getOrg(), orgAndPerson.getPerson(), request.getEndpoint(), @@ -88,7 +91,10 @@ public class EssService { @BizTransactional public void essAddSealAuthorization(AddSealAuthorizationRequest request) { - String subject = idbuilder().append(request.getEssSealId()).append(request.getPersonId()).build(); + String subject = idbuilder() // + .append(request.getEssSealId()) // + .append(request.getPersonId()) // + .build(); essLogDao.logRequest("essAddSealAuthorization", subject, request); SealAndPerson sealAndPerson = getSealAndPersonOrThrow(request); EssSealPerson sealPerson = sealAndPerson.getSealPerson(); @@ -104,7 +110,10 @@ public class EssService { @BizTransactional public void essRemoveSealAuthorization(RemoveSealAuthorizationRequest request) { - String subject = idbuilder().append(request.getEssSealId()).append(request.getPersonId()).build(); + String subject = idbuilder() // + .append(request.getEssSealId()) // + .append(request.getPersonId()) // + .build(); essLogDao.logRequest("essRemoveSealAuthorization", subject, request); SealAndPerson sealAndPerson = getSealAndPersonOrThrow(request); if (!sealAndPerson.getSealPerson().isAuthorized()) @@ -124,8 +133,11 @@ public class EssService { } public String getContractSignUrl(GetSignUrlRequest request) { - String subject = idbuilder().append(request.getEssContractId()).append(request.getOuId()).append( - request.getPersonId()).build(); + String subject = idbuilder() // + .append(request.getEssContractId()) // + .append(request.getOuId()) // + .append(request.getPersonId()) // + .build(); essLogDao.logRequest("getContractSignUrl", subject, request); EssPerson signPerson = essPersonDao.findOrNull(request); BizAssertions.assertNotNull(signPerson, "当前签署人员未加入单位, 无法签署"); diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/CallbackController.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/CallbackController.java index 7f575ce0..955c50df 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/CallbackController.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/CallbackController.java @@ -81,7 +81,10 @@ class CallbackController implements EssCallbackApi, InitializingBean { orgManager.addAuthorizedOrgPerson(superAdmin); orgManager.setOrgAuthorized(superAdmin); } - return idbuilder().append(superAdmin.getOuId()).append(superAdmin.getPersonId()).build(); + return idbuilder() // + .append(superAdmin.getOuId()) // + .append(superAdmin.getPersonId()) // + .build(); }); // 员工加入子企业的时候发送此通知 registerHandler(CallbackType.ORG_PERSON_JOIN, request -> { @@ -98,13 +101,18 @@ class CallbackController implements EssCallbackApi, InitializingBean { essService.essAddSealAuthorization(addSealAuthorizationRequest); } catch (Exception e) { - String subject = idbuilder().append(sealPerson.getEssSealId()).append( - sealPerson.getPersonId()).build(); + String subject = idbuilder() // + .append(sealPerson.getEssSealId()) // + .append(sealPerson.getPersonId()) // + .build(); essLogDao.log(e, "essAddSealAuthorization", subject); log.warn("add seal authorization failed", e); } } - return idbuilder().append(person.getOuId()).append(person.getPersonId()).build(); + return idbuilder() // + .append(person.getOuId()) // + .append(person.getPersonId()) // + .build(); }); // 印章回调 registerHandler(CallbackType.SEAL_OPERATE, request -> {