Browse Source

热点管理的更新

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

+ 1 - 5
src/main/java/com/cloudcross/ssp/model/mapper/placeclass-information.sql.xml

@@ -8,11 +8,7 @@
 	</select>
 	
 	<select id="findPlaceClassByOperatorId" parameterType="long" resultType="PlaceClassInformation">
-		select DISTINCT(i.id) as id, i.name as name from t_place_operator o, t_place_class c, t_place_class_info i
-		where o.place_id = c.place_id and c.class_id = i.id
-		<if test="_parameter!=null">
-			and o.operator_id = #{_parameter}
-		</if>
+		select id,name from t_place_class_info
 	</select>
 	
 	<select id="findAll" resultType="PlaceClassInformation">

+ 1 - 1
src/main/java/com/cloudcross/ssp/service/IPlaceClassInformationService.java

@@ -19,7 +19,7 @@ public interface IPlaceClassInformationService extends IGenericService<PlaceClas
 	 * @param operatorId
 	 * @return
 	 */
-	List<PlaceClassInformation> findPlaceClassByOperatorId(Long operatorId);
+	List<PlaceClassInformation> findPlaceClassByOperatorId();
 	
 	/**
 	 * 查找所有的数聚场景

+ 2 - 2
src/main/java/com/cloudcross/ssp/service/impl/PlaceClassInformationService.java

@@ -64,8 +64,8 @@ public class PlaceClassInformationService implements IPlaceClassInformationServi
 	}
 
 	@Override
-	public List<PlaceClassInformation> findPlaceClassByOperatorId(Long operatorId) {
-		return myBatisDao.getList("placeClassInformationSqlMapper.findPlaceClassByOperatorId", operatorId);
+	public List<PlaceClassInformation> findPlaceClassByOperatorId() {
+		return myBatisDao.getList("placeClassInformationSqlMapper.findPlaceClassByOperatorId");
 	}
 
 	@Override

+ 3 - 14
src/main/java/com/cloudcross/ssp/web/back/main/ap/ApmacController.java

@@ -285,24 +285,13 @@ public class ApmacController extends SimpleController {
 	
 
 	/**
-	 * 查找所有与该运营商下的所有的场景对应的云联定义的数聚场景
-	 * 这里必须传递一个运营商id,因为是搜索某一个运营商下的场景
+	 * 查找所有的数聚场景
 	 * @return
 	 */
 	@RequestMapping("/placeClassName")
 	public @ResponseBody
-	List<PlaceClassInformation> placeName(@RequestParam Long operatorId) {
-		if(null == operatorId) {
-			System.out.println("传递的参数为空");
-			return (new ArrayList<PlaceClassInformation>());
-		}
-		
-		//-1查询所有
-		if(operatorId == -1){
-			operatorId = null;
-		}
-		
-		List<PlaceClassInformation> placeClassNameList = placeClassInformationService.findPlaceClassByOperatorId(operatorId);
+	List<PlaceClassInformation> placeName() {
+		List<PlaceClassInformation> placeClassNameList = placeClassInformationService.findPlaceClassByOperatorId();
 		return placeClassNameList;
 	}
 	

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

@@ -125,7 +125,7 @@ $(document).ready(function() {
 			$("#placeId").val("");
 		}
 		$("#placeIdul_span").on("click",function(){
-			initSelectUlData("placeIdul_son_ul","数聚场景",ctx+"/back/main/ap/apmac/placeClassName?operatorId=" + $("#selectedOperatorId").val(),$("#selectedOperatorId").val(),"placeIdul_box","place_id");
+			initSelectUlData("placeIdul_son_ul","数聚场景",ctx+"/back/main/ap/apmac/placeClassName",1,"placeIdul_box","place_id");
 		});
 		$("ul#placeIdul_son_ul li").live("click",function(){
 	 		$("#placeIdul_span").text($(this).text());