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-26 15:48:38 +08:00
parent 5708bbba0c
commit f3a6480e2b
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/domain/contract/EssApproveDetail.java
View File

@ -46,6 +46,11 @@ public class EssApproveDetail {
*/
private long approverDeadlineMs;
/**
* 单位id, 动态签署人在没有签署的时候可能为空
*/
private Long ouId;
/**
* 单位名称, 动态签署人在没有签署的时候可能为空
*/

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

@ -1,6 +1,7 @@
package cn.axzo.nanopart.ess.server.ess.controller;
import cn.axzo.framework.domain.web.result.ApiResult;
import cn.axzo.maokai.api.vo.response.OrganizationalUnitVO;
import cn.axzo.nanopart.ess.api.EssCallbackApi;
import cn.axzo.nanopart.ess.api.domain.contract.EssApproveDetail;
import cn.axzo.nanopart.ess.api.enums.EssContractApproveState;
@ -23,11 +24,14 @@ import cn.axzo.nanopart.ess.server.ess.OrgManager;
import cn.axzo.nanopart.ess.server.ess.domain.JsonObjectAsString;
import cn.axzo.nanopart.ess.server.ess.domain.OrgOpenId;
import cn.axzo.nanopart.ess.server.ess.domain.PersonOpenId;
import cn.axzo.nanopart.ess.server.ess.support.EssSupport;
import cn.axzo.nanopart.ess.server.ess.support.OrgProfiles;
import com.alibaba.fastjson.JSONObject;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.web.bind.annotation.RestController;
@ -36,6 +40,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import static cn.axzo.nanopart.ess.api.request.CallbackRequest.ContractStateChanged;
@ -60,6 +65,7 @@ class CallbackController implements EssCallbackApi, InitializingBean {
private final EssContractDao essContractDao;
private final EssSealPersonDao essSealPersonDao;
private final TransactionTemplate transactionTemplate;
private final EssSupport essSupport;
private final Map<CallbackType, CallbackHandler> handlers = new HashMap<>();
@Override
@ -145,6 +151,12 @@ class CallbackController implements EssCallbackApi, InitializingBean {
log.warn("unknown contract state: {}", changes.getFlowStatus());
return changes.getFlowId();
}
List<Long> ouIds = changes.getFlowApproverInfo().stream()
.map(CallbackRequest.FlowApproverDetail::getProxyOrganizationOpenId)
.map(this::parseLong)
.filter(Objects::nonNull)
.collect(toList());
OrgProfiles orgProfiles = OrgProfiles.wrap(essSupport.getOrgProfiles(ouIds));
List<EssApproveDetail> approveDetails = changes.getFlowApproverInfo().stream()
.map(info -> {
EssApproveDetail detail = new EssApproveDetail();
@ -158,8 +170,13 @@ class CallbackController implements EssCallbackApi, InitializingBean {
detail.setApproveTimeMs(info.getApproveTime() * 1000);
detail.setMessage(info.getApproveMessage());
detail.setApproverDeadlineMs(info.getApproverDeadline() * 1000);
detail.setOuName(info.getProxyOrganizationName());
detail.setPhoneNumber(info.getPhoneNumber());
Long ouId = parseLong(info.getProxyOrganizationOpenId());
OrganizationalUnitVO org = orgProfiles.find(ouId).orElse(null);
if (org != null) {
detail.setOuName(org.getName());
detail.setOuId(org.getId());
}
return detail;
})
.collect(toList());
@ -184,6 +201,12 @@ class CallbackController implements EssCallbackApi, InitializingBean {
});
}
private Long parseLong(String value) {
if (StringUtils.isBlank(value) || !NumberUtils.isDigits(value))
return null;
return Long.parseLong(value);
}
@Override
public ApiResult<Object> callback(CallbackRequest request) {
log.info("ess callback: {}", request);

2
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/OrgProfiles.java
View File

@ -27,6 +27,8 @@ public class OrgProfiles {
}
public Optional<OrganizationalUnitVO> find(Long ouId) {
if (ouId == null)
return Optional.empty();
return profiles.stream()
.filter(p -> p.getId().equals(ouId))
.findFirst();