Merge remote-tracking branch 'hsayi/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727

coolstore-partner-service/src/main/java/com/cool/store/service/MenuService.java

@@ -1,5 +1,7 @@
 package com.cool.store.service;
 
+import com.cool.store.dto.menu.AddMenuDTO;
+import com.cool.store.enums.MenuTypeEnum;
 import com.cool.store.vo.menu.MenuTreeVO;
 
 import java.util.List;
@@ -19,4 +21,18 @@ public interface MenuService {
      * @return
      */
     List<MenuTreeVO> getUserMenus(String userId, String roleId);
+
+    /**
+     * 获取所有的菜单
+     * @return
+     */
+    List<MenuTreeVO> getAllMenus();
+
+    /**
+     * 新增菜单
+     * @param param
+     * @param menuType
+     * @return
+     */
+    Long addMenu(AddMenuDTO param, MenuTypeEnum menuType);
 }

coolstore-partner-service/src/main/java/com/cool/store/service/RoleService.java

@@ -0,0 +1,39 @@
+package com.cool.store.service;
+
+import com.cool.store.dto.role.RoleUpdateDTO;
+import com.cool.store.vo.role.RoleAuthInfoVO;
+import com.cool.store.vo.role.RolePageVO;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: RoleService
+ * @Description:角色service
+ * @date 2023-07-25 15:05
+ */
+public interface RoleService {
+
+    /**
+     * 获取角色分页
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    PageInfo<RolePageVO> getRolePage(Integer pageNum, Integer pageSize);
+
+    /**
+     * 获取角色权限详情
+     * @param roleId
+     * @return
+     */
+    RoleAuthInfoVO getRoleAuthDetail(String roleId);
+
+    /**
+     * 更新角色权限
+     * @param userId
+     * @param param
+     * @return
+     */
+    Integer updateRoleAuth(String userId, RoleUpdateDTO param);
+
+}

coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java

@@ -3,6 +3,7 @@ package com.cool.store.service.impl;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.dao.SysMenuDAO;
 import com.cool.store.dao.SysRoleMenuDAO;
+import com.cool.store.dto.menu.AddMenuDTO;
 import com.cool.store.entity.SysMenuDO;
 import com.cool.store.entity.SysRoleMenuDO;
 import com.cool.store.enums.MenuTypeEnum;
@@ -10,7 +11,6 @@ import com.cool.store.enums.PlatFormTypeEnum;
 import com.cool.store.service.MenuService;
 import com.cool.store.vo.menu.MenuTreeVO;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -52,6 +52,17 @@ public class MenuServiceImpl implements MenuService {
         return MenuTreeVO.dealMenuTree(CommonConstants.ZERO_LONG, menuList);
     }
 
+    @Override
+    public List<MenuTreeVO> getAllMenus() {
+        List<SysMenuDO> menuList= sysMenuDAO.selectMenuAll(null, PlatFormTypeEnum.PC.getCode());
+        return MenuTreeVO.dealMenuTree(CommonConstants.ZERO_LONG, menuList);
+    }
+
+    @Override
+    public Long addMenu(AddMenuDTO param, MenuTypeEnum menuType) {
+        return sysMenuDAO.addMenu(AddMenuDTO.convertDO(param, menuType));
+    }
+
     private void getParentNode(Long menuId, Map<Long, Long> idMap, Set<Long> authMenuList) {
         Long parentId = idMap.get(menuId);
         authMenuList.add(parentId);

coolstore-partner-service/src/main/java/com/cool/store/service/impl/RoleServiceImpl.java

@@ -0,0 +1,60 @@
+package com.cool.store.service.impl;
+
+import com.cool.store.dao.SysMenuDAO;
+import com.cool.store.dao.SysRoleDAO;
+import com.cool.store.dao.SysRoleMenuDAO;
+import com.cool.store.dto.role.RoleUpdateDTO;
+import com.cool.store.entity.SysRoleDO;
+import com.cool.store.entity.SysRoleMenuDO;
+import com.cool.store.enums.PlatFormTypeEnum;
+import com.cool.store.service.RoleService;
+import com.cool.store.vo.role.RoleAuthInfoVO;
+import com.cool.store.vo.role.RolePageVO;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageInfo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: RoleServiceImpl
+ * @Description:
+ * @date 2023-07-25 15:06
+ */
+@Service
+public class RoleServiceImpl implements RoleService {
+
+    @Resource
+    private SysRoleDAO sysRoleDAO;
+    @Resource
+    private SysMenuDAO sysMenuDAO;
+    @Resource
+    private SysRoleMenuDAO sysRoleMenuDAO;
+
+    @Override
+    public PageInfo<RolePageVO> getRolePage(Integer pageNum, Integer pageSize) {
+        Page<SysRoleDO> page = sysRoleDAO.getRolePage(pageNum, pageSize);
+        PageInfo resultPage = new PageInfo(page);
+        List<RolePageVO> resultList = RolePageVO.convertList(page);
+        resultPage.setList(resultList);
+        return resultPage;
+    }
+
+    @Override
+    public RoleAuthInfoVO getRoleAuthDetail(String roleId) {
+        SysRoleDO roleDetail = sysRoleDAO.getRoleDetail(roleId);
+        if(Objects.isNull(roleDetail)){
+            return null;
+        }
+        List<SysRoleMenuDO> roleMenuAuths = sysRoleMenuDAO.getRoleMenuByRoleId(roleId, PlatFormTypeEnum.PC.getCode());
+        return RoleAuthInfoVO.convertVO(roleDetail, roleMenuAuths);
+    }
+
+    @Override
+    public Integer updateRoleAuth(String userId, RoleUpdateDTO param) {
+        return sysRoleMenuDAO.updateRoleAuth(param.getRoleId(), param.getMenuIds());
+    }
+}