Browse Source

角色 搜索列表

Michael 8 years ago
parent
commit
ed630fa35a

+ 2 - 0
src/main/java/com/goafanti/common/dao/RoleMapper.java

@@ -28,4 +28,6 @@ public interface RoleMapper {
 	int deleteByPrimaryKeys(List<String> records);
 
 	List<RolePermissionBo> findRolePermissionsExceptAreaManager();
+	
+	List<Role> findRoles();
 }

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

@@ -7,7 +7,7 @@
     <result column="role_type" jdbcType="INTEGER" property="roleType" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, role_name, role_type
+    id, role_name, role_type ,creater,create_time as createTime
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -103,4 +103,26 @@
 	  #{item,jdbcType=VARCHAR}  
     </foreach>
   </delete>
+ <!-- ******************************************************************** --> 
+  <select id="selectRoleList" resultType="com.goafanti.common.model.Role">
+    select id,role_name as roleName,role_type as roleType,creater,create_time as createTime
+    from role 
+    where role_type <![CDATA[ < ]]> 999999
+    <if test="roleName !=null">
+		AND role_name=#{roleName,jdbcType=VARCHAR}
+	</if>
+	<if test="page_sql != null">
+    		${page_sql}
+	</if>
+  </select>
+  <select id="selectRoleCount" resultType="java.lang.Integer">
+  	select
+		count(0)
+		from role
+		where
+		1=1
+		<if test="roleName !=null">
+		AND role_name=#{roleName,jdbcType=VARCHAR}
+		</if>
+  </select>
 </mapper>

+ 35 - 1
src/main/java/com/goafanti/common/model/Role.java

@@ -13,8 +13,42 @@ public class Role extends BaseModel implements Serializable{
 
     private Integer roleType;
 
+    /**
+     * 创建人
+     */
+    private String creater;
+    /**
+     * 创建时间
+     */
+    private String createTime;
+    
+    private String id;
+    
+    public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	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 getRoleName() {
+	public String getRoleName() {
         return roleName;
     }
 

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

@@ -10,6 +10,31 @@ public class RoleBo extends Role {
 	private static final long	serialVersionUID	= 1L;
 
 	List<Permission>			permissions			= new ArrayList<>();
+	
+	/**
+     * 创建人
+     */
+    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 List<Permission> getPermissions() {
 		return permissions;

+ 28 - 0
src/main/java/com/goafanti/permission/controller/NewRoleApiController.java

@@ -0,0 +1,28 @@
+package com.goafanti.permission.controller;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+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.service.NewRoleService;
+
+@RestController
+@RequestMapping("open/api/admin/role")
+public class NewRoleApiController extends BaseApiController{
+	@Resource
+	private NewRoleService newRoleService;
+	
+	
+	@RequestMapping(value = "/roles", method = RequestMethod.POST)
+	public Result roles(Role role, Integer pageNo,
+			Integer pageSize) {
+		Result res = new Result();
+		res.setData(newRoleService.findRoles(role,pageNo,pageSize));
+		return res;
+	}
+}

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

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

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

@@ -0,0 +1,42 @@
+package com.goafanti.permission.service.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+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.service.NewRoleService;
+@Service
+public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements NewRoleService {
+	@Autowired
+	RoleMapper				roleMapper;
+	@Autowired
+	UserMapper				userMapper;
+	@Autowired
+	UserRoleMapper			userRoleMapper;
+	@Autowired
+	RolePermissionMapper	rolePermissionMapper;
+	@Override
+	public Pagination<Role> findRoles(Role role, Integer pageNo, Integer pageSize) {
+		Map<String,Object> params =disposeParams(role);
+		@SuppressWarnings("unchecked")
+		Pagination<Role> p=(Pagination<Role>)findPage("selectRoleList","selectRoleCount",params,pageNo,pageSize);
+		return p;
+	}
+	private Map<String,Object> disposeParams(Role role){
+		Map<String,Object> params = new HashMap<String, Object>();			
+		if(StringUtils.isNotBlank(role.getRoleName())) params.put("roleName", role.getRoleName());		
+		return params;
+		
+	}
+	
+}