feats

src/main/java/com/yunzhi/demo/controller/SysRoleController.java

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.demo.common.BaseController;
 import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
-import com.yunzhi.demo.entity.SysLogin;
-import com.yunzhi.demo.entity.SysUser;
-import com.yunzhi.demo.entity.SysUserRole;
+import com.yunzhi.demo.common.StringUtils;
+import com.yunzhi.demo.entity.*;
+import com.yunzhi.demo.service.ISysMenuService;
 import com.yunzhi.demo.service.ISysUserRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.yunzhi.demo.service.ISysRoleService;
-import com.yunzhi.demo.entity.SysRole;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -50,6 +49,9 @@ public class SysRoleController extends BaseController {
     @Autowired
     ISysUserRoleService iSysUserRoleService;
 
+    @Autowired
+    ISysMenuService iSysMenuService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -95,9 +97,12 @@ public class SysRoleController extends BaseController {
      * @param sysRole 实体对象
      * @return
      */
-    @RequestMapping(value="/sysRole",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/role",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean sysRoleAdd(@ApiParam("保存内容") @RequestBody SysRole sysRole) throws Exception{
+        if (StringUtils.isEmpty(sysRole.getName())) {
+            throw new Exception("角色名称不能为空");
+        }
 
         if (iSysRoleService.save(sysRole)){
             return ResponseBean.success(sysRole);
@@ -110,10 +115,17 @@ public class SysRoleController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/sysRole/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/role/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean sysRoleDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iSysRoleService.removeById(id)){
+        SysRole sysRole = iSysRoleService.getById(id);
+        if (null == sysRole || Constants.STATUS_DELETED.equals(sysRole.getStatus())) {
+            return ResponseBean.success("success");
+        }
+
+        sysRole.setStatus(Constants.STATUS_DELETED);
+
+        if(iSysRoleService.updateById(sysRole)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -126,10 +138,17 @@ public class SysRoleController extends BaseController {
      * @param sysRole 实体对象
      * @return
      */
-    @RequestMapping(value="/sysRole/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/role/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean sysRoleUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody SysRole sysRole) throws Exception{
+                                      @ApiParam("更新内容") @RequestBody SysRole sysRole) throws Exception{
+        if (StringUtils.isEmpty(sysRole.getName())) {
+            throw new Exception("角色名称不能为空");
+        }
+
+        if (!id.equals(sysRole.getRoleId())) {
+            throw new Exception("校验角色信息失败");
+        }
 
         if (iSysRoleService.updateById(sysRole)){
             return ResponseBean.success(iSysRoleService.getById(id));
@@ -142,9 +161,19 @@ public class SysRoleController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/sysRole/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    @RequestMapping(value="/admin/role/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="查询角色信息", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean sysRoleGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iSysRoleService.getById(id));
+        SysRole sysRole = iSysRoleService.getById(id);
+        if (null == sysRole || Constants.STATUS_DELETED.equals(sysRole.getStatus())) {
+            throw new Exception("未找到指定的角色信息");
+        }
+
+        List<SysMenu> menuList = iSysMenuService.getListByRole(id);
+        if (null != menuList) {
+            sysRole.setMenuList(menuList);
+        }
+
+        return ResponseBean.success(sysRole);
     }
 }

src/main/java/com/yunzhi/demo/controller/SysUserController.java

@@ -125,7 +125,14 @@ public class SysUserController extends BaseController {
     @RequestMapping(value="/admin/user/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean sysUserDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iSysUserService.removeById(id)){
+        SysUser sysUser = iSysUserService.getById(id);
+        if (null == sysUser || Constants.STATUS_DELETED.equals(sysUser.getStatus())) {
+            return ResponseBean.success("success");
+        }
+
+        sysUser.setStatus(Constants.STATUS_DELETED);
+
+        if(iSysUserService.updateById(sysUser)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/yunzhi/demo/entity/SysRole.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -50,5 +52,7 @@ public class SysRole implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private LocalDateTime updateDate;
 
-
+    @ApiModelProperty("授权菜单")
+    @TableField(exist = false)
+    private List<SysMenu> menuList;
 }

src/main/java/com/yunzhi/demo/mapper/SysMenuMapper.java

@@ -18,4 +18,6 @@ import java.util.List;
 public interface SysMenuMapper extends BaseMapper<SysMenu> {
 
     List<SysMenu> getListWithRoles();
+
+    List<SysMenu> getMenuListByRole(Integer roleId);
 }

src/main/java/com/yunzhi/demo/service/ISysMenuService.java

@@ -16,4 +16,6 @@ import java.util.List;
 public interface ISysMenuService extends IService<SysMenu> {
 
     List<SysMenu> getListWithRoles();
+
+    List<SysMenu> getListByRole(Integer roleId);
 }

src/main/java/com/yunzhi/demo/service/impl/SysMenuServiceImpl.java

@@ -26,4 +26,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     public List<SysMenu> getListWithRoles() {
         return sysMenuMapper.getListWithRoles();
     }
+
+    @Override
+    public List<SysMenu> getListByRole(Integer roleId) {
+        return sysMenuMapper.getMenuListByRole(roleId);
+    }
 }

src/main/resources/mapper/SysMenuMapper.xml

@@ -14,4 +14,17 @@
         GROUP BY
             t.menu_id
     </select>
+    <select id="getMenuListByRole" resultType="com.yunzhi.demo.entity.SysMenu">
+        SELECT
+            t.*
+        FROM
+            sys_menu t
+                INNER JOIN sys_role_menu s ON t.menu_id = s.menu_id
+        WHERE
+            t.`status` > - 1
+          AND s.role_id = #{roleId}
+        ORDER BY
+            t.menu_p_id,
+            t.menu_id
+    </select>
 </mapper>