Browse Source

后台热点管理的更新

Signed-off-by: you.chen <you.chen@cloudcross.com>
you.chen 9 years ago
parent
commit
fea9c24679

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

@@ -18,6 +18,10 @@
 		  
 		  
 	</select>
 	</select>
 	
 	
+	<select id="findAllPlace" resultType="String">
+	select name from t_place_operator where place_id != 0
+	</select>
+	
 	<select id="findPlace" parameterType="long" resultType="map">
 	<select id="findPlace" parameterType="long" resultType="map">
 		select o.place_id,p.name from t_place_operator o, t_place p where o.place_id = p.id and o.operator_id = #{operatorId}
 		select o.place_id,p.name from t_place_operator o, t_place p where o.place_id = p.id and o.operator_id = #{operatorId}
 	</select>
 	</select>

+ 6 - 0
src/main/java/com/cloudcross/ssp/service/IPlaceOperatorService.java

@@ -26,6 +26,12 @@ public interface IPlaceOperatorService extends IGenericService<PlaceOperator> {
 	 */
 	 */
 	List<String> findPlaceByOperator(Long OperatorId);
 	List<String> findPlaceByOperator(Long OperatorId);
 	
 	
+	/**
+	 * 查找所有的场景
+	 * @return
+	 */
+	List<String> findAllPlace();
+	
 	/**
 	/**
 	 * 查找该运营商定义的场景所对应的所有的云联定义的场景
 	 * 查找该运营商定义的场景所对应的所有的云联定义的场景
 	 * @param OperatorId
 	 * @param OperatorId

+ 5 - 0
src/main/java/com/cloudcross/ssp/service/impl/PlaceOperatorService.java

@@ -120,4 +120,9 @@ public class PlaceOperatorService implements IPlaceOperatorService{
 		return myBatisDao.getList("placeOperatorSqlMapper.queryPlaceNameByCondition", condition);
 		return myBatisDao.getList("placeOperatorSqlMapper.queryPlaceNameByCondition", condition);
 	}
 	}
 
 
+	@Override
+	public List<String> findAllPlace() {
+		return myBatisDao.getList("placeOperatorSqlMapper.findAllPlace");
+	}
+
 }
 }

+ 2 - 12
src/main/java/com/cloudcross/ssp/web/back/main/ap/ApmacController.java

@@ -261,22 +261,12 @@ public class ApmacController extends SimpleController {
 	
 	
 	/**
 	/**
 	 * 查找所有的场景
 	 * 查找所有的场景
-	 * 这里必须传递一个运营商id,因为是搜索某一个运营商下的场景
 	 * @return
 	 * @return
 	 */
 	 */
 	@RequestMapping("/place")
 	@RequestMapping("/place")
 	public @ResponseBody
 	public @ResponseBody
-	Map<String, List<String>> findPlaceDefinedByOperator(@RequestParam Long operatorId) {
-		if(null == operatorId) {
-			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>> findPlaceDefinedByOperator() {
+		List<String> placeList = placeOperatorService.findAllPlace();
 		Map<String, List<String>> map = new HashMap<String, List<String>>();
 		Map<String, List<String>> map = new HashMap<String, List<String>>();
 		map.put("place", placeList);
 		map.put("place", placeList);
 		return map;
 		return map;

+ 1 - 1
src/main/webapp/assets/js/back/apApmacForDownList.js

@@ -105,7 +105,7 @@ $(document).ready(function() {
 			$("#place").val("");
 			$("#place").val("");
 		}
 		}
 		$("#placeul_span").on("click",function(){
 		$("#placeul_span").on("click",function(){
-			initSelectUlData("placeul_son_ul","场景",ctx+"/back/main/ap/apmac/place?operatorId=" + $("#selectedOperatorId").val(),$("#selectedOperatorId").val(),"placeul_box","place");
+			initSelectUlData("placeul_son_ul","场景",ctx+"/back/main/ap/apmac/place",1,"placeul_box","place");
 		});
 		});
 		$("ul#placeul_son_ul li").live("click",function(){
 		$("ul#placeul_son_ul li").live("click",function(){
 	 		$("#placeul_span").text($(this).text());
 	 		$("#placeul_span").text($(this).text());