Browse Source

角色 列表查询 修复

Michael 8 years ago
parent
commit
3cbcfe370b

+ 1 - 1
src/main/java/com/goafanti/common/mapper/RoleMapper.xml

@@ -104,7 +104,7 @@
     </foreach>
   </delete>
  <!-- ******************************************************************** --> 
-  <select id="selectRoleList" resultType="com.goafanti.common.model.Role">
+  <select id="selectRoleList" resultType="com.goafanti.permission.bo.RoleBo">
     select id,role_name as roleName,role_type as roleType,creater,create_time as createTime
     from role 
     where role_type <![CDATA[ < ]]> 999999

+ 0 - 10
src/main/java/com/goafanti/common/model/Role.java

@@ -21,16 +21,6 @@ public class Role extends BaseModel implements Serializable{
      * 创建时间
      */
     private String createTime;
-    
-    private String id;
-    
-    public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
 
 	public String getCreater() {
 		return creater;

+ 30 - 0
src/main/java/com/goafanti/permission/bo/RoleBo.java

@@ -19,6 +19,36 @@ public class RoleBo extends Role {
      * 创建时间
      */
     private String createTime;
+    
+    private String roleName;
+
+    private Integer roleType;
+    
+    private String id;
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	public Integer getRoleType() {
+		return roleType;
+	}
+
+	public void setRoleType(Integer roleType) {
+		this.roleType = roleType;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
 
 	public String getCreater() {
 		return creater;

+ 23 - 0
src/main/java/com/goafanti/permission/bo/RolePermissionBo.java

@@ -32,7 +32,30 @@ public class RolePermissionBo {
      * 权限接口地址
      */
     private String url;
+    /**
+     * 创建人
+     */
+    private String creater;
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+	public String getCreater() {
+		return creater;
+	}
 
+	public void setCreater(String creater) {
+		this.creater = creater;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
 	public String getRname() {
 		return rname;
 	}

+ 4 - 1
src/main/java/com/goafanti/permission/controller/NewRoleApiController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.Role;
+import com.goafanti.permission.bo.RoleBo;
 import com.goafanti.permission.service.NewRoleService;
 
 @RestController
@@ -19,10 +20,12 @@ public class NewRoleApiController extends BaseApiController{
 	
 	
 	@RequestMapping(value = "/roles", method = RequestMethod.POST)
-	public Result roles(Role role, Integer pageNo,
+	public Result roles(RoleBo role, Integer pageNo,
 			Integer pageSize) {
 		Result res = new Result();
 		res.setData(newRoleService.findRoles(role,pageNo,pageSize));
 		return res;
 	}
+	
+	
 }

+ 2 - 2
src/main/java/com/goafanti/permission/service/NewRoleService.java

@@ -2,10 +2,10 @@ package com.goafanti.permission.service;
 
 
 
-import com.goafanti.common.model.Role;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.permission.bo.RoleBo;
 
 public interface NewRoleService {
-	Pagination<Role>findRoles(Role role, Integer pageNo,
+	Pagination<RoleBo>findRoles(RoleBo role, Integer pageNo,
 			Integer pageSize);
 }

+ 4 - 4
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -10,10 +10,10 @@ import com.goafanti.common.dao.RoleMapper;
 import com.goafanti.common.dao.RolePermissionMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
-import com.goafanti.common.model.Role;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.permission.bo.RoleBo;
 import com.goafanti.permission.service.NewRoleService;
 @Service
 public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements NewRoleService {
@@ -26,13 +26,13 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 	@Autowired
 	RolePermissionMapper	rolePermissionMapper;
 	@Override
-	public Pagination<Role> findRoles(Role role, Integer pageNo, Integer pageSize) {
+	public Pagination<RoleBo> findRoles(RoleBo role, Integer pageNo, Integer pageSize) {
 		Map<String,Object> params =disposeParams(role);
 		@SuppressWarnings("unchecked")
-		Pagination<Role> p=(Pagination<Role>)findPage("selectRoleList","selectRoleCount",params,pageNo,pageSize);
+		Pagination<RoleBo> p=(Pagination<RoleBo>)findPage("selectRoleList","selectRoleCount",params,pageNo,pageSize);
 		return p;
 	}
-	private Map<String,Object> disposeParams(Role role){
+	private Map<String,Object> disposeParams(RoleBo role){
 		Map<String,Object> params = new HashMap<String, Object>();			
 		if(StringUtils.isNotBlank(role.getRoleName())) params.put("roleName", role.getRoleName());		
 		return params;