back 热点管理条件筛选

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

@@ -11,7 +11,11 @@
 	</select>
 	
 	<select id="findPlaceByOperator" parameterType="long" resultType="String">
-		select name from t_place_operator where operator_id = #{operatorId} and place_id != 0
+		select name from t_place_operator where place_id != 0
+		<if test="_parameter!=null">
+		and operator_id = #{_parameter}
+		</if>
+		  
 	</select>
 	
 	<select id="findPlace" parameterType="long" resultType="map">

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

@@ -99,6 +99,9 @@ public class ApmacController extends SimpleController {
 		 */
 		if(null != paramMap.get("selectedOperatorId") && !"".equals(paramMap.get("selectedOperatorId"))) {
 			operatorId = Long.parseLong(String.valueOf(paramMap.get("selectedOperatorId")));
+			if(operatorId == -1){
+				operatorId = null;
+			}
 		}
 		
 		if(null != paramMap.get("cn") && !"".equals(paramMap.get("cn"))) {
@@ -134,7 +137,7 @@ public class ApmacController extends SimpleController {
 		List<Wifi> wifiList = wifiService.findByParamsBack(paramMap, pager);
 		
 		//如果下拉框传的是默认值，则回传一个对应的值给前端
-		if(null == operatorId) {
+		if(null == operatorId ||-1 == placeClassId) {
 			operatorName = "全部媒体";
 		} else {
 			operatorName = operatorService.findById(operatorId).getCompanyName();
@@ -152,7 +155,7 @@ public class ApmacController extends SimpleController {
 			place = "场景";
 		}
 		
-		if(null == placeClassId) {
+		if(null == placeClassId ||-1 == placeClassId) {
 			placeClassName = "数聚场景";
 		} else {
 			placeClassName = placeClassInformationService.findById(placeClassId).getName();
@@ -257,6 +260,10 @@ public class ApmacController extends SimpleController {
 			System.out.println("xiaobao传递的参数为空");
 			return null;
 		}
+		//-1查询所有
+		if(operatorId == -1){
+			operatorId = null;
+		}
 		System.out.println("hellowatch"+operatorId);
 		List<String> placeList = placeOperatorService.findPlaceByOperator(operatorId);
 		Map<String, List<String>> map = new HashMap<String, List<String>>();
@@ -278,6 +285,10 @@ 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/webapp/assets/js/ap-apmac-back.js

@@ -169,7 +169,7 @@ $(document).ready(function() {
 	 		$('#placeIdul_son_ul').css({height:"auto",overflow:"hidden"});
 	 		$("#placeIdul_son_ul").append("<li value='-1'>数聚场景</li>");
 	 		if($("#selectedOperatorId").val() != null ){
-		 		var url = "/ssp_web/back/main/ap/apmac/placeName?operatorId=" + $("#selectedOperatorId").val();
+		 		var url = "/ssp_web/back/main/ap/apmac/placeClassName?operatorId=" + $("#selectedOperatorId").val();
 		 		$.getJSON( url, function(data){
 					var data_1 = data;
 					$.each( data_1, function( key, val ) {