Browse Source

初始化权限重新书写

njs 3 years ago
parent
commit
056e88e2dd

+ 69 - 100
suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -25,8 +25,7 @@ import static java.util.stream.Collectors.toList;
  * @date 2022-03-22
  * @date 2022-03-22
  */
  */
 @Service
 @Service
-public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService 
-{
+public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService {
     @Autowired
     @Autowired
     private SysUserOrderAuthorMapper sysUserOrderAuthorMapper;
     private SysUserOrderAuthorMapper sysUserOrderAuthorMapper;
 
 
@@ -38,94 +37,85 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
 
 
     /**
     /**
      * 查询权限
      * 查询权限
-     * 
+     *
      * @param authorId 权限ID
      * @param authorId 权限ID
      * @return 权限
      * @return 权限
      */
      */
     @Override
     @Override
-    public SysUserOrderAuthor selectSysUserOrderAuthorById(Long authorId)
-    {
+    public SysUserOrderAuthor selectSysUserOrderAuthorById(Long authorId) {
         return sysUserOrderAuthorMapper.selectSysUserOrderAuthorById(authorId);
         return sysUserOrderAuthorMapper.selectSysUserOrderAuthorById(authorId);
     }
     }
 
 
     /**
     /**
      * 查询权限列表
      * 查询权限列表
-     * 
+     *
      * @param sysUserOrderAuthor 权限
      * @param sysUserOrderAuthor 权限
      * @return 权限
      * @return 权限
      */
      */
     @Override
     @Override
-    public List<SysUserOrderAuthor> selectSysUserOrderAuthorList(SysUserOrderAuthor sysUserOrderAuthor)
-    {
+    public List<SysUserOrderAuthor> selectSysUserOrderAuthorList(SysUserOrderAuthor sysUserOrderAuthor) {
         return sysUserOrderAuthorMapper.selectSysUserOrderAuthorList(sysUserOrderAuthor);
         return sysUserOrderAuthorMapper.selectSysUserOrderAuthorList(sysUserOrderAuthor);
     }
     }
 
 
     /**
     /**
      * 新增权限
      * 新增权限
-     * 
+     *
      * @param sysUserOrderAuthor 权限
      * @param sysUserOrderAuthor 权限
      * @return 结果
      * @return 结果
      */
      */
     @Override
     @Override
-    public int insertSysUserOrderAuthor(SysUserOrderAuthor sysUserOrderAuthor)
-    {
+    public int insertSysUserOrderAuthor(SysUserOrderAuthor sysUserOrderAuthor) {
         sysUserOrderAuthor.setCreateTime(DateUtils.getNowDate());
         sysUserOrderAuthor.setCreateTime(DateUtils.getNowDate());
         return sysUserOrderAuthorMapper.insertSysUserOrderAuthor(sysUserOrderAuthor);
         return sysUserOrderAuthorMapper.insertSysUserOrderAuthor(sysUserOrderAuthor);
     }
     }
 
 
     /**
     /**
      * 修改权限
      * 修改权限
-     * 
+     *
      * @param sysUserOrderAuthor 权限
      * @param sysUserOrderAuthor 权限
      * @return 结果
      * @return 结果
      */
      */
     @Override
     @Override
-    public int updateSysUserOrderAuthor(SysUserOrderAuthor sysUserOrderAuthor)
-    {
+    public int updateSysUserOrderAuthor(SysUserOrderAuthor sysUserOrderAuthor) {
         sysUserOrderAuthor.setUpdateTime(DateUtils.getNowDate());
         sysUserOrderAuthor.setUpdateTime(DateUtils.getNowDate());
         return sysUserOrderAuthorMapper.updateSysUserOrderAuthor(sysUserOrderAuthor);
         return sysUserOrderAuthorMapper.updateSysUserOrderAuthor(sysUserOrderAuthor);
     }
     }
 
 
     /**
     /**
      * 删除权限对象
      * 删除权限对象
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @param ids 需要删除的数据ID
      * @return 结果
      * @return 结果
      */
      */
     @Override
     @Override
-    public int deleteSysUserOrderAuthorByIds(String ids)
-    {
+    public int deleteSysUserOrderAuthorByIds(String ids) {
         return sysUserOrderAuthorMapper.deleteSysUserOrderAuthorByIds(Convert.toStrArray(ids));
         return sysUserOrderAuthorMapper.deleteSysUserOrderAuthorByIds(Convert.toStrArray(ids));
     }
     }
 
 
     /**
     /**
      * 删除权限信息
      * 删除权限信息
-     * 
+     *
      * @param authorId 权限ID
      * @param authorId 权限ID
      * @return 结果
      * @return 结果
      */
      */
     @Override
     @Override
-    public int deleteSysUserOrderAuthorById(Long authorId)
-    {
+    public int deleteSysUserOrderAuthorById(Long authorId) {
         return sysUserOrderAuthorMapper.deleteSysUserOrderAuthorById(authorId);
         return sysUserOrderAuthorMapper.deleteSysUserOrderAuthorById(authorId);
     }
     }
 
 
     @Override
     @Override
-    public int insertRel(SysUserAuthorRel role)
-    {
+    public int insertRel(SysUserAuthorRel role) {
         userAuthorRelMapper.deleteSysUserAuthorRelById(role.getUserId());
         userAuthorRelMapper.deleteSysUserAuthorRelById(role.getUserId());
         int rows = 1;
         int rows = 1;
         // 新增角色与部门(数据权限)管理
         // 新增角色与部门(数据权限)管理
         List<SysUserAuthorRel> list = new ArrayList<SysUserAuthorRel>();
         List<SysUserAuthorRel> list = new ArrayList<SysUserAuthorRel>();
-        for (Long authorId : role.getAuthorIds())
-        {
+        for (Long authorId : role.getAuthorIds()) {
             SysUserAuthorRel rd = new SysUserAuthorRel();
             SysUserAuthorRel rd = new SysUserAuthorRel();
             rd.setUserId(role.getUserId());
             rd.setUserId(role.getUserId());
             rd.setAuthorId(authorId);
             rd.setAuthorId(authorId);
             list.add(rd);
             list.add(rd);
         }
         }
-        if (list.size() > 0)
-        {
+        if (list.size() > 0) {
             rows = userAuthorRelMapper.batchRel(list);
             rows = userAuthorRelMapper.batchRel(list);
         }
         }
         return rows;
         return rows;
@@ -133,16 +123,14 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
 
 
     /**
     /**
      * 查询权限树列表
      * 查询权限树列表
-     * 
+     *
      * @return 所有权限信息
      * @return 所有权限信息
      */
      */
     @Override
     @Override
-    public List<Ztree> selectSysUserOrderAuthorTree()
-    {
+    public List<Ztree> selectSysUserOrderAuthorTree() {
         List<SysUserOrderAuthor> sysUserOrderAuthorList = sysUserOrderAuthorMapper.selectSysUserOrderAuthorList(new SysUserOrderAuthor());
         List<SysUserOrderAuthor> sysUserOrderAuthorList = sysUserOrderAuthorMapper.selectSysUserOrderAuthorList(new SysUserOrderAuthor());
         List<Ztree> ztrees = new ArrayList<Ztree>();
         List<Ztree> ztrees = new ArrayList<Ztree>();
-        for (SysUserOrderAuthor sysUserOrderAuthor : sysUserOrderAuthorList)
-        {
+        for (SysUserOrderAuthor sysUserOrderAuthor : sysUserOrderAuthorList) {
             Ztree ztree = new Ztree();
             Ztree ztree = new Ztree();
             ztree.setId(sysUserOrderAuthor.getAuthorId());
             ztree.setId(sysUserOrderAuthor.getAuthorId());
             ztree.setpId(sysUserOrderAuthor.getParentId());
             ztree.setpId(sysUserOrderAuthor.getParentId());
@@ -173,23 +161,23 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
     }
     }
 
 
     //把一个List转成树
     //把一个List转成树
-    static List<Ztree> buildTree(List<Ztree> list,Long pid){
-        List<Ztree> tree=new ArrayList<>();
-        for(Ztree node:list){
-            if(Objects.equals(node.getpId(),pid)){
-                tree.add(findChild(node,list));
+    static List<Ztree> buildTree(List<Ztree> list, Long pid) {
+        List<Ztree> tree = new ArrayList<>();
+        for (Ztree node : list) {
+            if (Objects.equals(node.getpId(), pid)) {
+                tree.add(findChild(node, list));
             }
             }
         }
         }
         return tree;
         return tree;
     }
     }
 
 
-    static Ztree findChild(Ztree node, List<Ztree> list){
-        for(Ztree n:list){
-            if(Objects.equals(n.getpId(),node.getId())){
-                if(node.getChildren() == null){
+    static Ztree findChild(Ztree node, List<Ztree> list) {
+        for (Ztree n : list) {
+            if (Objects.equals(n.getpId(), node.getId())) {
+                if (node.getChildren() == null) {
                     node.setChildren(new ArrayList<Ztree>());
                     node.setChildren(new ArrayList<Ztree>());
                 }
                 }
-                node.getChildren().add(findChild(n,list));
+                node.getChildren().add(findChild(n, list));
             }
             }
         }
         }
         return node;
         return node;
@@ -197,23 +185,21 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
 
 
     /**
     /**
      * 对象转树
      * 对象转树
+     *
      * @param sysUserOrderAuthorList
      * @param sysUserOrderAuthorList
      * @return
      * @return
      */
      */
-    public List<Ztree> initTree(List<SysUserOrderAuthor> sysUserOrderAuthorList, List<Long> roleMenuList)
-    {
+    public List<Ztree> initTree(List<SysUserOrderAuthor> sysUserOrderAuthorList, List<Long> roleMenuList) {
         List<Ztree> ztrees = new ArrayList<Ztree>();
         List<Ztree> ztrees = new ArrayList<Ztree>();
         boolean isCheck = StringUtils.isNotNull(roleMenuList);
         boolean isCheck = StringUtils.isNotNull(roleMenuList);
-        for (SysUserOrderAuthor menu : sysUserOrderAuthorList)
-        {
+        for (SysUserOrderAuthor menu : sysUserOrderAuthorList) {
             Ztree ztree = new Ztree();
             Ztree ztree = new Ztree();
             ztree.setId(menu.getAuthorId());
             ztree.setId(menu.getAuthorId());
             ztree.setpId(menu.getParentId());
             ztree.setpId(menu.getParentId());
             ztree.setName(menu.getAuthorName());
             ztree.setName(menu.getAuthorName());
             ztree.setTitle(menu.getAuthorName());
             ztree.setTitle(menu.getAuthorName());
             ztree.setCode(menu.getCode());
             ztree.setCode(menu.getCode());
-            if (isCheck)
-            {
+            if (isCheck) {
                 ztree.setChecked(roleMenuList.contains(menu.getAuthorId()));
                 ztree.setChecked(roleMenuList.contains(menu.getAuthorId()));
             }
             }
             ztree.setOpen(true);
             ztree.setOpen(true);
@@ -222,88 +208,71 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         return ztrees;
         return ztrees;
     }
     }
 
 
-    public void userAuthorTask(){
+    public void userAuthorTask() {
 
 
     }
     }
 
 
-    public void getAuthorByLevel(){
+    public void getAuthorByLevel() {
         List<SysUserOrderAuthor> list = sysUserOrderAuthorMapper.selectSysUserOrderAuthorList(new SysUserOrderAuthor());
         List<SysUserOrderAuthor> list = sysUserOrderAuthorMapper.selectSysUserOrderAuthorList(new SysUserOrderAuthor());
         List<Long> ids = new ArrayList<>();
         List<Long> ids = new ArrayList<>();
         getParentAuthor(ids, list, 8l);
         getParentAuthor(ids, list, 8l);
         System.out.println(ids);
         System.out.println(ids);
     }
     }
 
 
-    public void getParentAuthor(List<Long> ids, List<SysUserOrderAuthor> list, Long id){
+    public void getParentAuthor(List<Long> ids, List<SysUserOrderAuthor> list, Long id) {
         for (SysUserOrderAuthor sysUserOrderAuthor : list) {
         for (SysUserOrderAuthor sysUserOrderAuthor : list) {
             Long itemId = sysUserOrderAuthor.getAuthorId();
             Long itemId = sysUserOrderAuthor.getAuthorId();
-            if(itemId.equals(0l)){
+            if (itemId.equals(0l)) {
                 ids.add(itemId);
                 ids.add(itemId);
-            }else if(itemId.equals(id)){
+            } else if (itemId.equals(id)) {
                 ids.add(itemId);
                 ids.add(itemId);
-                getParentAuthor(ids, list , sysUserOrderAuthor.getParentId());
+                getParentAuthor(ids, list, sysUserOrderAuthor.getParentId());
             }
             }
         }
         }
     }
     }
 
 
     @Override
     @Override
     public void initUserAuthor() {
     public void initUserAuthor() {
-        List<SysUserOrderAuthor> userOrderAuthorList=new ArrayList<>();
-        List<SysUserOrderAuthor> userOrderAuthorDiyList=sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy");
-        List<SysUserOrderAuthor> userOrderAuthorCwList=sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_cw");
-        List<SysUserOrderAuthor> userOrderAuthorYSLList=sysUserOrderAuthorMapper.selectAuthorIdByCode("YSL");
+        List<SysUserOrderAuthor> userOrderAuthorList = new ArrayList<>();
+        List<SysUserOrderAuthor> userOrderAuthorDiyList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_diy");
+        List<SysUserOrderAuthor> userOrderAuthorCwList = sysUserOrderAuthorMapper.selectAuthorIdByCode("tuc_cw");
+        List<SysUserOrderAuthor> userOrderAuthorYSLList = sysUserOrderAuthorMapper.selectAuthorIdByCode("YSL");
         userExtMapper.selectUserExtList().forEach(sysUserExt -> {
         userExtMapper.selectUserExtList().forEach(sysUserExt -> {
-            String sales=sysUserExt.getSalesLevel();
-            if(sales==null){
-                sales="diy_level";
+            String sales = sysUserExt.getSalesLevel();
+            if (sales == null) {
+                sales = "diy_level";
             }
             }
             int index = sales.indexOf("_");
             int index = sales.indexOf("_");
-            String intNumber = sales.substring(0,index);
-            if(intNumber.equals("cw")){
+            String intNumber = sales.substring(0, index);
+            if (intNumber.equals("cw")) {
+                userOrderAuthorList.clear();
                 userOrderAuthorList.addAll(userOrderAuthorCwList);
                 userOrderAuthorList.addAll(userOrderAuthorCwList);
-            }else if(intNumber.equals("diy")){
+            } else if (intNumber.equals("diy")) {
+                userOrderAuthorList.clear();
                 userOrderAuthorList.addAll(userOrderAuthorDiyList);
                 userOrderAuthorList.addAll(userOrderAuthorDiyList);
-            }else if(intNumber.equals("ysl")){
+            } else if (intNumber.equals("ysl")) {
+                userOrderAuthorList.clear();
                 userOrderAuthorList.addAll(userOrderAuthorYSLList);
                 userOrderAuthorList.addAll(userOrderAuthorYSLList);
             }
             }
-                List<SysUserOrderAuthor> ordList=new ArrayList<>();
-                for (int i = 0; i < userOrderAuthorList.size(); i++) {
-                    if( !userOrderAuthorList.get(i).getAuthorId().equals(userOrderAuthorList.get(0).getParentId())){
-                        if(i==0){
-                            List<SysUserAuthorRel> user=userAuthorRelMapper.selectSysUserAuthorRelListById(sysUserExt.getUserId());
-                            if(user.size()>0){
-                                break;
-                            }
-                            SysUserOrderAuthor userOrderAuthor=new SysUserOrderAuthor();
-                            userOrderAuthor.setAuthorId(userOrderAuthorList.get(0).getParentId());
-                            userOrderAuthor.setParentId(userOrderAuthorList.get(0).getParentId());
-                            ordList.add(userOrderAuthor);
-                            ordList.removeAll(userOrderAuthorList);
-                            ordList.addAll(userOrderAuthorList);
-                        }
-
-                        List<SysUserOrderAuthor> OrderAuthorList= sysUserOrderAuthorMapper.selectAuthorIdByParentId(userOrderAuthorList.get(i).getAuthorId());
-                         if(OrderAuthorList.size()>0){
-                             HashSet<SysUserOrderAuthor> set = new HashSet<>(ordList);
-                             ordList.clear();
-                             set.addAll(OrderAuthorList);
-                             ArrayList list=new ArrayList<>(set);
-                             ordList.addAll(list);
-                    }
-                }else{
-                        continue;
+            List<SysUserAuthorRel> user = userAuthorRelMapper.selectSysUserAuthorRelListById(sysUserExt.getUserId());
+            if (user.size() == 0) {
+                SysUserAuthorRel role = new SysUserAuthorRel();
+                role.setUserId(sysUserExt.getUserId());
+                role.setAuthorId(userOrderAuthorList.get(0).getParentId());
+                userAuthorRelMapper.insertSysUserAuthorRel(role);
+                List<SysUserOrderAuthor> OrderAuthorList = sysUserOrderAuthorMapper.selectAuthorIdByParentId(userOrderAuthorList.get(0).getParentId());
+                if (OrderAuthorList.size() > 0) {
+                    for (SysUserOrderAuthor sys : OrderAuthorList
+                    ) {
+                        SysUserAuthorRel roleUser = new SysUserAuthorRel();
+                        roleUser.setUserId(sysUserExt.getUserId());
+                        roleUser.setAuthorId(sys.getAuthorId());
+                        userAuthorRelMapper.insertSysUserAuthorRel(roleUser);
                     }
                     }
                 }
                 }
-                if(ordList.size()>0){
-                    ordList.forEach(author->{
-                    SysUserAuthorRel role=new SysUserAuthorRel();
-                    role.setUserId(sysUserExt.getUserId());
-                    role.setAuthorId(author.getAuthorId());
-                    userAuthorRelMapper.insertSysUserAuthorRel(role);
-                });
-                }
+            }
         });
         });
-    }
-
 
 
+}
 
 
 }
 }