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-20 11:38:17 +08:00
parent 4a10d081a1
commit bd639cd3cf
2 changed files with 25 additions and 18 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/ContractManager.java
View File

@ -20,6 +20,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionTemplate;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -43,8 +44,8 @@ public class ContractManager {
private final EssBroadcaster essBroadcaster; private final EssBroadcaster essBroadcaster;
private final ContractSupport contractSupport; private final ContractSupport contractSupport;
private final EssLogDao essLogDao; private final EssLogDao essLogDao;
private final TransactionTemplate transactionTemplate;
@Transactional
public CreateContractByFileResponse public CreateContractByFileResponse
createContractByFile(CreateContractByFileRequest request) { createContractByFile(CreateContractByFileRequest request) {
essLogDao.logRequest("createContractByFile", request.getBizCode(), request); essLogDao.logRequest("createContractByFile", request.getBizCode(), request);
@ -61,15 +62,16 @@ public class ContractManager {
.collect(toList()); .collect(toList());
for (int i = 0; i < contract.approverSize(); i++) for (int i = 0; i < contract.approverSize(); i++)
contract.getApprover(i).setEssRecipientId(essRecipientIds.get(i)); contract.getApprover(i).setEssRecipientId(essRecipientIds.get(i));
essContractDao.setEssContractCreated( return transactionTemplate.execute(unused -> {
contract.getId(), essResponse.getFlowId(), essContractDao.setEssContractCreated(
essFileIds, contract.getApprovers()); contract.getId(), essResponse.getFlowId(),
contract = essContractDao.getOrThrow(essResponse.getFlowId()); essFileIds, contract.getApprovers());
essBroadcaster.fireContractStateChanged(contract); essBroadcaster.fireContractStateChanged(contract);
CreateContractByFileResponse response = new CreateContractByFileResponse(); CreateContractByFileResponse response = new CreateContractByFileResponse();
response.setEssContractId(essResponse.getFlowId()); response.setEssContractId(essResponse.getFlowId());
response.setEssRecipientIds(essRecipientIds); response.setEssRecipientIds(essRecipientIds);
return response; return response;
});
} catch (TencentCloudSDKException | ServiceException e) { } catch (TencentCloudSDKException | ServiceException e) {
log.warn("创建合同失败", e); log.warn("创建合同失败", e);
if (contract != null) if (contract != null)

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

@ -29,6 +29,7 @@ import cn.axzo.nanopart.ess.server.utils.BizAssertions;
import com.tencentcloudapi.essbasic.v20210526.models.CreateSignUrlsResponse; import com.tencentcloudapi.essbasic.v20210526.models.CreateSignUrlsResponse;
import com.tencentcloudapi.essbasic.v20210526.models.SignUrlInfo; import com.tencentcloudapi.essbasic.v20210526.models.SignUrlInfo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -39,6 +40,7 @@ import static cn.axzo.nanopart.ess.server.utils.BizAssertions.fail;
/** /**
* @author yanglin * @author yanglin
*/ */
@Slf4j
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class EssService { public class EssService {
@ -165,14 +167,17 @@ public class EssService {
public void maybeUploadContractToOss(EssContract contract) { public void maybeUploadContractToOss(EssContract contract) {
essSupport.asyncExec(() -> { essSupport.asyncExec(() -> {
EssContract effectiveContract = essContractDao.findOrNull(contract.getEssContractId()); try {
if (!effectiveContract.isFinalState() EssContract c = essContractDao.findOrNull(contract.getEssContractId());
|| StringUtils.isNotBlank(effectiveContract.getOssFileKey())) if (c == null || !c.isFinalState() || StringUtils.isNotBlank(c.getOssFileKey()))
return; return;
String pdfUrl = getContractPDFUrlFromEss(effectiveContract); String pdfUrl = getContractPDFUrlFromEss(c);
String fileName = String.format("%s.pdf", effectiveContract.getContractName()); String fileName = String.format("%s.pdf", c.getContractName());
String fileKey = ossService.uploadToOss(pdfUrl, fileName); String fileKey = ossService.uploadToOss(pdfUrl, fileName);
essContractDao.setOssKey(effectiveContract, fileKey); essContractDao.setOssKey(c, fileKey);
} catch (Exception e) {
log.warn("上传合同到OSS失败", e);
}
}); });
} }