标签查找项目添加分页

tall/src/main/java/com/ccsens/tall/persist/dao/SysUserDao.java

@@ -22,4 +22,6 @@ public interface SysUserDao extends SysUserMapper {
     void replaceProLog(@Param("oldUserId") Long userId,@Param("newUserId")  Long currentUserId);
 
     String getUserNameByUserId(@Param("userId") Long userId);
+
+    void replaceComment(@Param("oldUserId")Long userId, @Param("newUserId") Long currentUserId);
 }

tall/src/main/java/com/ccsens/tall/service/IProjectService.java

@@ -33,7 +33,7 @@ public interface IProjectService {
 
     ProjectVo.ProjectInfo changeProjectInfo(Long currentUserId, ProjectDto.ProjectInfoDto projectInfoDto);
 
-    List<ProjectVo.ProjectInfo> selectByLabelName(Long currentUserId, String labelName);
+    ProjectVo.ProjectAllDetailed selectByLabelName(Long currentUserId, String labelName,Integer pageSize,Integer page);
 
     List<ProjectVo.RelevanceProject> selectRelevanceProject(Long currentUserId, Long projectId);
 }

tall/src/main/java/com/ccsens/tall/service/ProjectService.java

@@ -18,6 +18,7 @@ import com.ccsens.util.cron.CronConstant;
 import com.ccsens.util.cron.NatureToDate;
 import com.ccsens.util.exception.BaseException;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -770,10 +771,22 @@ public class ProjectService implements IProjectService {
      * @return
      */
     @Override
-    public List<ProjectVo.ProjectInfo> selectByLabelName(Long currentUserId, String labelName) {
+    public ProjectVo.ProjectAllDetailed selectByLabelName(Long currentUserId, String labelName,Integer pageSize ,Integer page) {
+//        List<ProjectVo.ProjectInfo> projectInfoList = sysProjectDao.selectByLabelName(currentUserId,labelName);
+//        projectByProject(projectInfoList,currentUserId);
+
+        PageHelper.startPage(page, pageSize);
         List<ProjectVo.ProjectInfo> projectInfoList =  sysProjectDao.selectByLabelName(currentUserId,labelName);
+        PageInfo<ProjectVo.ProjectInfo> projectInfoPage = new  PageInfo<>(projectInfoList);
         projectByProject(projectInfoList,currentUserId);
-        return projectInfoList;
+
+        ProjectVo.ProjectAllDetailed projectAllDetailed = new ProjectVo.ProjectAllDetailed();
+        projectAllDetailed.setProjectInfoList(projectInfoList);
+        ProjectVo.PageInfo pageInfo = new ProjectVo.PageInfo();
+        pageInfo.setTotalPage(projectInfoPage.getPages());
+        pageInfo.setCurrentPage(projectInfoPage.getPageNum());
+        projectAllDetailed.setPageInfo(pageInfo);
+        return projectAllDetailed;
     }
 
     @Override

tall/src/main/java/com/ccsens/tall/service/UserService.java

@@ -696,6 +696,7 @@ public class UserService implements IUserService {
         SysUser user = new SysUser();
         user.setId(snowflake.nextId());
         user.setPhone(userSignup.getPhone());
+        user.setAvatarUrl(PropUtil.notGatewayUrl + "staticrec/logo.png");
         user.setSource(userSignup.getSource());
         userDao.insertSelective(user);
 
@@ -1214,6 +1215,7 @@ public class UserService implements IUserService {
                 userDao.replaceMember(userId, currentUserId);
                 userDao.replaceDeliverPostLog(userId, currentUserId);
                 userDao.replaceProLog(userId, currentUserId);
+                userDao.replaceComment(userId, currentUserId);
                 //将以前的余额添加至此账号
                 SysUser oldUser = userDao.selectByPrimaryKey(userId);
                 SysUser newUser = userDao.selectByPrimaryKey(currentUserId);

tall/src/main/java/com/ccsens/tall/web/ProjectController.java

@@ -230,10 +230,13 @@ public class ProjectController {
     @ApiImplicitParams({
     })
     @RequestMapping(value = "/label", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<ProjectVo.ProjectInfo>> selectByLabelName(HttpServletRequest request,
-                                           @RequestParam(required = false) String labelName) throws Exception {
+    public JsonResponse<ProjectVo.ProjectAllDetailed> selectByLabelName(HttpServletRequest request,
+                                           @RequestParam(required = false) String labelName,
+                                           @RequestParam(required = false) Integer page ) throws Exception {
+        Integer pageSize = 10;
+        page = page == null ? 1 : page;
         Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
-        List<ProjectVo.ProjectInfo> projectInfoList = projectService.selectByLabelName(currentUserId,labelName);
+        ProjectVo.ProjectAllDetailed projectInfoList = projectService.selectByLabelName(currentUserId,labelName,pageSize,page);
         return JsonResponse.newInstance().ok(projectInfoList);
     }
 

tall/src/main/resources/mapper_dao/SysUserDao.xml

@@ -67,6 +67,15 @@
             user_id = #{oldUserId}
     </update>
 
+    <update id="replaceComment" parameterType="java.util.Map">
+        update
+            t_pro_task_comment
+        set
+            user_id = #{newUserId}
+        where
+            user_id = #{oldUserId}
+    </update>
+
     <select id="getUserNameByUserId" parameterType="java.util.Map" resultType="java.lang.String">
         SELECT
             IF( u.nickname = '', a.identifier, u.nickname ) AS userName