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

REQ-3201: 备份

Browse Source
This commit is contained in:
yanglin 2025-02-12 15:28:17 +08:00
parent 4527675e48
commit 6c30af9eb4
10 changed files with 67 additions and 0 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/EssSealPersonInfo.java
View File

@ -39,6 +39,11 @@ public class EssSealPersonInfo {
*/
private boolean isSealAuthorized;
/**
* 是否是超级管理员
*/
private boolean isSuperAdmin;
/**
* 授权人员id
*/

6
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java
View File

@ -3,6 +3,7 @@ package cn.axzo.nanopart.ess.server.entity;
import cn.axzo.foundation.dao.support.mysql.type.BaseListTypeHandler;
import cn.axzo.nanopart.ess.api.enums.EssContractState;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@ -76,6 +77,11 @@ public class EssContract extends BaseEntity<EssContract> {
@TableField(typeHandler = FastjsonTypeHandler.class)
private RecordExt recordExt;
@Override
public String toString() {
return JSON.toJSONString(this);
}
@Setter @Getter
public static class Approver {
}

6
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssLog.java
View File

@ -2,6 +2,7 @@ package cn.axzo.nanopart.ess.server.entity;
import cn.axzo.nanopart.ess.server.utils.YesOrNo;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@ -48,4 +49,9 @@ public class EssLog extends BaseEntity<EssLog> {
logContent = new JSONObject();
logContent.put(key, value);
}
@Override
public String toString() {
return JSON.toJSONString(this);
}
}

6
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssOrg.java
View File

@ -2,6 +2,7 @@ package cn.axzo.nanopart.ess.server.entity;
import cn.axzo.nanopart.ess.server.utils.YesOrNo;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
@ -47,6 +48,11 @@ public class EssOrg extends BaseEntity<EssOrg> {
@TableField(typeHandler = FastjsonTypeHandler.class)
private RecordExt recordExt;
@Override
public String toString() {
return JSON.toJSONString(this);
}
@Setter @Getter
public static class RecordExt {
}

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

@ -2,6 +2,7 @@ package cn.axzo.nanopart.ess.server.entity;
import cn.axzo.nanopart.ess.server.utils.YesOrNo;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
@ -46,4 +47,8 @@ public class EssPerson extends BaseEntity<EssPerson> {
public static class RecordExt {
}
@Override
public String toString() {
return JSON.toJSONString(this);
}
}

6
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssSeal.java
View File

@ -3,6 +3,7 @@ package cn.axzo.nanopart.ess.server.entity;
import cn.axzo.nanopart.ess.api.enums.EssSealState;
import cn.axzo.nanopart.ess.api.enums.EssSealType;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
@ -40,6 +41,11 @@ public class EssSeal extends BaseEntity<EssSeal> {
@TableField(typeHandler = FastjsonTypeHandler.class)
private RecordExt recordExt;
@Override
public String toString() {
return JSON.toJSONString(this);
}
@Setter @Getter
public static class RecordExt {

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

@ -2,6 +2,7 @@ package cn.axzo.nanopart.ess.server.entity;
import cn.axzo.nanopart.ess.server.utils.YesOrNo;
import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
@ -47,6 +48,11 @@ public class EssSealPerson extends BaseEntity<EssSealPerson> {
@TableField(typeHandler = FastjsonTypeHandler.class)
private RecordExt recordExt;
@Override
public String toString() {
return JSON.toJSONString(this);
}
@Setter @Getter
public static class RecordExt {

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

@ -98,6 +98,10 @@ class EssController implements EssApi {
@Override
public ApiResult<Void> removeSealPerson(RemoveSealPersonRequest request) {
EssSeal seal = essSealDao.findByEssSealId(request.getEssSealId()).orElse(null);
BizAssertions.assertNotNull(seal, "印章不存在: {}", request.getEssSealId());
EssPerson superAdmin = orgManager.getOrgAuthPersonOrThrow(seal.getOuId());
BizAssertions.assertFalse(superAdmin.getPersonId().equals(request.getPersonId()), "不能从印章列表删除超级管理员");
orgManager.removeSealPerson(request.getEssSealId(), request.getPersonId());
return ApiResult.ok();
}
@ -119,6 +123,7 @@ class EssController implements EssApi {
if (sealAndPerson.getSealPerson().getIsAuthorized().isNo())
return ApiResult.ok();
EssPerson superAdmin = orgManager.getOrgAuthPersonOrThrow(sealAndPerson.getSeal().getOuId());
BizAssertions.assertFalse(superAdmin.getPersonId().equals(request.getPersonId()), "不能取消超级管理员的印章授权");
essClient.removeSealAuthorization(superAdmin, sealAndPerson.getSeal(), sealAndPerson.getSealPerson());
orgManager.removeSealAuthorization(request.getEssSealId(), request.getPersonId());
return ApiResult.ok();

1
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssQueryService.java
View File

@ -126,6 +126,7 @@ class EssQueryService {
for (EssSealPerson sealPerson : persons) {
EssSealPersonInfo sealPersonInfo = BeanMapper.copyBean(sealPerson, EssSealPersonInfo.class);
sealInfo.addAuthorizedPerson(sealPersonInfo);
sealPersonInfo.setSuperAdmin(org.getAuthorizePersonId().equals(sealPerson.getPersonId()));
sealPersonInfo.setSealAuthorized(sealPerson.getIsAuthorized().isYes());
EssPerson essPerson = sealPersons.get(OuAndPersonId.create(
sealPerson.getOuId(), sealPerson.getPersonId()));

21
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/EssOrgs.java Normal file
View File

@ -0,0 +1,21 @@
package cn.axzo.nanopart.ess.server.ess.domain;
import cn.axzo.nanopart.ess.server.entity.EssOrg;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import java.util.List;
/**
* @author yanglin
*/
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public class EssOrgs {
private final List<EssOrg> orgs;
public static EssOrgs wrap(List<EssOrg> orgs) {
return new EssOrgs(orgs);
}
}