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

Merge remote-tracking branch 'origin/feature/REQ-1309' into feature/REQ-1309

Browse Source 
# Conflicts:
#	tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyDetailServiceImpl.java
This commit is contained in:
yangsong 2023-10-09 18:59:05 +08:00
commit d44256638a
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointVO.java
View File

@ -164,13 +164,10 @@ public class PermissionPointVO {
private String delegatedTypeDesc; private String delegatedTypeDesc;
public void applyFitOuTypeBit(long fitOuTypeBit) { public void applyFitOuTypeBit(long fitOuTypeBit) {
//这个最值需要处理
if (fitOuTypeBit > 63L) {
fitOuTypeBit = 63L;
}
long mask = 1L; long mask = 1L;
ArrayList<Long> list = new ArrayList<>(); ArrayList<Long> list = new ArrayList<>();
while (mask <= 32) { //这个最值依赖枚举可支持的最大值 - 避免数据为65535解析出多的数据
while (mask <= 64) {
long bitValue = fitOuTypeBit & mask; long bitValue = fitOuTypeBit & mask;
if (bitValue != 0) { if (bitValue != 0) {
list.add(bitValue); list.add(bitValue);
@ -182,9 +179,6 @@ public class PermissionPointVO {
public void applyFitOuNodeTypeBit(long fitOuNodeTypeBit) { public void applyFitOuNodeTypeBit(long fitOuNodeTypeBit) {
//这个最值需要处理 //这个最值需要处理
if (fitOuNodeTypeBit > 7L) {
fitOuNodeTypeBit = 7L;
}
long mask = 1L; long mask = 1L;
ArrayList<Long> list = new ArrayList<>(); ArrayList<Long> list = new ArrayList<>();
while (mask <= 32) { while (mask <= 32) {

5
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureApplyDetailServiceImpl.java
View File

@ -84,7 +84,10 @@ public class SaasFeatureApplyDetailServiceImpl implements SaasFeatureApplyDetail
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void updateApplyDetail(PermissionPointApplyDetailUpdateReq req) { public void updateApplyDetail(PermissionPointApplyDetailUpdateReq req) {
SaasFeatureApplyDetail detail = BeanMapper.copyBean(req, SaasFeatureApplyDetail.class); SaasFeatureApplyDetail detail = BeanMapper.copyBean(req, SaasFeatureApplyDetail.class, (p, s) -> {
s.setFitOuTypeBit(JSON.toJSONString(p.getFitOuTypeList()));
s.setFitOuNodeTypeBit(JSON.toJSONString(p.getFitOuNodeTypeList()));
});
this.saveOrUpdate(Lists.newArrayList(detail)); this.saveOrUpdate(Lists.newArrayList(detail));
} }

2
tyr-server/src/test/java/cn/axzo/tyr/server/permission/SimpleTest.java
View File

@ -14,7 +14,7 @@ public class SimpleTest {
public void testSplitBit() { public void testSplitBit() {
PermissionPointVO vo = new PermissionPointVO(); PermissionPointVO vo = new PermissionPointVO();
vo.applyFitOuTypeBit(34L); vo.applyFitOuTypeBit(65535L);
System.out.println(vo.getFitOuTypeList()); System.out.println(vo.getFitOuTypeList());
vo.applyFitOuTypeBit(65535L); vo.applyFitOuTypeBit(65535L);
System.out.println(vo.getFitOuTypeList()); System.out.println(vo.getFitOuTypeList());