热点管理中分页新增和用户定义页面的分页是每页30条

Signed-off-by: you.chen <you.chen@cloudcross.com>

src/main/java/com/cloudcross/ssp/common/utils/Pager1.java

@@ -0,0 +1,71 @@
+package com.cloudcross.ssp.common.utils;
+
+/**
+ * 这里设置的每页是30个
+ * @author chenyou
+ */
+public class Pager1 {
+	private int page = 1; // 当前页
+	private int pageSize = 30; // 每页多少行
+	private int offset;// 当前页起始行
+	private int limit = pageSize;// 往后取多少条
+	private int totalRow; // 共多少行
+	private int totalPage; // 共多少页
+
+	public int getPage() {
+		return page;
+	}
+
+	public void setPage(int page) {
+		if (page < 1) {
+			page = 1;
+		} else {
+			offset = pageSize * (page - 1);
+		}
+		this.page = page;
+	}
+	
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+		this.limit = pageSize;
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	public int getOffset() {
+		return offset;
+	}
+	
+	public int getLimit() {
+		return limit;
+	}
+
+	public void setTotalRow(int totalRow) {
+		this.totalRow = totalRow;
+		
+		totalPage = (totalRow + pageSize - 1) / pageSize;
+		if (totalPage < page) {
+			page = totalPage;
+			offset = totalPage == 0 ? 0 : pageSize * (page - 1);
+		}
+		
+	}
+	
+	public int getTotalRow() {
+		return totalRow;
+	}
+
+	public int getTotalPage() {
+		return this.totalPage;
+	}
+
+	@Override
+	public String toString() {
+		return "Pager [page=" + page + ", pageSize=" + pageSize + ", offset="
+				+ offset + ", limit=" + limit + ", totalRow=" + totalRow
+				+ ", totalPage=" + totalPage + "]";
+	}
+
+}

src/main/java/com/cloudcross/ssp/model/mapper/place.sql.xml

@@ -45,8 +45,15 @@
 	<select id="findUnclassfiedPlace" resultType="Place">
 	select <include refid="base_column"/> from t_place
 	where id not in(select place_id from t_place_class)
+	limit #{pager.offset}, #{pager.limit}
 	</select>
 	
+	<select id="countUnclassfiedPlace" resultType="int">
+		select count(id) from t_place
+		where id not in(select place_id from t_place_class)
+	</select>
+	
+	
 	<select id="findPlaceByPlaceClassId" parameterType="long" resultType="Place">
 		select t_place.id as id, t_place.name as name from t_place
 		where id in (select place_id from t_place_class where class_id = #{placeClassId})

src/main/java/com/cloudcross/ssp/service/IPlaceService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.cloudcross.ssp.model.Place;
 import com.cloudcross.ssp.base.service.IGenericService;
+import com.cloudcross.ssp.common.utils.Pager1;
 
 public interface IPlaceService extends IGenericService<Place> {
 
@@ -14,7 +15,13 @@ public interface IPlaceService extends IGenericService<Place> {
 	 * 查找未分类的数聚子场景
 	 * @return
 	 */
-	List<Place> findUnclassfiedPlace();
+	List<Place> findUnclassfiedPlace(Pager1 pager);
+	
+	/**
+	 * 查找未分类子场景个数
+	 * @return
+	 */
+	int countUnclassfiedPlace();
 	
 	/**
 	 * 根据数聚场景id得到对应的数聚子场景
@@ -22,4 +29,6 @@ public interface IPlaceService extends IGenericService<Place> {
 	 * @return
 	 */
 	List<Place> findPlaceByPlaceClassId(Long placeClassId);
+	
+	
 }

src/main/java/com/cloudcross/ssp/service/impl/PlaceService.java

@@ -10,6 +10,7 @@ import com.cloudcross.ssp.model.Place;
 import com.cloudcross.ssp.service.IPlaceService;
 import com.cloudcross.ssp.base.dao.GenericIBatisDao;
 import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.common.utils.Pager1;
 
 @Service
 public class PlaceService implements IPlaceService {
@@ -58,13 +59,17 @@ public class PlaceService implements IPlaceService {
 		return ibatisDao.getList("placeSqlMapper.findAll");
 	}
 	@Override
-	public List<Place> findUnclassfiedPlace() {
-		return ibatisDao.getList("placeSqlMapper.findUnclassfiedPlace");
+	public List<Place> findUnclassfiedPlace(Pager1 pager) {
+		return ibatisDao.getList("placeSqlMapper.findUnclassfiedPlace", pager);
 	}
 	@Override
 	public List<Place> findPlaceByPlaceClassId(Long placeClassId) {
 		return ibatisDao.getList("placeSqlMapper.findPlaceByPlaceClassId", placeClassId);
 	}
+	@Override
+	public int countUnclassfiedPlace() {
+		return ibatisDao.get("placeSqlMapper.countUnclassfiedPlace", null);
+	}
 
 
 }

src/main/java/com/cloudcross/ssp/web/back/main/ap/ApmacController.java

@@ -18,6 +18,7 @@ import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -108,7 +109,8 @@ public class ApmacController extends SimpleController {
 			cn = String.valueOf(paramMap.get("cn"));
 		} 
 		
-		if(null != paramMap.get("cnCity") && !"".equals(paramMap.get("cnCity"))) {
+		if(!StringUtils.hasLength((String)paramMap.get("cnCity"))) {
+			
 			cnCity = String.valueOf(paramMap.get("cnCity"));
 		}
 		
@@ -137,7 +139,7 @@ public class ApmacController extends SimpleController {
 		List<Wifi> wifiList = wifiService.findByParamsBack(paramMap, pager);
 		
 		//如果下拉框传的是默认值，则回传一个对应的值给前端
-		if(null == operatorId ||-1 == operatorId) {
+		if(null == operatorId || -1 == operatorId) {
 			operatorName = "全部媒体";
 		} else {
 			operatorName = operatorService.findById(operatorId).getCompanyName();
@@ -285,10 +287,12 @@ public class ApmacController extends SimpleController {
 			System.out.println("传递的参数为空");
 			return (new ArrayList<PlaceClassInformation>());
 		}
+		
 		//-1查询所有
 		if(operatorId == -1){
 			operatorId = null;
 		}
+		
 		List<PlaceClassInformation> placeClassNameList = placeClassInformationService.findPlaceClassByOperatorId(operatorId);
 		return placeClassNameList;
 	}

src/main/java/com/cloudcross/ssp/web/back/main/ap/PlaceController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.common.utils.Pager1;
 import com.cloudcross.ssp.common.utils.SqlHelper;
 import com.cloudcross.ssp.model.Place;
 import com.cloudcross.ssp.model.PlaceClass;
@@ -49,9 +50,18 @@ public class PlaceController extends SimpleController {
 	 * @return
 	 */
 	@RequestMapping("/unclassfiedPlaceName")
-	public String unclassfiedPlaceName(Model model) {
+	public String unclassfiedPlaceName(Model model,@RequestParam(defaultValue = "1") int page) {
+		int totalRow = 0;
+		Pager1 pager = null;
+		pager = new Pager1();
+		//查询符合条件的总的条数
+		totalRow = placeService.countUnclassfiedPlace();
+		pager.setPage(page);
+		pager.setTotalRow(totalRow);
+		
 		//待分类数聚子场景
-		List<Place> placeList = placeService.findUnclassfiedPlace();
+		List<Place> placeList = placeService.findUnclassfiedPlace(pager);
+		
 		
 		//查找所有的数聚场景
 		List<PlaceClassInformation> placeClassInformationList = placeClassInformationService.findAll();
@@ -157,14 +167,14 @@ public class PlaceController extends SimpleController {
 		}
 
 		int totalRow = 0;
-		Pager pager = null;
-		pager = new Pager();
+		Pager1 pager1 = null;
+		pager1 = new Pager1();
 		// 查询符合条件的总的条数
 		totalRow = placeOperatorService.countUnclassfiedPlace(paramMap);
-		pager.setPage(page);
-		pager.setTotalRow(totalRow);
+		pager1.setPage(page);
+		pager1.setTotalRow(totalRow);
 		
-		paramMap.put("pager", pager);
+		paramMap.put("pager", pager1);
 		List<PlaceOperator> placeOperatorList = placeOperatorService.findUnclassfiedPlace(paramMap);
 		
 		//将传递过来的搜索参数回传