修复角色菜单临时接口

coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java

@@ -43,6 +43,7 @@ public class SysRoleMenuDAO {
             SysRoleMenuDO insert = new SysRoleMenuDO();
             insert.setMenuId(menuId);
             insert.setRoleId(roleId);
+            insert.setPlatform(PlatFormTypeEnum.PC.getCode());
             insertList.add(insert);
         }
         return sysRoleMenuMapper.batchInsert(insertList);

coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml

@@ -152,6 +152,6 @@
         from
             sys_role
         where
-            role_id = #{roleId} deleted = 0
+            role_id = #{roleId} and deleted = 0
     </select>
 </mapper>

coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java

@@ -34,7 +34,6 @@ public class AddMenuDTO {
     private String env;
 
     public static SysMenuDO convertDO(AddMenuDTO param, MenuTypeEnum menuTypeEnum){
-        SysMenuDO menu = new SysMenuDO();
         SysMenuDO sysMenuDO = new SysMenuDO();
         sysMenuDO.setParentId(param.getParentId());
         sysMenuDO.setName(param.getName());
@@ -48,7 +47,7 @@ public class AddMenuDTO {
         sysMenuDO.setTarget(param.getTarget());
         sysMenuDO.setIcon(param.getIcon());
         sysMenuDO.setMenuType(menuTypeEnum.getCode());
-        return menu;
+        return sysMenuDO;
     }
 
 

coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java

@@ -29,7 +29,7 @@ public class RolePageVO {
         for (SysRoleDO sysRole : roleList) {
             RolePageVO role = new RolePageVO();
             role.setRoleId(sysRole.getRoleId());
-            role.setRoleName(role.getRoleName());
+            role.setRoleName(sysRole.getRoleName());
             resultList.add(role);
         }
         return resultList;

coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java

@@ -52,7 +52,7 @@ public class Swagger2Config {
                 .groupName(groupName)
                 .select()
                 .apis(this.scanBasePackage(packages))
-                //.paths(PathSelectors.regex(".*/inspection/setting/.*|.*getRegionUserAndSubRegion"))
+                .paths(PathSelectors.regex(".*/menu/getAllMenus|.*/menu/add|.*/menu/auth/add|.*/role.*"))
                 .build()
                 .globalOperationParameters(pars);
     }

coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java

@@ -5,6 +5,9 @@ import com.cool.store.dto.menu.AddMenuDTO;
 import com.cool.store.enums.MenuTypeEnum;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.MenuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,26 +22,32 @@ import javax.annotation.Resource;
  * @date 2023-06-08 16:58
  */
 @RestController
+@Slf4j
+@Api(tags = "菜单")
 public class MenuController {
 
     @Resource
     private MenuService menuService;
 
+    @ApiOperation("获取用户权限菜单")
     @GetMapping("/menu/getUserMenus")
     public ResponseResult getUserMenus(){
         return ResponseResult.success(menuService.getUserMenus(CurrentUserHolder.getUserId(), CurrentUserHolder.getRoleId()));
     }
 
+    @ApiOperation("获取所有菜单")
     @GetMapping("/menu/getAllMenus")
     public ResponseResult getAllMenus(){
         return ResponseResult.success(menuService.getAllMenus());
     }
 
+    @ApiOperation("新增菜单")
     @PostMapping(path = "/menu/add")
     public ResponseResult addMenu(@RequestBody AddMenuDTO param){
         return ResponseResult.success(menuService.addMenu(param, MenuTypeEnum.MENU));
     }
 
+    @ApiOperation("新增权限")
     @PostMapping(path = "/menu/auth/add")
     public ResponseResult addMenuAuth(@RequestBody AddMenuDTO param){
         return ResponseResult.success(menuService.addMenu(param, MenuTypeEnum.AUTH));