|
|
@@ -11,6 +11,7 @@ import java.util.UUID;
|
|
|
|
|
|
import org.apache.commons.beanutils.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.cache.annotation.Cacheable;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
@@ -77,13 +78,13 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
String aut="PM0"+Count;
|
|
|
String sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
while(sid!=null){
|
|
|
- Count=Count+1;
|
|
|
+ Count=Count+1;
|
|
|
if(Count>=10){
|
|
|
- aut="PM"+Count;
|
|
|
+ aut="PM"+Count;
|
|
|
}else{
|
|
|
aut="PM0"+Count;
|
|
|
}
|
|
|
- sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
}
|
|
|
record.setAutNo(aut);
|
|
|
}
|
|
|
@@ -91,16 +92,16 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
String aut="PM"+Count;
|
|
|
String sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
while(sid!=null){
|
|
|
- Count=Count+1;
|
|
|
+ Count=Count+1;
|
|
|
aut="PM"+Count;
|
|
|
- sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
+ sid=permissionMapper.selectIdByAutNo(aut);
|
|
|
}
|
|
|
record.setAutNo(aut);
|
|
|
}
|
|
|
record.setHierarchies("1");//1第一层
|
|
|
record.setStatus("0");//0正常 1解除
|
|
|
record.setShowOrder("0");//0
|
|
|
- record.setSuperId(permissionMapper.selectIdByName("平台超级模块"));//顶级为PM
|
|
|
+ record.setSuperId(permissionMapper.selectIdByName("平台超级模块"));//顶级为PM
|
|
|
permissionMapper.insertn(record);
|
|
|
return 1;
|
|
|
}
|
|
|
@@ -161,42 +162,42 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
//*******下级编号修改
|
|
|
int n=0;
|
|
|
List<Permission> Nos =permissionMapper.selectIDNBySuperId(record.getId());
|
|
|
- for(Permission i:Nos){
|
|
|
+ for(Permission i:Nos){
|
|
|
autNo=permissionMapper.selectAutNoByName(i.getSuperId());
|
|
|
if(n<10){
|
|
|
- String aut=autNo+"0"+n;
|
|
|
+ String aut=autNo+"0"+n;
|
|
|
if(n>=10){
|
|
|
- aut=autNo+n;
|
|
|
+ aut=autNo+n;
|
|
|
}else{
|
|
|
aut=autNo+"0"+n;
|
|
|
- }
|
|
|
+ }
|
|
|
i.setAutNo(aut);
|
|
|
}
|
|
|
if(n>=10){
|
|
|
- String aut=autNo+n;
|
|
|
- aut=autNo+n;
|
|
|
+ String aut=autNo+n;
|
|
|
+ aut=autNo+n;
|
|
|
i.setAutNo(aut);
|
|
|
}
|
|
|
permissionMapper.updateByNumber(i);
|
|
|
n++;
|
|
|
-
|
|
|
+
|
|
|
//*******下下级编号修改
|
|
|
int m=0;
|
|
|
List<Permission> Noss =permissionMapper.selectIDNBySuperId(i.getId());
|
|
|
- for(Permission o:Noss){
|
|
|
+ for(Permission o:Noss){
|
|
|
autNo=permissionMapper.selectAutNoByName(o.getSuperId());
|
|
|
if(m<10){
|
|
|
- String aut=autNo+"0"+m;
|
|
|
+ String aut=autNo+"0"+m;
|
|
|
if(m>=10){
|
|
|
- aut=autNo+m;
|
|
|
+ aut=autNo+m;
|
|
|
}else{
|
|
|
aut=autNo+"0"+m;
|
|
|
- }
|
|
|
+ }
|
|
|
o.setAutNo(aut);
|
|
|
}
|
|
|
if(m>=10){
|
|
|
- String aut=autNo+m;
|
|
|
- aut=autNo+m;
|
|
|
+ String aut=autNo+m;
|
|
|
+ aut=autNo+m;
|
|
|
o.setAutNo(aut);
|
|
|
}
|
|
|
permissionMapper.updateByNumber(o);
|
|
|
@@ -204,35 +205,37 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
//*******下下级编号修改
|
|
|
int z=0;
|
|
|
List<Permission> Nosss =permissionMapper.selectIDNBySuperId(o.getId());
|
|
|
- for(Permission p:Nosss){
|
|
|
+ for(Permission p:Nosss){
|
|
|
autNo=permissionMapper.selectAutNoByName(p.getSuperId());
|
|
|
if(z<10){
|
|
|
- String aut=autNo+"0"+z;
|
|
|
+ String aut=autNo+"0"+z;
|
|
|
if(z>=10){
|
|
|
- aut=autNo+z;
|
|
|
+ aut=autNo+z;
|
|
|
}else{
|
|
|
aut=autNo+"0"+z;
|
|
|
- }
|
|
|
+ }
|
|
|
p.setAutNo(aut);
|
|
|
}
|
|
|
if(z>=10){
|
|
|
- String aut=autNo+z;
|
|
|
- aut=autNo+z;
|
|
|
+ String aut=autNo+z;
|
|
|
+ aut=autNo+z;
|
|
|
p.setAutNo(aut);
|
|
|
}
|
|
|
permissionMapper.updateByNumber(p);
|
|
|
z++;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
return permissionMapper.updateById(record);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ @Cacheable(value = "findPermissionsAll#500", key = "'all'")
|
|
|
public Map<String,Object> findPermissionsAll() {
|
|
|
+ System.out.println("===========================================findPermissionsAll#500");
|
|
|
Map<String,Object> params = new HashMap<String, Object>();
|
|
|
- List<PermissionBo> one=permissionMapper.selectOneAll();
|
|
|
+ List<PermissionBo> one=permissionMapper.selectOneAll();
|
|
|
for (PermissionBo i:one){
|
|
|
i.setKey(i.getId());
|
|
|
List<PermissionBo> two=permissionMapper.selectAllBySuperId(i.getId());
|
|
|
@@ -242,7 +245,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
List<PermissionBo> three=permissionMapper.selectAllBySuperId(o.getId());
|
|
|
for(PermissionBo p:three){
|
|
|
p.setChildren(permissionMapper.selectAllBySuperId(p.getId()));
|
|
|
- p.setKey(p.getId());
|
|
|
+ p.setKey(p.getId());
|
|
|
}
|
|
|
o.setChildren(three);
|
|
|
}
|
|
|
@@ -251,7 +254,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
|
|
|
params.put("one", one);
|
|
|
return params;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Override
|
|
|
public List<Navigation> selectNavList(){
|
|
|
String aid = TokenManager.hasRole(AFTConstants.SUPERADMIN) ? null : TokenManager.getAdminId();
|