wangli/axzo-framework-commons
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-2300)：数据权限返回数据处理Advice功能，增加对每个子field的递归处理

Browse Source
This commit is contained in:
李昆鹏 2024-06-14 09:41:20 +08:00
parent 202c577007
commit 0e9801177c
1 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
axzo-common-data-permission/src/main/java/cn/axzo/framework/datapermission/advice/DataPermissionResponseExecutor.java
View File

@ -60,17 +60,25 @@ public class DataPermissionResponseExecutor {
return;
}
// 根据karma数据列的校验结果，处理api结果的数据对象
recursiveGetOrgNodeIdAndPersonIds(dataPermissionPrepare, dataNode, examineDpColumnsResp.getAttributeDpResultMap());
recursiveProcessOrgNodeIdAndPersonIds(dataPermissionPrepare, dataNode, examineDpColumnsResp.getAttributeDpResultMap());
}
private void recursiveGetOrgNodeIdAndPersonIds(DataPermissionPrepare dataPermissionPrepare, JsonNode dataNode, List<ExamineDpColumnsReq.OrgNodeIdAndPersonId> orgNodeIdAndPersonIds) {
if (dataNode.isObject()) {
Long resultOrganizationalNodeId = Objects.nonNull(dataNode.get(dataPermissionPrepare.key_organizationalNodeId())) ? dataNode.get(dataPermissionPrepare.key_organizationalNodeId()).asLong() : 0L;
Long resultPersonId = Objects.nonNull(dataNode.get(dataPermissionPrepare.key_personId())) ? dataNode.get(dataPermissionPrepare.key_personId()).asLong() : 0L;
if (resultOrganizationalNodeId.equals(0L) && resultPersonId.equals(0L)) {
return;
if (!resultOrganizationalNodeId.equals(0L) || !resultPersonId.equals(0L)) {
orgNodeIdAndPersonIds.add(ExamineDpColumnsReq.OrgNodeIdAndPersonId.builder().organizationalNodeId(resultOrganizationalNodeId).personId(resultPersonId).build());
}
// 循环处理子field
Iterator<Map.Entry<String, JsonNode>> fields = dataNode.fields();
while (fields.hasNext()) {
Map.Entry<String, JsonNode> entry = fields.next();
JsonNode value = entry.getValue();
if (value.isContainerNode()) {
recursiveGetOrgNodeIdAndPersonIds(dataPermissionPrepare, value, orgNodeIdAndPersonIds);
}
}
orgNodeIdAndPersonIds.add(ExamineDpColumnsReq.OrgNodeIdAndPersonId.builder().organizationalNodeId(resultOrganizationalNodeId).personId(resultPersonId).build());
}
if (dataNode.isArray()) {
ArrayNode arrayNode = (ArrayNode) dataNode;
@ -82,31 +90,36 @@ public class DataPermissionResponseExecutor {
}
}
private void recursiveGetOrgNodeIdAndPersonIds(DataPermissionPrepare dataPermissionPrepare, JsonNode dataNode,
private void recursiveProcessOrgNodeIdAndPersonIds(DataPermissionPrepare dataPermissionPrepare, JsonNode dataNode,
Map<String, Map<String, ExamineDpColumnsResp.AttributePermissionBasicDTO>> attributeDpResultMap) {
if (dataNode.isObject()) {
Long resultOrganizationalNodeId = Objects.nonNull(dataNode.get(dataPermissionPrepare.key_organizationalNodeId())) ? dataNode.get(dataPermissionPrepare.key_organizationalNodeId()).asLong() : 0L;
Long resultPersonId = Objects.nonNull(dataNode.get(dataPermissionPrepare.key_personId())) ? dataNode.get(dataPermissionPrepare.key_personId()).asLong() : 0L;
if (resultOrganizationalNodeId.equals(0L) && resultPersonId.equals(0L)) {
return;
if (!resultOrganizationalNodeId.equals(0L) || !resultPersonId.equals(0L)) {
Map<String, ExamineDpColumnsResp.AttributePermissionBasicDTO> attributeMap = attributeDpResultMap.get(resultOrganizationalNodeId + "_" + resultPersonId);
if (MapUtils.isNotEmpty(attributeMap)) {
for (Map.Entry<String, ExamineDpColumnsResp.AttributePermissionBasicDTO> entry : attributeMap.entrySet()) {
ExamineDpColumnsResp.AttributePermissionBasicDTO basic = entry.getValue();
if (dataNode.has(basic.getAttrCode())) {
ObjectNode objectNode = (ObjectNode) dataNode;
if (!ATTRIBUTE_ISUNMASKABLE.equals(basic.getIsUnmaskable())) {
objectNode.remove(basic.getAttrCode());
}
if (Objects.nonNull(basic.getIsEditable())) {
objectNode.put(ATTRIBUTE_ADD_ALLOW_EDIT_PREFIX + basic.getAttrCode(), ATTRIBUTE_ISEDITABLE.equals(basic.getIsEditable()));
}
}
}
}
}
Map<String, ExamineDpColumnsResp.AttributePermissionBasicDTO> attributeMap = attributeDpResultMap.get(resultOrganizationalNodeId + "_" + resultPersonId);
if (MapUtils.isEmpty(attributeMap)) {
return;
}
for (Map.Entry<String, ExamineDpColumnsResp.AttributePermissionBasicDTO> entry : attributeMap.entrySet()) {
ExamineDpColumnsResp.AttributePermissionBasicDTO basic = entry.getValue();
if (dataNode.has(basic.getAttrCode())) {
if (!ATTRIBUTE_ISUNMASKABLE.equals(basic.getIsUnmaskable())) {
ObjectNode objectNode = (ObjectNode) dataNode;
objectNode.remove(basic.getAttrCode());
}
if (Objects.nonNull(basic.getIsEditable())) {
ObjectNode objectNode = (ObjectNode) dataNode;
objectNode.put(ATTRIBUTE_ADD_ALLOW_EDIT_PREFIX + basic.getAttrCode(), ATTRIBUTE_ISEDITABLE.equals(basic.getIsEditable()));
}
// 循环处理子field
Iterator<Map.Entry<String, JsonNode>> fields = dataNode.fields();
while (fields.hasNext()) {
Map.Entry<String, JsonNode> entry = fields.next();
JsonNode value = entry.getValue();
if (value.isContainerNode()) {
recursiveProcessOrgNodeIdAndPersonIds(dataPermissionPrepare, value, attributeDpResultMap);
}
}
}
@ -116,7 +129,7 @@ public class DataPermissionResponseExecutor {
Iterator<JsonNode> elements = arrayNode.elements();
while (elements.hasNext()) {
JsonNode element = elements.next();
recursiveGetOrgNodeIdAndPersonIds(dataPermissionPrepare, element, attributeDpResultMap);
recursiveProcessOrgNodeIdAndPersonIds(dataPermissionPrepare, element, attributeDpResultMap);
}
}
}