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-13 15:50:36 +08:00
parent 5135471fab
commit 7a36f754e4
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@ import cn.axzo.nanopart.ess.api.request.DownloadSingedContractPdfRequest;
import cn.axzo.nanopart.ess.api.request.GetContractSignUrlRequest;
import cn.axzo.nanopart.ess.api.request.GetEmbedWebUrlRequest;
import cn.axzo.nanopart.ess.api.request.RemoveSealAuthorizationRequest;
import cn.axzo.nanopart.ess.api.request.RemoveSealPersonRequest;
import cn.axzo.nanopart.ess.api.request.SealAndPersonRequest;
import cn.axzo.nanopart.ess.server.dao.EssContractDao;
import cn.axzo.nanopart.ess.server.dao.EssPersonDao;
@ -50,15 +49,6 @@ public class EssService {
authPerson, request.getEmbedType(), request.getBusinessId());
}
public void removeSealPerson(RemoveSealPersonRequest request) {
EssSeal seal = essSealDao.findByEssSealId(request.getEssSealId()).orElse(null);
BizAssertions.assertNotNull(seal, "印章不存在: {}", request.getEssSealId());
//noinspection DataFlowIssue
EssPerson superAdmin = orgManager.getSuperAdminOrThrow(seal.getOuId());
BizAssertions.assertFalse(superAdmin.getPersonId().equals(request.getPersonId()), "不能从印章列表删除超级管理员");
orgManager.removeSealPerson(request.getEssSealId(), request.getPersonId());
}
public void essAddSealAuthorization(AddSealAuthorizationRequest request) {
SealAndPerson sealAndPerson = getSealAndPersonOrThrow(request);
if (sealAndPerson.getSealPerson().getIsAuthorized().isYes())

14
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java
View File

@ -3,6 +3,7 @@ package cn.axzo.nanopart.ess.server.ess;
import cn.axzo.nanopart.ess.api.enums.EssSealState;
import cn.axzo.nanopart.ess.api.enums.EssSealType;
import cn.axzo.nanopart.ess.api.request.CreateConsoleLoginUrlRequest;
import cn.axzo.nanopart.ess.api.request.RemoveSealPersonRequest;
import cn.axzo.nanopart.ess.server.dao.EssOrgDao;
import cn.axzo.nanopart.ess.server.dao.EssPersonDao;
import cn.axzo.nanopart.ess.server.dao.EssSealDao;
@ -162,9 +163,16 @@ public class OrgManager {
}
@Transactional
public void removeSealPerson(String essSealId, Long personId) {
EssSealPerson sealPerson = essSealPersonDao.find(essSealId, personId, true).orElse(null);
BizAssertions.assertNotNull(sealPerson, "印章人员不存在: {}, {}", essSealId, personId);
public void tryRemoveSealPerson(RemoveSealPersonRequest request) {
EssSeal seal = essSealDao.findByEssSealId(request.getEssSealId()).orElse(null);
BizAssertions.assertNotNull(seal, "印章不存在: {}", request.getEssSealId());
//noinspection DataFlowIssue
EssPerson superAdmin = getSuperAdminOrThrow(seal.getOuId());
BizAssertions.assertFalse(superAdmin.getPersonId().equals(request.getPersonId()), "不能从印章列表删除超级管理员");
EssSealPerson sealPerson = essSealPersonDao
.find(seal.getEssSealId(), request.getPersonId(), true)
.orElse(null);
BizAssertions.assertNotNull(sealPerson, "印章人员不存在");
//noinspection DataFlowIssue
BizAssertions.assertTrue(sealPerson.getIsAuthorized().isNo(), "请先取消授权再删除");
essSealPersonDao.removeById(sealPerson.getId());

11
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/controller/ApiController.java
View File

@ -55,19 +55,16 @@ class ApiController implements EssApi {
private final EssService essService;
@Override
public ApiResult<List<GetUnitAuthStatesResponse>>
getUnitAuthStates(GetUnitAuthStatesRequest request) {
public ApiResult<List<GetUnitAuthStatesResponse>> getUnitAuthStates(GetUnitAuthStatesRequest request) {
return ApiResult.ok(queryService.getEssUnitAuthStates(request));
}
@Override public ApiResult<GetPersonAuthStateResponse>
getPersonAuthState(GetPersonAuthStateRequest request) {
@Override public ApiResult<GetPersonAuthStateResponse> getPersonAuthState(GetPersonAuthStateRequest request) {
return ApiResult.ok(queryService.getPersonAuthState(request));
}
@Override
public ApiResult<CreateConsoleLoginUrlResponse>
createConsoleLoginUrl(CreateConsoleLoginUrlRequest request) {
public ApiResult<CreateConsoleLoginUrlResponse> createConsoleLoginUrl(CreateConsoleLoginUrlRequest request) {
CreateConsoleLoginUrlResponse response = new CreateConsoleLoginUrlResponse();
response.setConsoleLoginUrl(essService.createConsoleLoginUrl(request));
return ApiResult.ok(response);
@ -93,7 +90,7 @@ class ApiController implements EssApi {
@Override
public ApiResult<Void> removeSealPerson(RemoveSealPersonRequest request) {
essService.removeSealPerson(request);
orgManager.tryRemoveSealPerson(request);
return ApiResult.ok();
}