Merge remote-tracking branch 'origin/master'

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

@@ -119,13 +119,12 @@ public class ApgroupController extends SimpleController{
 		List<WifiGroupInfo> listGroupName = this.wifiGroupInfoService.queryWifiGroupInfoByCondition(condition, pager1);
 		
 		//分页显示热点
-		Pager pager =null;
+		Pager pager = new Pager();
 		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>();

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

@@ -38,8 +38,9 @@
 							<#if listGroupName ??>
 							<#list listGroupName as groupName>
 							<div class="single_chooseDiv">
-								<label value="${groupName.id!}">${groupName.name!}</label><img src="${ctx}/assets/images/cross.png"/>
+								<label value="${groupName.id!}">${groupName.name!}</label>
 							</div>
+							<img src="${ctx}/assets/images/cross.png" valueId="${groupName.id!}"/>
 							</#list>
 							</#if>
 						</div>

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

@@ -3,8 +3,8 @@
 <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/common/table.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/operator/apApgroup.js"></script>
 </@override>
 <@override name="body">
@@ -91,7 +91,7 @@
 						<#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>
+							<input type="radio" name="wifiGroupInfoId" id="groupName_${groupName.id!}" value="${groupName.id!}"><label for="groupName_${groupName.id!}">${groupName.name!}</label>
 						</div>
 						</#list>
 						</#if>

src/main/webapp/assets/css/apmacManager.css

@@ -69,9 +69,9 @@
 	cursor: pointer;
 }
 
-.chooseDiv .single_chooseDiv img{
-	float:right;
-	margin-top:7px;
+.chooseDiv img{
+	float:left;
+	margin:7px -28px;
 	cursor: pointer;
 	z-index:9999;
 }

src/main/webapp/assets/js/operator/apApgroup.js

@@ -45,9 +45,9 @@ var ctx = $("#ctx").val();//获取服务器地址
 		}
 	});
 	
-	$(".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){
+	$(".chooseDiv img").click(function(){
+		var id = $(this).attr("valueId");
+		$.post(ctx+"/operator/main/ap/apgroup/removeWifiFromGroupByGroupId",{id:id},function(data){
 			$("#groupForm").submit();
 			return false;
 		});
@@ -71,14 +71,47 @@ var ctx = $("#ctx").val();//获取服务器地址
 		}
 	});
 	
+	$("#btn-deleteMac").click(function(){
+		var checkboxs = $("table tbody .checkboxStyle_change");
+		var ids = [];
+		if(checkboxs.length > 0){
+			checkboxs.each(function(){
+				var id = parseInt($(this).attr("id"));
+				ids.push(id);
+			});
+		}else{
+			bootbox.alert("请选择需要删除的数据!");
+			return false;
+		}
+		$.ajax({
+			async: false, 
+			traditional: true,
+            type: "POST",
+            url: ctx+"/operator/main/ap/apgroup/removeWifiFromGroupByWifiId",
+            data:{"id":ids},
+            success: function(data){
+            	$("#groupForm").submit();
+            }
+		});
+		return false;
+	});
+	
 	// 分页中超链接跳转
-	$('#groupDivs .pagination ul li a[href]').click(function(){
+	$('.group_left .pagination ul li a[href]').click(function(){
 		var _page = $(this).attr('href').substr(1);
 		$('#groupForm').find('input:hidden[name="page1"]').val(_page);
 		$("#groupForm").submit();
 		return false;
 	});
 	
+	// 分页中超链接跳转
+	$('.group_right .pagination ul li a[href]').click(function(){
+		var _page = $(this).attr('href').substr(1);
+		$('#groupForm').find('input:hidden[name="page"]').val(_page);
+		$("#groupForm").submit();
+		return false;
+	});
+	
 	/***************************    自用分组分类    ***************************/
 	
 	$("#btn_formSubmit").click(function(){
@@ -87,7 +120,32 @@ var ctx = $("#ctx").val();//获取服务器地址
 	});
 	
 	$("#btn-submit").click(function(){
-		$("#myform").submit();
+		var checkboxs = $("table tbody .checkboxStyle_change");
+		var ids = [];
+		if(checkboxs.length > 0){
+			checkboxs.each(function(){
+				var id = parseInt($(this).attr("id"));
+				ids.push(id);
+			});
+		}else{
+			bootbox.alert("请选择表格中需要分组的数据!");
+			return false;
+		}
+		var wifiGroupInfoId = $(".group_bottom input[type='radio']:checked").val();
+		if(wifiGroupInfoId == undefined || wifiGroupInfoId == ""){
+			bootbox.alert("请选择对应的分组名!");
+			return false;
+		}
+		$.ajax({
+			async: false, 
+			traditional: true,
+            type: "POST",
+            url: ctx+"/operator/main/ap/apgroup/save",
+            data:{"id":ids,"wifiGroupInfoId":wifiGroupInfoId},
+            success: function(data){
+            	$("#myform").submit();
+            }
+		});
 		return false;
 	});