重置密码功能

src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

@@ -128,6 +128,31 @@ public class UserInfoController {
 	}
 
 	/**
+	 * 查找用户信息
+	 * @param pageNum	页码
+	 * @param pageSize	每页条数
+	 * @return
+	 */
+	@RequestMapping(value="/getUserInfo", method = RequestMethod.GET)
+	@ApiOperation(value="查询用户信息", notes = "查询用户信息列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "username", value = "用户名", paramType = "query"),
+		@ApiImplicitParam(name = "realName", value = "用户真实姓名", paramType = "query")
+	})
+	public PageInfo<UserInfo> getUser(HttpServletRequest request, Integer pageNum, Integer pageSize) {
+		
+		if (pageNum!=null && pageSize!=null) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		HashMap<Object, Object> map = new HashMap<Object, Object>();
+		List<UserInfo> listAll=userInfoService.queryAll(map);
+		PageInfo<UserInfo> pageInfo = new PageInfo<UserInfo>(listAll);
+		return pageInfo;
+	}
+
+	/**
 	 * 查找审批用户信息
 	 * @param roleName	角色名称
 	 * @param orgId	组织机构编码
@@ -433,10 +458,11 @@ public class UserInfoController {
 	@RequestMapping(value="/resetPassword", method = RequestMethod.POST)
 	@ApiOperation(value="重置密码", notes = "重置密码")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "userId", value = "用户编号", paramType = "form")
+			@ApiImplicitParam(name = "userId", value = "用户编号", paramType = "form"),
+			@ApiImplicitParam(name = "userPwd", value = "用户密码", paramType = "form")
 	})
-	public void resetPassword(Integer userId) {
-		userInfoService.resetPassword(userId);
+	public void resetPassword(Integer userId, String userPwd) {
+		userInfoService.resetPassword(userId,userPwd);
 	}
 	
 	/**

src/main/java/com/chinaitop/depot/system/service/UserInfoService.java

@@ -52,7 +52,7 @@ public interface UserInfoService {
 	 * 重置密码
 	 * @param userId	用户编号
 	 */
-	void resetPassword(Integer userId);
+	void resetPassword(Integer userId,String userPwd);
 	
 	/**
 	 * 根据条件查询用户列表

src/main/java/com/chinaitop/depot/system/service/impl/UserInfoServiceImpl.java

@@ -161,9 +161,9 @@ public class UserInfoServiceImpl implements UserInfoService {
 	}
 
     @Override
-    public void resetPassword(Integer userId) {
+    public void resetPassword(Integer userId,String userPwd) {
 	    UserInfo userInfo = UserInfoMapper.selectByPrimaryKey(userId);
-	    userInfo.setPassword(this.getMD5("123456"));
+	    userInfo.setPassword(userPwd);
 	    UserInfoMapper.updateByPrimaryKey(userInfo);
     }