Browse Source

lectureTime

Antiloveg 8 years ago
parent
commit
a584c241c7

+ 34 - 4
src/main/java/com/goafanti/common/mapper/LectureMapper.xml

@@ -207,10 +207,10 @@
 	  	 and ui.username like CONCAT('%',  #{username,jdbcType=VARCHAR}, '%')
 	  	</if>
 	  	<if test="startL != null">
-	  	 and l.lecture_time <![CDATA[ >= ]]> #{startL,jdbcType=TIMESTAPM}
+	  	 and l.lecture_time <![CDATA[ >= ]]> #{startL,jdbcType=TIMESTAMP}
 	  	</if>
 	  	<if test="endL != null">
-	  	 and l.lecture_time <![CDATA[ < ]]> #{endL,jdbcType=TIMESTAPM}
+	  	 and l.lecture_time <![CDATA[ < ]]> #{endL,jdbcType=TIMESTAMP}
 	  	</if>
 	  	order by l.lecture_time desc
 	  	<if test="page_sql!=null">
@@ -329,8 +329,38 @@
 	  	left join  user_identity ui on ui.uid = l.uid
 	  	where 
 	  		l.deleted_sign = 0
-	  	and lecture_time > now()
-	  	order by lecture_time 
+	  	order by lecture_time desc
 	  	limit 0 , 5
   </select>
+  
+  <select id="findMoreLectureListByPage" parameterType="String" resultType="com.goafanti.lecture.bo.LectureListBo">
+	  	select 
+	  		l.id,
+	  		l.uid,
+	  		l.name,
+	  		l.lecture_time as lectureTime,
+	  		l.summary,
+	  		l.lecture_url as lectureUrl,
+	  		ui.username,
+	  		l.hot,
+	  		l.dynamic,
+	  		l.end_time as endTime
+	  	from lecture l
+	  	left join  user_identity ui on ui.uid = l.uid
+	  	where 
+	  	l.deleted_sign = 0 
+	  	order by l.lecture_time desc
+	  	<if test="page_sql!=null">
+			${page_sql}
+		</if>
+  </select>
+  
+  <select id="findMoreLectureCount" parameterType="String" resultType="java.lang.Integer">
+  		select 
+	  		count(1)
+	  	from lecture l
+	  	left join  user_identity ui on ui.uid = l.uid
+	  	where 
+	  	l.deleted_sign = 0 
+  </select>
 </mapper>

+ 2 - 0
src/main/java/com/goafanti/lecture/service/LectureService.java

@@ -30,4 +30,6 @@ public interface LectureService {
 
 	List<LectureListBo> findLectureList();
 
+	Pagination<LectureListBo> loadMore(Integer pSize, Integer pNo);
+
 }

+ 14 - 0
src/main/java/com/goafanti/lecture/service/impl/LectureServiceImpl.java

@@ -128,4 +128,18 @@ public class LectureServiceImpl extends BaseMybatisDao<LectureMapper> implements
 		return lectureMapper.findLectureList();
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<LectureListBo> loadMore(Integer pageSize, Integer pageNo) {
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 2;
+		}
+
+		if (pageSize == null || pageSize < 0 || pageSize > 5) {
+			pageSize = 10;
+		}
+		return (Pagination<LectureListBo>) findPage("findMoreLectureListByPage", "findMoreLectureCount", null, pageNo,
+				pageSize);
+	}
+
 }

+ 20 - 9
src/main/java/com/goafanti/portal/controller/PortalLectureController.java

@@ -1,6 +1,6 @@
 package com.goafanti.portal.controller;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -23,25 +23,36 @@ import com.goafanti.lecture.service.LectureService;
 public class PortalLectureController extends BaseApiController {
 	@Resource
 	private LectureService lectureService;
-	
-	//@RequestMapping(value = "/portal/scienceTechnology/lecture", method = RequestMethod.GET)
-	public ModelAndView lecture(){
+
+	// @RequestMapping(value = "/portal/scienceTechnology/lecture", method =
+	// RequestMethod.GET)
+	public ModelAndView lecture() {
 		ModelAndView mv = new ModelAndView();
 		List<LectureListBo> lectureList = lectureService.findLectureList();
+		if (null != lectureList && lectureList.size() > 0) {
+			Collections.reverse(lectureList);
+		}
 		mv.addObject("lectureList", lectureList);
 		mv.setViewName("/portal/scienceTechnology/lecture");
 		return mv;
 	}
-	
+
 	/**
 	 * 查看更多
 	 */
-	@RequestMapping(value = "/portal/scienceTechnology/lecture/loadMore", method = RequestMethod.POST)
-	public Result loadMore(String pageSize, String pageNo, String id){
+	@RequestMapping(value = "/portal/scienceTechnology/lecture/loadMore", method = RequestMethod.GET)
+	public Result loadMore(String pageSize, String pageNo) {
 		Result res = new Result();
-		if (StringUtils.isNotBlank(id)){
-			List<String> ids = Arrays.asList(id.trim().split(",|,"));
+		Integer pNo = 2;
+		Integer pSize = 5;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
 		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+		res.setData(lectureService.loadMore(pSize, pNo));
 		return res;
 	}
+
 }