媒体分组

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

@@ -331,18 +331,14 @@
 	<select id="queryWifiGroupCount" parameterType="java.util.Map" resultType="java.lang.Integer">
 		SELECT count(wifi.id) FROM t_wifi wifi,t_wifi_group wg,t_wifi_group_info wgi
 		WHERE wg.wifi_id = wifi.id AND wg.group_id = wgi.id 
-		<if test="operatorId != null">
-		and wifi.operator_id = #{operatorId}
-		</if>
+		and wifi.operator_id = #{operatorId} and wgi.name = #{name}
 		<if test="apmac != null">
 		and wifi.apmac = #{apmac}
 		</if>
-		<if test="name != null">
-		and wgi.name = #{name}
-		</if>
+		
 	</select>
 	
-	<select id="queryWifiGroup" parameterType="java.util.Map" resultType="com.cloudcross.ssp.model.pojo.WifiPojo">
+	<select id="queryWifiGroup" parameterType="java.util.Map" resultType="com.cloudcross.ssp.model.Wifi">
 		SELECT
 			wifi.id id,
 			wifi.operator_id operatorId,
@@ -363,15 +359,11 @@
 		WHERE
 			wg.wifi_id = wifi.id
 		AND wg.group_id = wgi.id
-		<if test="operatorId != null">
 		and wifi.operator_id = #{operatorId}
-		</if>
+		and wgi.name = #{name}
 		<if test="apmac != null">
 		and wifi.apmac = #{apmac}
 		</if>
-		<if test="name != null">
-		and wgi.name = #{name}
-		</if>
 	</select>
 	
 	<select id="queryWifiByCondition" parameterType="java.util.Map" resultType="com.cloudcross.ssp.model.Wifi">
@@ -403,6 +395,7 @@
 			<if test="cnCity != null">
 				and loc.cn_city = #{cnCity}
 			</if>
+			limit #{pager.offset}, #{pager.limit}
 	</select>
 	
 	<select id="queryWifiCountByCondition" parameterType="java.util.Map" resultType="java.lang.Integer">

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

@@ -37,8 +37,12 @@
 	</insert>
 	
 	<!-- operatorId查询分组信息 -->
-	<select id="queryGroupNames" resultType="com.cloudcross.ssp.model.WifiGroupInfo">
-		select id,name from t_wifi_group_info where status != -1 and operator_id = #{operatorId}
+	<select id="queryGroupNames" resultType="com.cloudcross.ssp.model.WifiGroupInfo" parameterType="java.util.Map">
+		select <include refid="column"/> from t_wifi_group_info where status != -1 and operator_id = #{operatorId} limit #{pager.offset}, #{pager.limit}
+	</select>
+	
+	<select id="queryGroupNamesCount" resultType="java.lang.Integer" parameterType="java.util.Map">
+		select count(id) from t_wifi_group_info where status != -1 and operator_id = #{operatorId}
 	</select>
 	
 	<select id="queryWifiGroupInfoByCondition" parameterType="java.util.Map" resultType="com.cloudcross.ssp.model.WifiGroupInfo">

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.cloudcross.ssp.base.service.IGenericService;
+import com.cloudcross.ssp.common.utils.Pager1;
 import com.cloudcross.ssp.model.WifiGroupInfo;
 
 /**
@@ -21,4 +22,6 @@ import com.cloudcross.ssp.model.WifiGroupInfo;
 public interface IWifiGroupInfoService extends IGenericService<WifiGroupInfo>{
 	public List<WifiGroupInfo> queryWifiGroupInfoByCondition(Map<String,Object>condition);
 	public List<WifiGroupInfo> queryWifiGroupInfoByadgroupId(Long adgroupId);
+	public List<WifiGroupInfo> queryWifiGroupInfoByCondition(Map<String,Object>condition,Pager1 pager);
+	public Integer queryWifiGroupInfoCountByCondition(Map<String,Object>condition);
 }

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

@@ -30,7 +30,7 @@ public interface IWifiService extends IGenericService<Wifi> {
 	public List<WifiPojo> queryWifiGroupByCondition(Map<String, Object> paramMap, Pager pager);
 	
 	public int queryWifiCountByCondition(Map<String,Object>condition);
-	public List<WifiPojo> queryWifiByCondition(Map<String,Object>condition,Pager pager);
+	public List<Wifi> queryWifiByCondition(Map<String,Object>condition,Pager pager);
 	
 	
 	public int findWifiCountByCondition(Map<String,Object>condition);

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

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 
 import com.cloudcross.ssp.base.dao.GenericIBatisDao;
 import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.common.utils.Pager1;
 import com.cloudcross.ssp.model.WifiGroupInfo;
 import com.cloudcross.ssp.service.IWifiGroupInfoService;
 /**
@@ -36,12 +37,13 @@ public class WifiGroupInfoService implements IWifiGroupInfoService{
 
 	@Override
 	public int countByParams(Map<String, Object> paramMap) {
-		// TODO Auto-generated method stub
-		return 0;
+		/***********************************************/
+		return myBatisDao.get("wifiGroupInfoSqlMapper.queryGroupNamesCount",paramMap);
 	}
 
 	@Override
 	public List<WifiGroupInfo> findByParams(Map<String, Object> paramMap,Pager pager) {
+		/***********************************************/
 		return myBatisDao.getList("wifiGroupInfoSqlMapper.queryGroupNames",paramMap);
 	}
 
@@ -71,4 +73,15 @@ public class WifiGroupInfoService implements IWifiGroupInfoService{
 	public List<WifiGroupInfo> queryWifiGroupInfoByadgroupId(Long adgroupId){
 		return myBatisDao.getList("wifiGroupInfoSqlMapper.queryWifiGroupInfoByadgroupId",adgroupId);
 	}
+
+	@Override
+	public List<WifiGroupInfo> queryWifiGroupInfoByCondition(Map<String,Object> condition, Pager1 pager) {
+		condition.put("pager", pager);
+		return myBatisDao.getList("wifiGroupInfoSqlMapper.queryGroupNames",condition);
+	}
+
+	@Override
+	public Integer queryWifiGroupInfoCountByCondition(Map<String, Object> condition) {
+		return myBatisDao.get("wifiGroupInfoSqlMapper.queryGroupNamesCount",condition);
+	}
 }

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

@@ -251,7 +251,7 @@ public class WifiService implements IWifiService{
 		return myBatisDao.get("wifiSqlMapper.queryWifiGroupCount", condition);
 	}
 	@Override
-	public List<WifiPojo> queryWifiByCondition(Map<String, Object> condition,Pager pager) {
+	public List<Wifi> queryWifiByCondition(Map<String, Object> condition,Pager pager) {
 		condition.put("pager", pager);
 		return myBatisDao.getList("wifiSqlMapper.queryWifiGroup", condition);
 	}

src/main/java/com/cloudcross/ssp/web/operator/main/ap/ApgroupController.java

@@ -81,33 +81,62 @@ public class ApgroupController extends SimpleController{
 		return page("list");
 	}
 	
-	/**
+	/**！！！！！！！！！！！！！！create页面的所有数据加载都用这个方法
 	 * 到创建分组页
 	 * create：(这里用一句话描述这个方法的作用)
 	 * (这里描述这个方法适用条件 – 可选)
 	 * 创建人：zhoujun
 	 * 修改人：zhoujun
 	 * @param model
+	 * @param name  分组名
+	 * @param apmac mac地址
 	 * @return
 	 *String
 	 * @exception
 	 * @since  1.0.0
 	 */
 	@RequestMapping("/create")
-	public String create(Model model,@RequestParam(defaultValue = "1") int page,
+	public String create(Model model,String name,String apmac,
+			@RequestParam(defaultValue = "1") int page,
 			@RequestParam(defaultValue = "1") int page1){
-		//分页显示所有的分组名
+		//分页显示所有的分组名(30一页)
 		Map<String,Object> condition = new HashMap<String,Object>();
 		condition.put("operatorId", getLoginUser().getOperatorId());
-		Pager pager = new Pager();
-		pager.setPage(page);
-		pager.setTotalRow(10);
-		List<WifiGroupInfo> listGroupName = this.wifiGroupInfoService.findByParams(condition, null);
-		//默认设置热点列表为空   v30
+		int countGroupName = this.wifiGroupInfoService.queryWifiGroupInfoCountByCondition(condition);
 		Pager1 pager1 = new Pager1();
 		pager1.setPage(page1);
-		pager1.setTotalRow(30);
-		List<WifiPojo> wifiList = new ArrayList<WifiPojo>();
+		pager1.setTotalRow(countGroupName);
+		List<WifiGroupInfo> listGroupName = this.wifiGroupInfoService.queryWifiGroupInfoByCondition(condition, pager1);
+		
+		//分页显示热点
+		Pager pager =null;
+		Integer wificount = 0;
+		List<Wifi> wifiList = null;
+		
+		//首次进入页面时，name和apmac没有值
+		if(null == name || "".equals(name)){
+			pager = new Pager();
+			pager.setPage(page);
+			pager.setTotalRow(10);
+			wifiList = new ArrayList<Wifi>();
+		}else{
+			Long operatorId = getLoginUser().getOperatorId();
+			Map<String,Object> map = new HashMap<String,Object>();
+			map.put("operatorId", operatorId);
+			//按分组名查询热点分页显示
+			map.put("name", name);
+			//apmac一定是某个分组下的热点的apmac
+			//apmac为空表示点击分组名查询热点，apmac不为空表示在分组下根据apmac查询
+			if(null !=apmac && !"".equals(apmac)){
+				map.put("apmac", apmac);
+			}
+			wificount = wifiService.queryWifiCountByCondition(map);
+			pager.setPage(page);
+			pager.setTotalRow(wificount);
+			map.put("pager", pager);
+			wifiList = wifiService.queryWifiByCondition(map,pager);
+		}
+		
 		model.addAttribute("pager",pager);
 		model.addAttribute("listGroupName", listGroupName);
 		model.addAttribute("pager1",pager1);
@@ -130,7 +159,7 @@ public class ApgroupController extends SimpleController{
 	 * @exception
 	 * @since  1.0.0
 	 */
-	@RequestMapping("/wifidetail")
+	/*@RequestMapping("/wifidetail")
 	public List<WifiPojo> queryWifiByCondition(@RequestParam(defaultValue="1")int page,String apgroupId,String apmac){
 		List<WifiPojo> wifiList = null;
 		Map<String,Object>condition = new HashMap<String,Object>();
@@ -144,9 +173,9 @@ public class ApgroupController extends SimpleController{
 		int totalRow = wifiService.queryWifiCountByCondition(condition);
 		pager.setPage(page);
 		pager.setTotalRow(totalRow);
-		wifiList = wifiService.queryWifiByCondition(condition,pager);
+		wifiList = null;//wifiService.queryWifiByCondition(condition,pager);
 		return wifiList;
-	}
+	}*/
 	
 	/**
 	 *创建分组页添加分组
@@ -208,7 +237,7 @@ public class ApgroupController extends SimpleController{
 	 * @exception
 	 * @since  1.0.0
 	 */
-	@RequestMapping("/queryGroupName")
+	/*@RequestMapping("/queryGroupName")
 	@ResponseBody
 	public String queryWifiGroupInfoNames(Model model,@RequestParam(defaultValue = "1") int page){
 		Map<String,Object> condition = new HashMap<String,Object>();
@@ -220,7 +249,7 @@ public class ApgroupController extends SimpleController{
 		pager1.setTotalRow(30);
 		model.addAttribute("pager",pager1);
 		return page("create");
-	}
+	}*/
 	
 	@RequestMapping("/edit")
 	public String list(Model model, @RequestParam HashMap<String, Object> paramMap,