2222225566

saicLogistics/src/main/java/com/fuzamei/entity/User.java

@@ -20,8 +20,28 @@ public class User {
 	private Long updateTime;      	//更新时间
 	private String roleName;		//角色名称
 	private String token;			//令牌
+	private Integer page;				//页数
+	private Integer rowNum;				//单页显示条数量
+	private Integer startPage;			//起始页
 	
-	
+	public Integer getPage() {
+		return page;
+	}
+	public void setPage(Integer page) {
+		this.page = page;
+	}
+	public Integer getRowNum() {
+		return rowNum;
+	}
+	public void setRowNum(Integer rowNum) {
+		this.rowNum = rowNum;
+	}
+	public Integer getStartPage() {
+		return startPage;
+	}
+	public void setStartPage(Integer startPage) {
+		this.startPage = startPage;
+	}
 	public String getTokenId() {
 		return tokenId;
 	}

saicLogistics/src/main/java/com/fuzamei/mapper/UserMapper.xml

@@ -47,7 +47,27 @@
 		      	and  person_name=#{personName}
 		      </if>
 		 </where>
+		      order by create_time desc
+			  limit #{startPage},#{rowNum}
 	</select>
+	
+	<select id="queryUserscount"  resultType="int">
+		 select count(*)  from users	
+		 <where>
+		      <if test="roleId!=null and roleId!=''">
+		      	   y.role_id=#{roleId}
+		      </if>
+		       <if test="username!=null and username!=''">
+		      	and  username=#{username}
+		      </if>
+		      <if test="personName!=null and personName!=''">
+		      	and  person_name=#{personName}
+		      </if>
+		 </where>
+		    
+	
+	</select>
+	
 	<!--根据用户id修改角色，账号，密码，名称  -->
 	<update id="updateAccountByUserId" parameterType="com.fuzamei.entity.User">
 		update users set role_id = #{roleId}, username=#{username} , password=#{password} , person_name=#{personName},update_time=#{updateTime} where user_id=#{userId}

saicLogistics/src/main/java/com/fuzamei/mapperInterface/UserMapper.java

@@ -14,6 +14,8 @@ public interface UserMapper {
 	public List<User> findUserById(User user);//根据id查询账号是否已存在
 	public List<User> findUserByuserIdandusername(User user);//根据id 账户查询用户存在吗  能否修改
 	
+	public int queryUserscount(Map<String, Object> map);//查询总条数
+	
 	public void deleteFromUserId(String[] userIds);//批量删除，前端传个id字符串来
 	
 	

saicLogistics/src/main/java/com/fuzamei/service/UserService.java

@@ -5,14 +5,15 @@ import java.util.Map;
 
 import com.fuzamei.entity.Role;
 import com.fuzamei.entity.User;
+import com.fuzamei.util.PageDTO;
 
 public interface UserService {
 	public List<Role> getAllRoles();//查询得到所有角色
-	public List<User> queryUsers(Map<String, Object> map);//查看所有账户列表
+	public PageDTO queryUsers(Map<String, Object> map);//查看所有账户列表
 	public void updateAccountByUserId(User user);//编辑修改用户
 	public  void  insertUsers(User user);//添加账号角色名称
 	public List<User> findUserById(User user);//根据id查询账号是否已存在
 	public List<User> findUserByuserIdandusername(User user);
-	
+	//public int queryUserscount(Map<String, Object> map);//查询总条数
 	public void deleteFromUserId(String userIds);//批量删除
 }

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/UserServiceImpl.java

@@ -34,15 +34,15 @@ public class UserServiceImpl  implements  UserService {
 	}
 	
 	/**
-	 * 查看列表
+	 * 查看用户列表
 	 */
-	public List<User> queryUsers(Map<String, Object> map) {
-		PageDTO pageDTO = new PageDTO();
+	public PageDTO  queryUsers(Map<String, Object> map) {
+		PageDTO pageDtO = new PageDTO();
 		List<User> users = userMapper.queryUsers(map);
-		pageDTO.setRows(users);
-		/*int count = userMapper.findCounts(map);
-		pageDTO.setTotal(total);*/
-		 return users;
+		int count = userMapper.queryUserscount(map);
+		pageDtO.setTotal(count);
+		pageDtO.setRows(users);
+		 return pageDtO;
 	}
 	/**
 	 * 添加用户信息 
@@ -56,12 +56,7 @@ public class UserServiceImpl  implements  UserService {
 		userMapper.insertUsers(user);
 		
 	}
-	public static void main(String[] args) {
-		SimpleDateFormat sdf=new SimpleDateFormat("s");
-		String str=sdf.format(new Date());
-		System.out.println(str+"随机数是");
-		System.err.println();
-	}
+	
 
 	/**
 	 * 根据用户id查询用户是否存在
@@ -95,6 +90,8 @@ public class UserServiceImpl  implements  UserService {
 		String[] strs=userIds.split(",");
 		userMapper.deleteFromUserId(strs);
 	}
+
+
 	
 	
 }

saicLogistics/src/main/java/com/fuzamei/web/UserAction.java

@@ -22,6 +22,7 @@ import com.fuzamei.entity.User;
 import com.fuzamei.service.UserAuthoricationService;
 import com.fuzamei.service.UserService;
 import com.fuzamei.util.JSONUtil;
+import com.fuzamei.util.PageDTO;
 import com.fuzamei.util.ValidationUtil;
 
 @RestController
@@ -33,7 +34,7 @@ public class UserAction {
 	private UserAuthoricationService userAuthoricationService;
 	@Autowired
 	private HttpServletRequest req;
-
+	//private static final int ROW_NUM = 10; // 分页每页显示几条
 	/**
 	 * 查询*得到所有的角色
 	 * 
@@ -64,19 +65,26 @@ public class UserAction {
 		try {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = JSON.parseObject(data, Map.class);
+		
 			Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
 			userAuthoricationService.queryUserAuthority(user_id, Roles.ADMIN);
+			Integer page = ValidationUtil.checkMinAndAssignInt(map.get("page"), 1); 
+			Integer rowNum = ValidationUtil.checkAndAssignDefaultInt(map.get("rowNum"), 1);
 			Integer roleId = ValidationUtil.checkBlankIntegerAndAssignNullIfIsBlank(map.get("roleId"));
 			String username = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("username"));
 			String personName = ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(map.get("personName"));
 			Map<String, Object> mapToService = new LinkedHashMap<String, Object>();
-			//mapToService.put("user_id", user_id);
+			mapToService.put("user_id", user_id);
 			mapToService.put("roleId", roleId);
 			mapToService.put("username", username);
 			mapToService.put("personName", personName);
-			List<User> list = userService.queryUsers(mapToService);
-			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, list);
+			
+			mapToService.put("startPage", (page - 1) * rowNum);
+			mapToService.put("rowNum", rowNum); // 默认每页显示数据是10条
+			PageDTO  pt = userService.queryUsers(mapToService);
+			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS,pt);
 		} catch (Exception e) {
+			e.printStackTrace();
 			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL + ":" + e.getMessage(), null);
 		}