完成我的活动列表接口

src/main/java/com/qiankun/controller/mdp/MdpController.java

@@ -9,14 +9,18 @@ import com.google.common.collect.Maps;
 import com.qiankun.annotation.Auth;
 import com.qiankun.config.WxMaConfiguration;
 import com.qiankun.config.WxMaProperties;
+import com.qiankun.controller.base.BaseController;
 import com.qiankun.dao.UserDao;
+import com.qiankun.dao.core.Hints;
 import com.qiankun.entity.*;
+import com.qiankun.pages.IPageList;
 import com.qiankun.service.ActivityService;
 import com.qiankun.service.BloodService;
 import com.qiankun.service.UserService;
 import com.qiankun.utils.JwtTokenUtil;
 import com.qiankun.utils.QRCodeUtil;
 import com.qiankun.utils.UserUtils;
+import com.qiankun.vo.ActivityVo;
 import com.qiankun.vo.DecryptedDataVo;
 import com.qiankun.vo.PaperIdLoginVo;
 import com.qiankun.vo.UserVo;
@@ -35,6 +39,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
@@ -42,7 +47,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/wx/mdp")
-public class MdpController {
+public class MdpController extends BaseController<Object> {
     private final Logger logger = LoggerFactory.getLogger(MdpController.class);
     @Autowired
     private JwtTokenUtil tokenUtil;
@@ -284,6 +289,18 @@ public class MdpController {
         response.flushBuffer();
     }
 
+    @Auth(verifyURL = false,verifyLogin = false)
+    @RequestMapping(value = "/activity/list",method = RequestMethod.GET)
+    public Map<String,Object> getActivityList(@RequestParam(required = false) String userId, HttpServletResponse response, HttpServletRequest request){
+        IPageList<Activity> userPage = activityService.findPageList(userId,new Hints(getStartRow(request),getPageCount(request)));
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("activityData", userPage);
+        map.put("pageCount", getPageCount(request));
+        map.put("pageNumber", getPageNumber(request));
+        return map;
+    }
+
     /**
      * 活动报名
      * @param userId

src/main/java/com/qiankun/dao/ActivityDao.java

@@ -13,4 +13,6 @@ public interface ActivityDao extends IDao<Activity, String> {
 			Hints hints);
 
 	List<Activity> findByAvailableAndType(Boolean available, String type);
+
+    IPageList<Activity> findPageList(String userId, Hints hints);
 }

src/main/java/com/qiankun/dao/ActivityDaoImpl.java

@@ -3,6 +3,7 @@ package com.qiankun.dao;
 import java.util.Date;
 import java.util.List;
 
+import com.google.common.base.Strings;
 import org.springframework.stereotype.Repository;
 
 import com.qiankun.dao.core.AbsDao;
@@ -60,4 +61,20 @@ public class ActivityDaoImpl extends AbsDao<Activity, String> implements Activit
     		
         return find(FIND_ACTIVITY_BY_TYPE + hql, new Hints(), type);
     }
+
+    @Override
+    public IPageList<Activity> findPageList(String userId, Hints hints) {
+	    String hsql = "";
+        IPageList<Activity> activitys = new PageListImpl<Activity>();
+	    if(Strings.isNullOrEmpty(userId)){
+            hsql = " from Activity order by available desc,createTime desc";
+            activitys.setRecords(find(hsql, hints));
+            activitys.setRecordTotal(findCount(" select count(*) " + hsql));
+        }else {
+	        hsql = " from Activity a inner join a.activityReg r where r.user.id = ? order by a.createTime desc";
+            activitys.setRecords(find("select a " + hsql, hints,userId));
+            activitys.setRecordTotal(findCount(" select count(*) " + hsql, userId));
+        }
+        return activitys;
+    }
 }

src/main/java/com/qiankun/service/ActivityService.java

@@ -121,4 +121,8 @@ public class ActivityService {
         }
         return rt;
     }
+
+    public IPageList<Activity> findPageList(String userId, Hints hints) {
+	    return activityDao.findPageList(userId,hints);
+    }
 }