wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-3300: 调整信息

Browse Source
This commit is contained in:
yanglin 2025-02-27 16:05:33 +08:00
parent 6d9d53ae35
commit cd637951a3
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssService.java
View File

@ -62,7 +62,10 @@ public class EssService {
@BizTransactional @BizTransactional
public String createConsoleLoginUrl(CreateConsoleLoginUrlRequest request) { 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); essLogDao.logRequest("createConsoleLoginUrl", subject, request);
OrgAndPerson orgAndPerson = orgManager.createConsoleLoginUrl(request); OrgAndPerson orgAndPerson = orgManager.createConsoleLoginUrl(request);
return essClient.createConsoleLoginUrl(orgAndPerson.getOrg(), orgAndPerson.getPerson(), request.getEndpoint(), return essClient.createConsoleLoginUrl(orgAndPerson.getOrg(), orgAndPerson.getPerson(), request.getEndpoint(),
@ -88,7 +91,10 @@ public class EssService {
@BizTransactional @BizTransactional
public void essAddSealAuthorization(AddSealAuthorizationRequest request) { 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); essLogDao.logRequest("essAddSealAuthorization", subject, request);
SealAndPerson sealAndPerson = getSealAndPersonOrThrow(request); SealAndPerson sealAndPerson = getSealAndPersonOrThrow(request);
EssSealPerson sealPerson = sealAndPerson.getSealPerson(); EssSealPerson sealPerson = sealAndPerson.getSealPerson();
@ -104,7 +110,10 @@ public class EssService {
@BizTransactional @BizTransactional
public void essRemoveSealAuthorization(RemoveSealAuthorizationRequest request) { 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); essLogDao.logRequest("essRemoveSealAuthorization", subject, request);
SealAndPerson sealAndPerson = getSealAndPersonOrThrow(request); SealAndPerson sealAndPerson = getSealAndPersonOrThrow(request);
if (!sealAndPerson.getSealPerson().isAuthorized()) if (!sealAndPerson.getSealPerson().isAuthorized())
@ -124,8 +133,11 @@ public class EssService {
} }
public String getContractSignUrl(GetSignUrlRequest request) { public String getContractSignUrl(GetSignUrlRequest request) {
String subject = idbuilder().append(request.getEssContractId()).append(request.getOuId()).append( String subject = idbuilder() //
request.getPersonId()).build(); .append(request.getEssContractId()) //
.append(request.getOuId()) //
.append(request.getPersonId()) //
.build();
essLogDao.logRequest("getContractSignUrl", subject, request); essLogDao.logRequest("getContractSignUrl", subject, request);
EssPerson signPerson = essPersonDao.findOrNull(request); EssPerson signPerson = essPersonDao.findOrNull(request);
BizAssertions.assertNotNull(signPerson, "当前签署人员未加入单位, 无法签署"); BizAssertions.assertNotNull(signPerson, "当前签署人员未加入单位, 无法签署");

16
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/CallbackController.java
View File

@ -81,7 +81,10 @@ class CallbackController implements EssCallbackApi, InitializingBean {
orgManager.addAuthorizedOrgPerson(superAdmin); orgManager.addAuthorizedOrgPerson(superAdmin);
orgManager.setOrgAuthorized(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 -> { registerHandler(CallbackType.ORG_PERSON_JOIN, request -> {
@ -98,13 +101,18 @@ class CallbackController implements EssCallbackApi, InitializingBean {
essService.essAddSealAuthorization(addSealAuthorizationRequest); essService.essAddSealAuthorization(addSealAuthorizationRequest);
} }
catch (Exception e) { catch (Exception e) {
String subject = idbuilder().append(sealPerson.getEssSealId()).append( String subject = idbuilder() //
sealPerson.getPersonId()).build(); .append(sealPerson.getEssSealId()) //
.append(sealPerson.getPersonId()) //
.build();
essLogDao.log(e, "essAddSealAuthorization", subject); essLogDao.log(e, "essAddSealAuthorization", subject);
log.warn("add seal authorization failed", e); 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 -> { registerHandler(CallbackType.SEAL_OPERATE, request -> {