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

REQ-3581: 备份

Browse Source
This commit is contained in:
yanglin 2025-02-14 13:45:01 +08:00
parent f2559b8d11
commit 748e1db083
7 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/OrgPerson.java Normal file
View File

@ -0,0 +1,12 @@
package cn.axzo.nanopart.ess.api.domain;
/**
* @author yanglin
*/
public interface OrgPerson {
Long getOuId();
Long getPersonId();
}

3
ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/request/CreateContractInfo.java
View File

@ -1,5 +1,6 @@
package cn.axzo.nanopart.ess.api.request;
import cn.axzo.nanopart.ess.api.domain.OrgPerson;
import cn.axzo.nanopart.ess.api.enums.EssSealType;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Getter;
@ -60,7 +61,7 @@ public class CreateContractInfo {
}
@Setter @Getter
public static class ApproverInfo {
public static class ApproverInfo implements OrgPerson {
/**
* 签署方单位id

3
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssPerson.java
View File

@ -1,5 +1,6 @@
package cn.axzo.nanopart.ess.server.entity;
import cn.axzo.nanopart.ess.api.domain.OrgPerson;
import cn.axzo.nanopart.ess.server.utils.YesOrNo;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import com.alibaba.fastjson.JSON;
@ -15,7 +16,7 @@ import lombok.Setter;
@Setter
@Getter
@TableName(value = "ess_person", autoResultMap = true)
public class EssPerson extends BaseEntity<EssPerson> {
public class EssPerson extends BaseEntity<EssPerson> implements OrgPerson {
/**
* 单位id

3
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssSealPerson.java
View File

@ -1,5 +1,6 @@
package cn.axzo.nanopart.ess.server.entity;
import cn.axzo.nanopart.ess.api.domain.OrgPerson;
import cn.axzo.nanopart.ess.server.utils.YesOrNo;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import com.alibaba.fastjson.JSON;
@ -15,7 +16,7 @@ import lombok.Setter;
@Setter
@Getter
@TableName(value = "ess_seal_person", autoResultMap = true)
public class EssSealPerson extends BaseEntity<EssSealPerson> {
public class EssSealPerson extends BaseEntity<EssSealPerson> implements OrgPerson {
/**
* 单位id

20
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java
View File

@ -145,9 +145,7 @@ public class EssClient implements InitializingBean {
ChannelCreateSealPolicyRequest request = new ChannelCreateSealPolicyRequest();
request.setAgent(agent(superAdmin));
request.setSealId(seal.getEssSealId());
request.setUserIds(new String[]{
PersonOpenId.create(sealPerson.getOuId(), sealPerson.getPersonId()).toOpenId()
});
request.setUserIds(new String[]{PersonOpenId.create(sealPerson).toOpenId()});
exec(func()
.context("ChannelCreateSealPolicy")
.subject(IdBuilder.builder()
@ -162,9 +160,7 @@ public class EssClient implements InitializingBean {
ChannelDeleteSealPoliciesRequest request = new ChannelDeleteSealPoliciesRequest();
request.setAgent(agent(superAdmin));
request.setSealId(seal.getEssSealId());
request.setUserIds(new String[]{
PersonOpenId.create(sealPerson.getOuId(), sealPerson.getPersonId()).toOpenId()
});
request.setUserIds(new String[]{PersonOpenId.create(sealPerson).toOpenId()});
exec(func()
.context("ChannelDeleteSealPolicies")
.subject(IdBuilder.builder()
@ -230,9 +226,9 @@ public class EssClient implements InitializingBean {
approvers.add(approver);
approver.setName(personProfile.getRealName());
approver.setMobile(personProfile.getPhone());
approver.setOpenId(PersonOpenId.create(approverInfo.getOuId(), approverInfo.getPersonId()).toOpenId());
approver.setOpenId(PersonOpenId.create(approverInfo).toOpenId());
approver.setOrganizationName(orgProfile.getName());
approver.setOrganizationOpenId(OuOpenId.create(approverInfo.getOuId()).toOpenId());
approver.setOrganizationOpenId(OuOpenId.ofPerson(approverInfo).toOpenId());
approver.setApproverType(approverInfo.getApproverType().name());
approver.setNotifyType("NONE");
approver.setPreReadTime(approverInfo.getPreReadTimeSeconds());
@ -280,7 +276,7 @@ public class EssClient implements InitializingBean {
ChannelCreateOrganizationBatchSignUrlRequest request = new ChannelCreateOrganizationBatchSignUrlRequest();
request.setAgent(agent(signPerson));
request.setFlowIds(new String[]{essContractId});
request.setOpenId(PersonOpenId.create(signPerson.getOuId(), signPerson.getPersonId()).toOpenId());
request.setOpenId(PersonOpenId.create(signPerson).toOpenId());
ChannelCreateOrganizationBatchSignUrlResponse response = exec(func()
.context("ChannelCreateOrganizationBatchSignUrl")
.subject(essContractId)
@ -293,7 +289,7 @@ public class EssClient implements InitializingBean {
CreateSignUrlsRequest request = new CreateSignUrlsRequest();
request.setAgent(agent(signPerson));
request.setFlowIds(new String[]{essContractId});
request.setOpenId(PersonOpenId.create(signPerson.getOuId(), signPerson.getPersonId()).toOpenId());
request.setOpenId(PersonOpenId.create(signPerson).toOpenId());
CreateSignUrlsResponse response = exec(func()
.context("CreateSignUrls")
.subject(essContractId)
@ -319,8 +315,8 @@ public class EssClient implements InitializingBean {
UserInfo userInfo = new UserInfo();
agent.setAppId(props.getAppId());
agent.setProxyAppId("");
agent.setProxyOrganizationOpenId(OuOpenId.create(person.getOuId()).toOpenId());
userInfo.setOpenId(PersonOpenId.create(person.getOuId(), person.getPersonId()).toOpenId());
agent.setProxyOrganizationOpenId(OuOpenId.ofPerson(person).toOpenId());
userInfo.setOpenId(PersonOpenId.create(person).toOpenId());
agent.setProxyOperator(userInfo);
return agent;
}

5
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/OuOpenId.java
View File

@ -1,5 +1,6 @@
package cn.axzo.nanopart.ess.server.ess.domain;
import cn.axzo.nanopart.ess.api.domain.OrgPerson;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@ -13,6 +14,10 @@ public class OuOpenId {
private final Long ouId;
public static OuOpenId ofPerson(OrgPerson person) {
return create(person.getOuId());
}
public static OuOpenId create(Long ouId) {
return new OuOpenId(ouId);
}

5
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/PersonOpenId.java
View File

@ -1,5 +1,6 @@
package cn.axzo.nanopart.ess.server.ess.domain;
import cn.axzo.nanopart.ess.api.domain.OrgPerson;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@ -20,6 +21,10 @@ public class PersonOpenId {
return NONE;
}
public static PersonOpenId create(OrgPerson person) {
return create(person.getOuId(), person.getPersonId());
}
public static PersonOpenId create(Long ouId, Long personId) {
return new PersonOpenId(ouId, personId);
}