user接口 优化

common-springboot/src/main/java/com/gihon/controller/PermissionController.java

@@ -1,12 +1,16 @@
 package com.gihon.controller;
 
+import com.gihon.common.web.response.PageResponse;
 import com.gihon.common.web.response.Response;
 import com.gihon.entity.Permission;
 import com.gihon.service.permissionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @program: common-parent
@@ -14,7 +18,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
  * @author: dl
  * @create: 02月19日 09时
  **/
+@Api(value = "权限接口", tags = "权限接口")
 @RequestMapping("/Permission")
+@RestController
 public class PermissionController {
     @Autowired
     private permissionService permissionService;
@@ -24,13 +30,14 @@ public class PermissionController {
      * @return 用户拥有的权限列表
      */
     @GetMapping("/getPermissionsByUserId")
-    @ResponseBody
+    @ApiOperation("根据用户id 查看 用户权限信息")
     public Response<Permission> getPermission(Long id){
         Response permissions = permissionService.getPermissionsByUserId(id);
         return permissions;
     }
-
-    public Response setPermission(Long id ,String permissionStr){
+    @GetMapping("/modifyPermission")
+    @ApiOperation("根据权限id 修改权限名称")
+    public Response modifyPermission(Long id ,String permissionStr){
         Response modifyPermission = permissionService.modifyPermission(id, permissionStr);
         return modifyPermission;
     }
@@ -42,19 +49,33 @@ public class PermissionController {
      * @param	id
      * @return com.gihon.common.web.response.Response
      */
-    @RequestMapping("/getPermissionById")
-    @ResponseBody
+    @ApiOperation("根据权限id 查找权限信息")
+    @GetMapping("/getPermissionById")
     public Response getPermissionById(Long id){
         Response response = permissionService.getpermissionById(id);
         return response;
     }
 
 
-    @RequestMapping("/deletePermissionById")
-    @ResponseBody
+    @GetMapping("/deletePermissionById")
+    @ApiOperation("根据权限id 删除权限")
     public Response deletePermissionById(Long id){
         Response response = permissionService.deletePermissionById(id);
         return response;
     }
+    @GetMapping("/addPermission")
+    @ApiOperation("增加权限")
+    public Response addPermission(Permission permission){
+        Response response = permissionService.addPermissionById(permission);
+        return response;
+    }
+    @GetMapping("/pagePermission")
+    @ApiOperation("分页查询权限")
+    public PageResponse<Permission> pagePermissions(
+            @RequestParam(required = false,defaultValue = "0") int page,
+            @RequestParam(required = false, defaultValue = "10") int rows){
+        PageResponse response = permissionService.pagePermissions(page,rows);
+        return response;
+    }
 
 }

common-springboot/src/main/java/com/gihon/controller/RoleController.java

@@ -3,9 +3,10 @@ import com.gihon.common.web.response.Response;
 import com.gihon.common.web.response.ResponseStatus;
 import com.gihon.entity.Role;
 import com.gihon.service.RoleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -17,6 +18,7 @@ import java.util.List;
  * @author: dl
  * @create: 02月18日 15时
  **/
+@Api(value = "角色接口", tags = "角色接口")
 @RestController
 public class RoleController {
     @Autowired
@@ -30,8 +32,7 @@ public class RoleController {
      * @param	rolename 角色名称
      * @return com.gihon.common.http.Response
      */
-    @PreAuthorize("hasAuthority('addRole')")
-    @Transactional(rollbackFor = Exception.class)
+    @ApiOperation("增加角色")
     @PostMapping(value = "/addRole")
     public Response addRole(Long id, String rolename) {
         Role role = new Role(id, rolename);
@@ -46,7 +47,9 @@ public class RoleController {
      * @param	id	 Role ID
      * @return com.gihon.common.http.Response
      */
-    public Response 删除角色(Long id){
+    @ApiOperation("删除角色")
+    @GetMapping("/removeRole")
+    public Response removeRole(Long id){
         boolean is_remove = roleService.removeById(id);
         if (!is_remove) {
             return Response.error(ResponseStatus.MAPPER_ERROR);
@@ -62,6 +65,9 @@ public class RoleController {
      * @param	rolename
      * @return com.gihon.common.http.Response
      */
+    @GetMapping("/setRole")
+    @ApiOperation("修改角色")
+
     public Response setRole(long id,String rolename){
         Role role = Role.builder()
                 .id(id)
@@ -81,7 +87,9 @@ public class RoleController {
      * @param	id
      * @return com.gihon.common.http.Response
      */
-    public Response findRole(Long id){
+    @GetMapping("/getRole")
+    @ApiOperation("根据ID查找角色信息")
+    public Response getRole(Long id){
         Role role = roleService.getById(id);
         return Response.ok(role);
     }
@@ -93,8 +101,10 @@ public class RoleController {
      * @param	id
      * @return com.gihon.common.http.Response
      */
-    public Response findPermissionByRoleId(Long id){
-        Response<List<Role>> permissionsByRoleId = roleService.findPermissionByRoleId(id);
+    @GetMapping("/getPermissionByRoleId")
+    @ApiOperation("查询角色对应权限")
+    public Response getPermissionByRoleId(Long id){
+        Response<List<Role>> permissionsByRoleId = roleService.getPermissionByRoleId(id);
         return permissionsByRoleId;
     }
 

common-springboot/src/main/java/com/gihon/controller/UserController.java

@@ -58,7 +58,7 @@ public class UserController {
      */
     @ApiOperation("查询 用户信息by用户ID")
     @GetMapping("/userByID")
-    public Response userFindOne(@RequestParam Long id){
+    public Response userGetOne(@RequestParam Long id){
         User userInfo = userService.getById(id);
         return Response.ok(userInfo);
     }
@@ -106,7 +106,7 @@ public class UserController {
      * @param	RoleIds
      * @return com.gihon.common.web.response.Response
      */
-    @ApiOperation("用户ById")
+    @ApiOperation("增加用户的角色")
     @PostMapping("/addRole4User")
     @ResponseBody
     public Response addRole4User(@RequestBody User user,@RequestParam("RoleIds") Long[] RoleIds){
@@ -137,8 +137,8 @@ public class UserController {
 
     }
 
-    @ApiOperation("修改密码")
-    @PostMapping(value = "/setUser")
+    @ApiOperation("根据用户名 修改密码")
+    @PostMapping(value = "/modifyUser")
     /**
      * 主要功能：修改密码
      * @data 2021/2/19 9:51
@@ -153,15 +153,14 @@ public class UserController {
     public Response<User> modifyUser(String username, String password) {
         //修改新密码
         MyPasswordEncoder encoder = new MyPasswordEncoder();
-        User user = User.builder().account(username).build();
-        user.setPassword(encoder.encode(password));
+        User user = User.builder().password(encoder.encode(password)).build();
         //根据用户名
         boolean update = userService.update(user, new QueryWrapper<User>()
-                .eq("username", user.getAccount())
+                .eq("account", username)
         );
         //修改结果
         if (!update) {
-            return Response.error(ResponseStatus.MAPPER_ERROR,"修改密码访问数据库失败");
+            return Response.error(ResponseStatus.MAPPER_ERROR,"用户未存在、或修改密码访问数据库失败");
         }
         return Response.ok();
     }

common-springboot/src/main/java/com/gihon/entity/Org.java

@@ -54,7 +54,7 @@ public class Org implements Serializable {
     /**
      * 描述
      */
-    private String describe;
+    private String describ;
 
     /**
      * 创建时间
@@ -125,12 +125,12 @@ public class Org implements Serializable {
         this.status = status;
     }
 
-    public String getDescribe() {
-        return describe;
+    public String getDescrib() {
+        return describ;
     }
 
-    public void setDescribe(String describe) {
-        this.describe = describe;
+    public void setDescribe(String describ) {
+        this.describ = describ;
     }
 
     public LocalDateTime getCreateTime() {
@@ -174,7 +174,7 @@ public class Org implements Serializable {
         ", parentId=" + parentId +
         ", sortValue=" + sortValue +
         ", status=" + status +
-        ", describe=" + describe +
+        ", describe=" + describ +
         ", createTime=" + createTime +
         ", createUser=" + createUser +
         ", updateTime=" + updateTime +

common-springboot/src/main/java/com/gihon/entity/Permission.java

@@ -3,6 +3,7 @@ package com.gihon.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.*;
 
@@ -28,61 +29,83 @@ public class Permission implements Serializable {
     /**
      * 主键
      */
+    @ApiModelProperty("权限主键")
+
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
      * 权限名称
      */
+    @ApiModelProperty("权限名称")
+
     private String name;
 
     /**
      * 备注
      */
+    @ApiModelProperty("权限备注")
+
     private String description;
 
-    private String permission;
+    @ApiModelProperty("权限父id")
 
     private Long parentId;
 
     /**
      * 接口地址
      */
+    @ApiModelProperty("权限接口地址")
+
     private String url;
 
     /**
      * 模块
      */
+    @ApiModelProperty("权限模块")
+
     private String module;
 
     /**
      * 类型
      */
+    @ApiModelProperty("权限类型")
+
     private String type;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty("权限创建时间")
+
     private LocalDateTime createTime;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty("权限创建人id")
+
     private Long createUserId;
 
     /**
      * 最后修改时间
      */
+    @ApiModelProperty("权限最后修改时间")
+
     private LocalDateTime updateTime;
 
     /**
      * 修改人id
      */
+    @ApiModelProperty("权限修改人id")
+
     private Long updateUserId;
 
     /**
      * 逻辑删除 0未删除 1已删除
      */
+    @ApiModelProperty("权限 逻辑删除 0未删除 1已删除")
+
     private Integer deleted;
 
 

common-springboot/src/main/java/com/gihon/entity/Role.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import java.io.Serializable;
@@ -33,37 +34,43 @@ public class Role  implements Serializable{
     /**
      * 名称
      */
-    @TableField("name")
+    @ApiModelProperty("角色名称")
     private String name;
 
     /**
      * 描述
      */
-    private String describe;
+    @ApiModelProperty("角色描述")
+    private String describ;
 
     /**
      * 状态 1.启用 2.禁用
      */
+    @ApiModelProperty("角色状态")
     private Boolean status;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty("角色创建人id")
     private Long createUser;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty("角色创建时间")
     private LocalDateTime createTime;
 
     /**
      * 更新人id
      */
+    @ApiModelProperty("角色更新人id")
     private Long updateUser;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty("角色更新时间")
     private LocalDateTime updateTime;
 
 

common-springboot/src/main/java/com/gihon/entity/User.java

@@ -42,77 +42,106 @@ public class User implements Serializable {
     /**
      * 邮箱
      */
+    @ApiModelProperty("用户邮箱")
+
     private String email;
 
     /**
      * 手机
      */
+    @ApiModelProperty("用户手机")
     private String mobile;
 
     /**
      * 性别 1:女;2:男;0:未知}
      */
+    @ApiModelProperty("用户性别")
+
     private Boolean sex;
 
     /**
      * 状态 1启用 0禁用
      */
+    @ApiModelProperty("账号状态")
+
     @TableLogic(value = "1",delval = "0")
     private Integer status;
 
     /**
      * 头像
      */
+    @ApiModelProperty("用户头像")
+
     private String avatar;
 
     /**
      * 民族
      */
+    @ApiModelProperty("用户民族")
+
     private String nation;
 
     /**
      * 学历
      */
+    @ApiModelProperty("用户学历")
+
     private String education;
 
     /**
      * 创建人id
      */
+    @ApiModelProperty("用户创建人id")
+
     private Long createUser;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty("用户创建时间")
+
     private LocalDateTime createTime;
 
     /**
      * 更新人id
      */
+    @ApiModelProperty("用户更新人id")
+
     private Long updateUser;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty("用户 更新时间")
+
     private LocalDateTime updateTime;
 
     /**
      * 微信用户唯一标识
      */
+    @ApiModelProperty("用户微信用户唯一标识")
+
     private String openid;
 
     /**
      * 微信昵称
      */
+    @ApiModelProperty("用户微信昵称")
+
     private String merchantNickname;
 
     /**
      * 微信头像
      */
+    @ApiModelProperty("用户微信头像")
+
     private String merchantImg;
 
     /**
      * 微信手机号
      */
+    @ApiModelProperty("用户微信手机号")
+
     private String merchantPhone;
 
 

common-springboot/src/main/java/com/gihon/mapper/PermissionMapper.java

@@ -22,8 +22,8 @@ public interface PermissionMapper  extends BaseMapper<Permission> {
      * @param id 用户id
      * @return 权限对象
      */
-    @Select("select * from tb_permission per where per.id in (select perm_id from tb_role_perm rp where rp.role_id in (select role_id from tb_user_role ur where ur.user_id = #{id} ) )")
-    public List<Permission> findPermissions(@Param("id") Long id);
+    @Select("select * from s_gihon_permission per where per.id in (select id from s_gihon_role_authority rp where rp.role_id in (select role_id from s_gihon_user_role ur where ur.user_id = #{id} ) )")
+    public List<Permission> getPermissions(@Param("id") Long id);
 
 
 }

common-springboot/src/main/java/com/gihon/mapper/RoleMapper.java

@@ -22,8 +22,8 @@ public interface RoleMapper extends BaseMapper<Role> {
      * @return 角色集合
      */
 
-    @Select("")
-    public List<Role> listFindRoles(@Param("id") String id);
+    @Select("select * from s_gihon_role")
+    public List<Role> listGetRoles(@Param("id") String id);
 
     List<Role> selectPermissionByRoleId(Long id);
 }

common-springboot/src/main/java/com/gihon/service/RoleService.java

@@ -7,5 +7,5 @@ import com.gihon.entity.Role;
 import java.util.List;
 
 public interface RoleService extends IService<Role> {
-    Response<List<Role>> findPermissionByRoleId(Long id);
+    Response<List<Role>> getPermissionByRoleId(Long id);
 }

common-springboot/src/main/java/com/gihon/service/impl/RoleServiceImpl.java

@@ -21,7 +21,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper,Role> implements Rol
     @Autowired
     private RoleMapper roleMapper;
     @Override
-    public Response<List<Role>> findPermissionByRoleId(Long id) {
+    public Response<List<Role>> getPermissionByRoleId(Long id) {
         List<Role> roles = roleMapper.selectPermissionByRoleId(id);
 
         return  Response.ok(roles);

common-springboot/src/main/java/com/gihon/service/impl/permissionServiceImpl.java

@@ -1,11 +1,14 @@
 package com.gihon.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gihon.common.web.response.PageBean;
+import com.gihon.common.web.response.PageResponse;
 import com.gihon.common.web.response.Response;
 import com.gihon.common.web.response.ResponseStatus;
-import com.gihon.mapper.PermissionMapper;
 import com.gihon.entity.Permission;
+import com.gihon.mapper.PermissionMapper;
 import com.gihon.service.permissionService;
 import org.springframework.stereotype.Service;
 
@@ -30,7 +33,7 @@ public class permissionServiceImpl extends ServiceImpl<PermissionMapper,Permissi
     @Override
     public Response<List<Permission>> getPermissionsByUserId(Long id) {
 
-        List<Permission> permissions = baseMapper.findPermissions(id);
+        List<Permission> permissions = baseMapper.getPermissions(id);
         return Response.ok(permissions);
     }
 
@@ -49,6 +52,25 @@ public class permissionServiceImpl extends ServiceImpl<PermissionMapper,Permissi
         return Response.ok();
     }
 
+    @Override
+    public Response addPermissionById(Permission permission) {
+        boolean save = this.save(permission);
+        if (!save){return Response.error(ResponseStatus.MAPPER_ERROR,"添加时数据库访问失败");}
+        return Response.ok();
+    }
+
+    @Override
+    public PageResponse pagePermissions(int page, int rows) {
+        Page<Permission> page2 = (Page<Permission>) this.page(new Page<>(page, rows));
+        PageBean<Permission> pageBean = PageBean.createSuccess(
+                page2.getRecords(),
+                page2.getTotal(),
+                page2.getSize(),
+                page2.getCurrent(),
+                page2.getPages());
+        return PageResponse.ok(pageBean);
+    }
+
     /**
      * 主要功能：修改已有权限
      * @data 2021/2/20 9:49
@@ -61,7 +83,7 @@ public class permissionServiceImpl extends ServiceImpl<PermissionMapper,Permissi
     @Override
     public Response modifyPermission(Long id, String permissionStr) {
         Permission permission = this.getById(id);
-        permission.setPermission(permissionStr);
+        permission.setName(permissionStr);
         int update = baseMapper.update(permission, new QueryWrapper<Permission>().eq("id", id));
 
         if (update == 0) {

common-springboot/src/main/java/com/gihon/service/permissionService.java

@@ -1,6 +1,7 @@
 package com.gihon.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gihon.common.web.response.PageResponse;
 import com.gihon.common.web.response.Response;
 import com.gihon.entity.Permission;
 
@@ -24,4 +25,8 @@ public interface permissionService  extends IService<Permission> {
     Response getpermissionById(Long id);
 
     Response deletePermissionById(Long id);
+
+    Response addPermissionById(Permission permission);
+
+    PageResponse pagePermissions(int page, int rows);
 }

common-springboot/src/main/resources/mapper/RoleMapper.xml

@@ -3,6 +3,6 @@
 <mapper namespace="com.gihon.mapper.RoleMapper">
 
     <select id="selectPermissionByRoleId" resultType="com.gihon.entity.Role">
-        select * from tb_permission where id in(select role_id from tb_role_perm where role_id =#{id})
+        select * from s_gihon_permission where id in(select authority_id from s_gihon_role_authority where role_id =#{id})
     </select>
 </mapper>

common-springboot/src/test/java/com/gihon/GihonCommonApplicationTests.java

@@ -8,6 +8,7 @@ class GihonCommonApplicationTests {
 
 	@Test
 	void contextLoads() {
+
 	}
 
 }