Browse Source

媒体自用分组前端

ying.rong 9 years ago
parent
commit
2923edefc3

+ 29 - 3
src/main/java/com/cloudcross/ssp/web/operator/main/ap/ApgroupController.java

@@ -1,5 +1,6 @@
 package com.cloudcross.ssp.web.operator.main.ap;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -15,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.Account;
 import com.cloudcross.ssp.model.Wifi;
@@ -92,7 +94,24 @@ public class ApgroupController extends SimpleController{
 	 * @since  1.0.0
 	 */
 	@RequestMapping("/create")
-	public String create(Model model){
+	public String create(Model model,@RequestParam(defaultValue = "1") int page,
+			@RequestParam(defaultValue = "1") int page1){
+		//分页显示所有的分组名
+		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
+		Pager1 pager1 = new Pager1();
+		pager1.setPage(page1);
+		pager1.setTotalRow(30);
+		List<WifiPojo> wifiList = new ArrayList<WifiPojo>();
+		model.addAttribute("pager",pager);
+		model.addAttribute("listGroupName", listGroupName);
+		model.addAttribute("pager1",pager1);
+		model.addAttribute("wifiList",wifiList);
 		model.addAttribute("operatorId", getLoginUser().getOperatorId());
 		return page("create");
 	}
@@ -153,6 +172,7 @@ public class ApgroupController extends SimpleController{
 			wifiGroupInfo.setName(name);
 			wifiGroupInfo.setStatus(0);//开启
 			wifiGroupInfo.setUpdated(new Date());
+			wifiGroupInfo.setOperatorId(getLoginUser().getOperatorId());
 			this.wifiGroupInfoService.add(wifiGroupInfo);
 			result = "添加成功";
 		}
@@ -165,6 +185,7 @@ public class ApgroupController extends SimpleController{
 	 * @return
 	 */
 	@RequestMapping("/isExist")
+	@ResponseBody
 	public Boolean isGroupNameExist(String name){
 		Boolean flag = false;
 		Map<String,Object>condition = new HashMap<String,Object>();
@@ -189,14 +210,19 @@ public class ApgroupController extends SimpleController{
 	 */
 	@RequestMapping("/queryGroupName")
 	@ResponseBody
-	public void queryWifiGroupInfoNames(Model model){
+	public String queryWifiGroupInfoNames(Model model,@RequestParam(defaultValue = "1") int page){
 		Map<String,Object> condition = new HashMap<String,Object>();
 		condition.put("operatorId", getLoginUser().getOperatorId());
 		List<WifiGroupInfo> listGroupName = this.wifiGroupInfoService.findByParams(condition, null);
 		model.addAttribute("listGroupName", listGroupName);
+		Pager1 pager1 = new Pager1();
+		pager1.setPage(page);
+		pager1.setTotalRow(30);
+		model.addAttribute("pager",pager1);
+		return page("create");
 	}
 	
-	@RequestMapping("/update")
+	@RequestMapping("/edit")
 	public String list(Model model, @RequestParam HashMap<String, Object> paramMap,
 			@RequestParam(defaultValue = "1") int page) {
 		

+ 91 - 70
src/main/webapp/WEB-INF/pages/operator/main/ap/apgroup/create.ftl

@@ -1,80 +1,101 @@
 <@override name="head">
-	<title>创建自用分组管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ap-apmac.js"></script>
-	
-	<script type="text/javascript">
-	$(function(){
-		$("#name_add").click(function(){
-			var name = $("#name").val();
-			$.ajax({
-				type:"post",
-				url:"${ctx}/operator/main/ap/apgroup/addGroupName",
-				data:{name:name},
-				success:function(data){
-					if("ture".equals(data)){
-						queryGroupName();
-					}
-				}
-			})
-		});
-	})
-	function queryGroupName(){
-		$.ajax({
-			type:"post",
-			url:"${ctx}/operator/main/ap/apgroup/queryGroupName",
-			data:{},
-			success:function(data){
-				alert(data);
-			}
-		})
-	}
-</script>
+<title>新增自用分组</title>
+<link rel="stylesheet" href="${ctx}/assets/css/apmacManager.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/operator/apApgroup.js"></script>
 </@override>
-
 <@override name="body">
+<!-- PAGE CONTENT BEGINS HERE -->
 <div id=content_bg>
 	<#include "/operator/main/public-head.ftl">
-    <div id= "pagecontent">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/operator/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2">分组分类</li>
-			</ul>  
-		</div>
+    <div id="pagecontent">
 		<div id="content">
-			
-			<div id="groupNames">
-				<div>
-					<input type="text" name="name" id="name">
-					<input type="button" value="提交" id="name_add">
-				</div>
-				<div>
-				<#if listGroupName ??>
-					<#list listGroupName as groupName>
-						<table border="1">
-							<tr>
-							<td>${groupName.name}</td>
-							<td>${groupName.id}</td>
-							</tr>
+			<div id="selectBar_apmac" class="selectBar">
+				<a href="${ctx}/operator/main/ap/apmac/list">热点详情</a>
+				<a href="${ctx}/operator/main/ap/apmac/relationship">场景对应关系</a>
+				<a class="selectBar_change" href="${ctx}/operator/main/ap/apgroup/create">新增自用分组</a>
+				<a href="${ctx}/operator/main/ap/apgroup/edit">自用分组分类</a>
+		    </div>
+		    <div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">新增自用分组</li>
+				</ul>  
+ 			</div>
+ 			<div id="groupDivs">
+ 				<form id="groupForm" action="${ctx}/operator/main/ap/apgroup/queryGroupName" method="post">
+		 			<div class="group_left">
+		 				<input type="hidden" id="page" name="page" value="${pager.page}"/>
+			 			<div class="input-group">
+							<input class="input-text" id="createApgroup" type="text" value="请填写新增分组名称"/>
+							<a id="btn-createApgroup" class="btn3" type="button">提交</a>
+						</div>
+						<div class="chooseDiv" id="createApgroupDivs">
+							<#if listGroupName ??>
+							<#list listGroupName as groupName>
+							<div class="single_chooseDiv">
+								<label value="${groupName.id!}">${groupName.name!}</label><img src="${ctx}/assets/images/cross.png"/>
+							</div>
+							</#list>
+							</#if>
+						</div>
+						<div class="groupPage">
+							<#include "/common/pagination/simple.ftl"/>
+						</div>
+					</div>
+					<div class="group_right">
+						<input type="hidden" id="page1" name="page1" value="${pager1.page}"/>
+						<label class="group_label">当前分组名称:</label>
+						<div class="input-group">
+							<label class="input-label">分组MAC地址信息:</label>
+							<input class="input-text" id="selectMac" type="text" value="请填写MAC地址"/>
+							<a id="btn-selectMac" class="btn3" type="button">提交</a>
+						</div>
+						<table border="1" class="tableFig">
+						    <thead>
+						    	<tr class="theadTr">
+							    	<th class="theadTh" style="width:3%;"><div class="checkboxStyleTh"></div></th>
+									<th class="theadTh" style="width:3%;">ID</th>
+									<th class="theadTh" style="width:7%;">热点名称</th>
+									<th class="theadTh" style="width:5%;">SSID</th>
+									<th class="theadTh" style="width:3%;">省</th>
+									<th class="theadTh" style="width:3%;">市</th>
+									<th class="theadTh" style="width:10%;">详细地址</th>
+									<th class="theadTh" style="width:3%;">经度</th>
+									<th class="theadTh" style="width:3%;">纬度</th>
+									<th class="theadTh" style="width:8%;">apmac</th>
+						    	</tr>
+							</thead>
+							<tbody>
+								<#if wifiList ??>
+								<#list wifiList as wifi>
+								<tr id="tbodyTr">
+									<td class="tbodyTd"><div class="checkboxStyleTd" id="${wifi.id!}"></div></td>
+									<td class="tbodyTd">${wifi.id!}</td>
+									<td class="tbodyTd">${wifi.name!}</td>
+									<td class="tbodyTd">${wifi.SSID!}</td>
+									<td class="tbodyTd">${wifi.cn!}</td>
+									<td class="tbodyTd">${wifi.cnCity!}</td>
+									<td class="tbodyTd">${wifi.address!}</td>
+									<td class="tbodyTd">${wifi.longitude!}</td>
+									<td class="tbodyTd">${wifi.latitude!}</td>
+									<td class="tbodyTd">${wifi.apmac!}</td>
+								</tr>
+								</#list>
+								</#if>
+							</tbody>
 						</table>
-					</#list>
-				</#if>
-				</div>
-			</div>
-				
-			<div id="hotDetails">
-				
+						<div id="group_btnDiv">
+							<a id="btn-deleteMac" class="btn3" type="button">删除</a>
+						</div>
+						<div class="groupPage">
+							<#include "/common/pagination/simple.ftl"/>
+						</div>
+					</div>
+				</from>
 			</div>
 		</div>
 	</div>

+ 83 - 0
src/main/webapp/WEB-INF/pages/operator/main/ap/apgroup/create1.ftl

@@ -0,0 +1,83 @@
+<@override name="head">
+	<title>创建自用分组管理</title>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
+	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ap-apmac.js"></script>
+	
+	<script type="text/javascript">
+	$(function(){
+		$("#name_add").click(function(){
+			var name = $("#name").val();
+			$.ajax({
+				type:"post",
+				url:"${ctx}/operator/main/ap/apgroup/addGroupName",
+				data:{name:name},
+				success:function(data){
+					if("ture".equals(data)){
+						queryGroupName();
+					}
+				}
+			})
+		});
+	})
+	function queryGroupName(){
+		$.ajax({
+			type:"post",
+			url:"${ctx}/operator/main/ap/apgroup/queryGroupName",
+			data:{},
+			success:function(data){
+				alert(data);
+			}
+		})
+	}
+</script>
+</@override>
+
+<@override name="body">
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id= "pagecontent">
+		<div id="handler">
+			<ul>
+				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/operator/main/dashboard">首页</a>
+				<span class="divider1"><i class="icon-angle-right"></i></span></li>
+				<li class="size2">分组分类</li>
+			</ul>  
+		</div>
+		<div id="content">
+			
+			<div id="groupNames">
+				<div>
+					<input type="text" name="name" id="name">
+					<input type="button" value="提交" id="name_add">
+				</div>
+				<div>
+				<#if listGroupName ??>
+					<#list listGroupName as groupName>
+						<table border="1">
+							<tr>
+							<td>${groupName.name}</td>
+							<td>${groupName.id}</td>
+							</tr>
+						</table>
+					</#list>
+				</#if>
+				</div>
+			</div>
+				
+			<div id="hotDetails">
+				
+			</div>
+		</div>
+	</div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

+ 128 - 138
src/main/webapp/WEB-INF/pages/operator/main/ap/apgroup/edit.ftl

@@ -1,148 +1,138 @@
 <@override name="head">
-	<title>热点管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/js/ap-apmac.js"></script>
-	
-	<script type="text/javascript" >
-		$(function(){
-	
-			//复选框按钮
-			$('.tablefig th input:checkbox').live("click", function() {
-				var that = this;
-				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
-					this.checked = that.checked;
-				});
-			});
-
-			//提交
-			$("#all-btn-submit").click(function(){
-				var checkboxs = $("#tablefig tbody input[type='checkbox']:checked");
-				var _param = checkboxs.serialize();
-				var url = "${ctx}/operator/main/ap/apgroup/";
-				if(checkboxs.length > 0){
-					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
-						if (ensure) {	
-							$.post(url, _param, function(data) {
-								alert(111);
-							});
-						}
-					});
-				}else{
-					bootbox.alert("请选择需要"+$(this).text()+"的数据!");
-				}
-			});
-			
-			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#wifiForm');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
-		});
-		
-		
-	</script>
-	
+<title>自用分组分类</title>
+<link rel="stylesheet" href="${ctx}/assets/css/apmacManager.css"/>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/operator/apApmacForDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/operator/apApmac.js"></script>
 </@override>
-
 <@override name="body">
 <div id=content_bg>
 	<#include "/operator/main/public-head.ftl">
     <div id= "pagecontent">
-		<div id="handler">
-			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/operator/main/dashboard">首页</a>
-				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2">媒体AP列表</li>
-			</ul>  
+		<div id="contentOther">
+			<div id="selectBar_apmac" class="selectBar">
+				<a href="${ctx}/operator/main/ap/apmac/list">热点详情</a>
+				<a href="${ctx}/operator/main/ap/apmac/relationship">场景对应关系</a>
+				<a href="${ctx}/operator/main/ap/apgroup/create">新增自用分组</a>
+				<a class="selectBar_change" href="${ctx}/operator/main/ap/apgroup/edit">自用分组分类</a>
+		    </div>
+		    <div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i></li>
+					<li><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li class="navDiv_currentLi">自用分组分类</li>
+				</ul>  
+ 			</div>
+ 			<form id="myform" action="${ctx}/operator/main/ap/apgroup/edit" method="post">
+				<div id="content_choose">
+					<ul id="main_cnul">
+						<li class="select_box" id="cnul_box">
+							<span id="cnul_span">${cn!}</span>
+							<ul class="son_ul" id="cn_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="cn" id="cn" value="${cn!}"/>
+					<ul id="main_cnCityul">
+						<li class="select_box" id="cnCityul_box">
+							<span id="cnCityul_span">${cnCity!}</span>
+							<ul class="son_ul" id="cnCityul_son_ul"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="cnCity" id="cnCity" value="${cnCity!}"/>
+					<div class="input-group">
+						<input class="input-text" id="selectApmacList" name="serachValue" type="text" value="${serachValue!}"/>
+						<input id="btn_formSubmit" type="submit" value="搜索"/>
+					</div>
+				</div>
+				<table border="1" class="tableFigOther">
+				    <thead>
+				    	<tr class="theadTr">
+					    	<th class="theadTh" style="width:5%;"><div class="checkboxStyleTh"></div></th>
+							<th class="theadTh" style="width:5%;">ID</th>
+							<th class="theadTh" style="width:15%;">热点名称</th>
+							<th class="theadTh" style="width:8%;">SSID</th>
+							<th class="theadTh" style="width:8%;">省</th>
+							<th class="theadTh" style="width:8%;">市</th>
+							<th class="theadTh" style="width:15%;">详细地址</th>
+							<th class="theadTh" style="width:8%;">经度</th>
+							<th class="theadTh" style="width:8%;">纬度</th>
+							<th class="theadTh" style="width:20%;">apmac</th>
+				    	</tr>
+					</thead>
+					<tbody>
+						<#if wifiList ??>
+						<#list wifiList as wifi>
+						<tr id="tbodyTr">
+							<td class="tbodyTd"><div class="checkboxStyleTd" id="${wifi.id!}"></div></td>
+							<td class="tbodyTd">${wifi.id!}</td>
+							<td class="tbodyTd">${wifi.name!}</td>
+							<td class="tbodyTd">${wifi.SSID!}</td>
+							<td class="tbodyTd">${wifi.cn!}</td>
+							<td class="tbodyTd">${wifi.cnCity!}</td>
+							<td class="tbodyTd">${wifi.address!}</td>
+							<td class="tbodyTd">${wifi.longitude!}</td>
+							<td class="tbodyTd">${wifi.latitude!}</td>
+							<td class="tbodyTd">${wifi.apmac!}</td>
+						</tr>
+						</#list>
+						</#if>
+					</tbody>
+				</table>
+				<div id="pageDiv-other">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+				<div class="group_bottom">
+					<label class="group_label">请选择分组</label>
+					<div class="chooseDiv">
+						<div class="single_radioDiv">
+							<input type="radio" id="aa1" value="1" name="name"/><label for="aa1">bb</label>
+						</div>
+						<div class="single_radioDiv">
+							<input type="radio" id="aa2" value="2" name="name"/><label for="aa2">bb</label>
+						</div>
+						<div class="single_radioDiv">
+							<input type="radio" id="aa3" value="3" name="name"/><label for="aa3">aa</label>
+						</div>
+						<div class="single_radioDiv">
+							<input type="radio" id="aa4" value="4" name="name"/><label for="aa4">bb</label>
+						</div>
+						<div class="single_radioDiv">
+							<input type="radio" id="aa5" value="5" name="name"/><label for="aa5">aa</label>
+						</div>
+						<div class="single_radioDiv">
+							<input type="radio" id="aa6" value="6" name="name"/><label for="aa6">bb</label>
+						</div>
+						
+						<div class="single_radioDiv">
+							<input type="radio" id="aa7" value="7" name="name"/><label for="aa7">aa</label>
+						</div>
+						<div class="single_radioDiv">
+							<input type="radio" id="aa8" value="8" name="name"/><label for="aa8">bb</label>
+						</div>
+						<div class="single_radioDiv">
+							<input type="radio" id="aa9" value="9" name="name"/><label for="aa9">aa</label>
+						</div>
+						<div class="single_radioDiv">
+							<input type="radio" id="aa10" value="10" name="name"/><label for="aa10">bb</label>
+						</div>
+						<#if listGroupName ??>
+						<#list listGroupName as groupName>
+						<div class="single_radioDiv">
+							<input type="radio" name="name" id="${groupName.id!}" value="${groupName.id!}"><label for="${groupName.id!}">${groupName.name!}</label>
+						</div>
+						</#list>
+						</#if>
+					</div>
+					<div id="group_btnDiv">
+						<a id="btn-submit" class="btn3" type="button">提交</a>
+					</div>
+				</div>
+	 		</form>
 		</div>
-		<div id="content">
-			<div id="hotDetails">
-				<form id="wifiForm" action="${ctx}/operator/main/ap/apgroup/update" method="post">
-				    <input type="hidden" id="page" name="page" value="${pager.page}">
-				    <div id="selectuls">
-						<ul id="main_cnul">
-							<li class="select_box" id="cnul_box">
-								<span id="cnul_span">${cn!}</span>
-								<ul class="son_ul" id="cn_son_ul"></ul>
-							</li>
-						</ul>
-						<input type="hidden" name="cn" id="cn" value="${cn!}">
-						<ul id="main_cnCityul">
-							<li class="select_box" id="cnCityul_box">
-								<span id="cnCityul_span">${cnCity!}</span>
-								<ul class="son_ul" id="cnCityul_son_ul"></ul>
-							</li>
-						</ul>
-						<input id="apmac" type="text" name="apmac" value="请输入MAC地址">
-				  		<input id="sign" type="submit" value="查询">
-				  	</div>
-					<div id="account-table">
-						<table border="1" class="tablefig">
-							<thead>
-								<tr>
-									<th width="3%">
-										<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
-									</th>
-									<th class="td1" style="width:3%">ID</th>
-				                    <th class="td1" style="width:5%">热点名称</th>
-				                    <th class="td1" style="width:7%">SSID</th>
-				                    <th class="td1" style="width:5%">省</th>
-				                    <th class="td1" style="width:5%">市</th>
-				                    <th class="td1" style="width:9%">详细地址</th>
-				                    <th class="td1" style="width:5%">经度</th>
-				                    <th class="td1" style="width:5%">纬度</th>
-				                    <th class="td1" style="width:8%">apmac</th>
-								</tr>
-							</thead>
-							<tbody>
-							<#if wifiList ??>
-							<#list wifiList as wifi>
-								<tr class="">
-									<td class="center">
-										<label><input  autocomplete="off" type="checkbox" name="id" value="#{wifi.id!}"><span class="lbl"></span></label>
-									</td>
-									<td class="td2">${wifi.id!}</td> 
-					                <td class="td2">${wifi.name!}</td> 
-					                <td class="td2">${wifi.SSID!}</td>
-					                <td class="td2">${wifi.cn!}</td>
-					                <td class="td2">${wifi.cnCity!}</td>
-					                <td class="td2">${wifi.address!}</td>
-					                <td class="td2">${wifi.longitude!}</td>
-					                <td class="td2">${wifi.latitude!}</td>
-					                <td class="td2">${wifi.apmac!}</td>  
-								</tr>
-							</#list>
-							</#if>
-						</tbody>
-						</table>
-	
-						<div id="pageDiv">
-			               	<#include "/common/pagination/simple.ftl"/>
-			            </div>
-			            <div id="groupName">
-							请选择分组:
-							
-						</div>	
-		            </div>
-				</form>
-			</div>
-		</div>
-		
 	</div>
-	
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

+ 148 - 0
src/main/webapp/WEB-INF/pages/operator/main/ap/apgroup/edit1.ftl

@@ -0,0 +1,148 @@
+<@override name="head">
+	<title>热点管理</title>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
+	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/ap-apmac.js"></script>
+	
+	<script type="text/javascript" >
+		$(function(){
+	
+			//复选框按钮
+			$('.tablefig th input:checkbox').live("click", function() {
+				var that = this;
+				$(this).closest('table').find('tr > td:first-child input:checkbox').each(function(){
+					this.checked = that.checked;
+				});
+			});
+
+			//提交
+			$("#all-btn-submit").click(function(){
+				var checkboxs = $("#tablefig tbody input[type='checkbox']:checked");
+				var _param = checkboxs.serialize();
+				var url = "${ctx}/operator/main/ap/apgroup/";
+				if(checkboxs.length > 0){
+					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
+						if (ensure) {	
+							$.post(url, _param, function(data) {
+								alert(111);
+							});
+						}
+					});
+				}else{
+					bootbox.alert("请选择需要"+$(this).text()+"的数据!");
+				}
+			});
+			
+			
+			// 分页中超链接跳转
+			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
+				var _page = $(this).attr('href').substr(1);
+				var _form = $('#wifiForm');
+				_form.find('input:hidden[name="page"]').val(_page);
+				_form.submit();
+				return false;
+			});
+		});
+		
+		
+	</script>
+	
+</@override>
+
+<@override name="body">
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id= "pagecontent">
+		<div id="handler">
+			<ul>
+				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/operator/main/dashboard">首页</a>
+				<span class="divider1"><i class="icon-angle-right"></i></span></li>
+				<li class="size2">媒体AP列表</li>
+			</ul>  
+		</div>
+		<div id="content">
+			<div id="hotDetails">
+				<form id="wifiForm" action="${ctx}/operator/main/ap/apgroup/update" method="post">
+				    <input type="hidden" id="page" name="page" value="${pager.page}">
+				    <div id="selectuls">
+						<ul id="main_cnul">
+							<li class="select_box" id="cnul_box">
+								<span id="cnul_span">${cn!}</span>
+								<ul class="son_ul" id="cn_son_ul"></ul>
+							</li>
+						</ul>
+						<input type="hidden" name="cn" id="cn" value="${cn!}">
+						<ul id="main_cnCityul">
+							<li class="select_box" id="cnCityul_box">
+								<span id="cnCityul_span">${cnCity!}</span>
+								<ul class="son_ul" id="cnCityul_son_ul"></ul>
+							</li>
+						</ul>
+						<input id="apmac" type="text" name="apmac" value="请输入MAC地址">
+				  		<input id="sign" type="submit" value="查询">
+				  	</div>
+					<div id="account-table">
+						<table border="1" class="tablefig">
+							<thead>
+								<tr>
+									<th width="3%">
+										<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
+									</th>
+									<th class="td1" style="width:3%">ID</th>
+				                    <th class="td1" style="width:5%">热点名称</th>
+				                    <th class="td1" style="width:7%">SSID</th>
+				                    <th class="td1" style="width:5%">省</th>
+				                    <th class="td1" style="width:5%">市</th>
+				                    <th class="td1" style="width:9%">详细地址</th>
+				                    <th class="td1" style="width:5%">经度</th>
+				                    <th class="td1" style="width:5%">纬度</th>
+				                    <th class="td1" style="width:8%">apmac</th>
+								</tr>
+							</thead>
+							<tbody>
+							<#if wifiList ??>
+							<#list wifiList as wifi>
+								<tr class="">
+									<td class="center">
+										<label><input  autocomplete="off" type="checkbox" name="id" value="#{wifi.id!}"><span class="lbl"></span></label>
+									</td>
+									<td class="td2">${wifi.id!}</td> 
+					                <td class="td2">${wifi.name!}</td> 
+					                <td class="td2">${wifi.SSID!}</td>
+					                <td class="td2">${wifi.cn!}</td>
+					                <td class="td2">${wifi.cnCity!}</td>
+					                <td class="td2">${wifi.address!}</td>
+					                <td class="td2">${wifi.longitude!}</td>
+					                <td class="td2">${wifi.latitude!}</td>
+					                <td class="td2">${wifi.apmac!}</td>  
+								</tr>
+							</#list>
+							</#if>
+						</tbody>
+						</table>
+	
+						<div id="pageDiv">
+			               	<#include "/common/pagination/simple.ftl"/>
+			            </div>
+			            <div id="groupName">
+							请选择分组:
+							
+						</div>	
+		            </div>
+				</form>
+			</div>
+		</div>
+		
+	</div>
+	
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

+ 113 - 0
src/main/webapp/assets/css/apmacManager.css

@@ -0,0 +1,113 @@
+/************ CSS **************/
+/**** 热点管理-新增数据场景,自用分组 ****/
+#groupDivs{
+	clear:both;
+	padding-top:20px;
+}
+
+#groupForm{
+	display:flex;
+}
+
+#groupDivs .group_label{
+	font-size:16px;
+	font-weight: bold;
+	margin-bottom:20px;
+	display:inline-block;
+}
+
+.group_left{
+	float:left;
+	border-right: thin solid #b9c5d9;
+	width:49%;
+	padding-right:20px;
+}
+
+.group_left .input-group input.input-text,.group_right .input-group input.input-text{
+	width:200px;
+	margin-right:17px;
+}
+
+#groupDivs .input-group label.input-label{
+	width:140px;
+}
+
+.group_right{
+	float:left;
+	width:48%;
+	margin-left:20px;
+}
+
+#groupDivs #group_btnDiv{
+	float:left;
+	margin-top:20px;
+}
+
+#groupDivs .groupPage{
+	float:right;
+}
+
+.chooseDiv{
+	width:100%;
+	border:thin solid #b9c5d9;
+	border-right:none;
+	border-bottom:none;
+	display:inline-block;
+}
+#groupDivs .chooseDiv .single_chooseDiv{
+	width:19.86%;
+	border-bottom:thin solid #b9c5d9;
+	border-right:thin solid #b9c5d9;
+	float:left;
+    height: 41px;
+    line-height: 41px;
+    text-align: center;
+}
+
+.chooseDiv .single_chooseDiv img{
+	float:right;
+	margin-top:7px;
+	cursor: pointer;
+}
+
+#content_choose .input-group #btn_formSubmit{
+	margin-left:18px;
+}
+
+/****** 自用分组 ******/
+.group_bottom{
+	clear:both;
+	width:100%;
+}
+
+.group_bottom .chooseDiv{
+	margin-top:20px;
+}
+
+.group_bottom .chooseDiv .single_radioDiv{
+	float:left;
+	width: 9.93%;
+    height: 41px;
+    line-height: 41px;
+    text-align: center;
+    border-bottom:thin solid #b9c5d9;
+	border-right:thin solid #b9c5d9;
+}
+
+.group_bottom .chooseDiv .single_radioDiv input[type="radio"]{
+	display: none;
+}
+
+.group_bottom .chooseDiv .single_radioDiv input[type="radio"] + label{
+	cursor: pointer;
+}
+
+.group_bottom .chooseDiv .single_radioDiv input[type="radio"]:checked + label{
+	background-color: #4C637B;
+	color: #fff;
+}
+
+.group_bottom #group_btnDiv{
+	float:right;
+	margin: 20px -6px 0 0;
+}

+ 74 - 0
src/main/webapp/assets/js/operator/apApgroup.js

@@ -0,0 +1,74 @@
+$(document).ready(function() {
+var ctx = $("#ctx").val();//获取服务器地址
+	
+	/***************************    自用分组列表页    ***************************/
+	
+	//提交框
+	$("#createApgroup,#selectMac,#selectApmacList").focus(function(){
+		$(this).val("");
+	});
+	if($("#createApgroup").val() == ""){
+		$(this).val("请填写新增分组名称");
+	}
+	$("#createApgroup").blur(function(){
+		if($(this).val()==""){
+			$(this).val("请填写新增分组名称");
+		}
+	});
+	if($("#selectMac").val() == "" || $("#selectApmacList").val() == ""){
+		$(this).val("请填写MAC地址");
+	}
+	$("#selectMac,#selectApmacList").blur(function(){
+		if($(this).val()==""){
+			$(this).val("请填写MAC地址");
+		}
+	});
+	
+	
+	$("#btn-createApgroup").click(function(){
+		var value = $("#createApgroup").val();
+		if(value == "请填写新增分组名称" || value == ""){
+			bootbox.alert("请填写新增分组名称!");
+			return false;
+		}else{
+			$.post(ctx+"/operator/main/ap/apgroup/isExist",{name:value},function(data){
+				if(data == true){
+					bootbox.alert("新增的分组名称已存在!");
+					return false;
+				}else{
+					$.post(ctx+"/operator/main/ap/apgroup/addGroupName",{name:value},function(data){
+						$("#groupForm").submit();
+					});
+				}
+			});
+		}
+	});
+	
+	$(".single_chooseDiv img").click(function(){
+		var id = $(this).parent("div.single_chooseDiv").find("label").attr("value");
+		$.post(ctx+"/operator/main/ap/apgroup/delete",{id:id},function(data){
+			$("#groupForm").submit();
+		});
+	});
+	
+	$("#btn-selectMac").click(function(){
+		var value = $("#selectMac").val();
+		if(value == "请填写MAC地址" || value == ""){
+			bootbox.alert("请填写MAC地址!");
+			return false;
+		}else{
+			$("#groupForm").submit();
+		}
+	});
+	
+	/***************************    自用分组分类    ***************************/
+	
+	$("#btn_formSubmit").click(function(){
+		$("#groupForm").submit();
+	});
+	
+	$("#btn-submit").click(function(){
+		$("#groupForm").submit();
+	});
+	
+});