投放管理的更新

Signed-off-by: you.chen <you.chen@cloudcross.com>

src/main/java/com/cloudcross/ssp/service/IPlaceService.java

@@ -7,8 +7,13 @@ import com.cloudcross.ssp.base.service.IGenericService;
 import com.cloudcross.ssp.common.utils.Pager1;
 
 public interface IPlaceService extends IGenericService<Place> {
-
+	
+	/**
+	 * 从数据库中，找到所有的数聚子场景
+	 * @return
+	 */
 	List<Place> findPlace();
+	
 	public List<Place> findAll();
 	
 	/**

src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/target/AdGroupController.java

@@ -468,16 +468,18 @@ public class AdGroupController extends SimpleController {
 		//找到所有的场景，并且显示出来
 		List<Place> placeList = placeService.findAll();
 		
-		//获取所有已选择的场景并且用,分割存放到place里面
-		String place = "0,";
+		//获取所有已选择的场景并且用","分割存放到place里面
+		String place = "";
 		List<AdGroupPlace> adGroupPlaceList = adGroupPlaceService.findAll(adGroup.getId());
-		for(AdGroupPlace pc:adGroupPlaceList) {
-			if(pc != adGroupPlaceList) {
-				place += pc.getPlaceId() + ",";
-			}else {
-				place += adGroupPlaceList;
+		for(int i = 0; i < adGroupPlaceList.size(); i++) {
+			//如果遍历到最后一个时就不必再加逗号
+			if(i == (adGroupPlaceList.size() - 1)) {
+				place = place + adGroupPlaceList.get(i).getPlaceId();
+			} else {
+				place = place + adGroupPlaceList.get(i).getPlaceId() + ",";
 			}
 		}
+		
 		// 千次转换
 	    adGroup.setMaxImpression(adGroup.getMaxImpression() / 1000);
 	    adGroup.setDailyMaxImpression(adGroup.getDailyMaxImpression() / 1000);
@@ -1046,11 +1048,12 @@ public class AdGroupController extends SimpleController {
 					presentWifiName = presentWifiName + presentWifiList.get(i).getAddress() + ", ";
 				}
 				
+				if(wifiUpdatedMark) {
 				//变更详情
 				log.setAction("对原有的投放" + formerAdGroup.getAdGroupName() + "中wifi热点做了修改"
 						+ "以前的wifi热点有：" + formerWifiName + "现在的wifi热点有：" + presentWifiName);
 				logService.add(log);
-				
+				}
 			}
 			
 			
@@ -1061,7 +1064,6 @@ public class AdGroupController extends SimpleController {
 			/**
 			 * 对投放信息的修改日志的添加
 			 */
-				
 				//存储修改信息
 				String updatedString = "对原有的投放" + formerAdGroup.getAdGroupName() + "做了修改了：";
 				//投放名称的比较
@@ -1313,16 +1315,16 @@ public class AdGroupController extends SimpleController {
 				updatedMark = false;
 				
 				/**
-				 * 如果以前的时段定向和现在的时段定向都是为空的话则说明没有发生变化
-				 * 如果以前的时段定向和现在的时段定向一个为空一个不为空则说明发生了变化
+				 * 如果以前的选择时段定向和现在的选择时段定向都是为空的话则说明没有发生变化
+				 * 如果以前的选择时段定向和现在的选择时段定向一个为空一个不为空则说明发生了变化
 				 * 如果都不为空则逐个比较再看是否发生变化
-				 * 注：dayList如果大小为0则表示传递过来的时间段是空
+				 * 注：dayList如果大小为0则表示传递过来的时间段是空,选择时间段如果是空的话则存储在数据空中是一个"[]"
 				 */
-				if((null == formerTimeTypeDirect && 0 != dayList.size()) || (null != formerTimeTypeDirect && 0 == dayList.size())) {
+				if(("[]".equals(formerTimeTypeDirect.getBackShow())  && 0 != dayList.size()) || (!"[]".equals(formerTimeTypeDirect.getBackShow()) && 0 == dayList.size())) {
 					updatedMark = true;
 				}
 				
-				if(null != formerTimeTypeDirect && 0 != dayList.size()) {
+				if(!"[]".equals(formerTimeTypeDirect.getBackShow()) && 0 != dayList.size()) {
 					List<DayParting> formerDayPartingList = new ArrayList<DayParting>();
 					try {
 						//以前已选择的时间JSONArray

src/main/webapp/assets/js/advertiser/adGroup.js

@@ -361,7 +361,7 @@ $(document).ready(function(){
 	//场景
 	if($(".place-edit").html()){
 		savewifi();//获取保存的WiFi
-		setting_date_1();//获取排期时间
+		setting_date();//获取排期时间
 		var place = $("#edit-place").val();
 		var authArr = place.split(",");
 		var checkboxs = $("#placeDiv input[type='checkbox']");
@@ -423,83 +423,6 @@ function validateMoney(){
 }
 
 function setting_date(){
-	var str_date = $("#sdayParting").val();
-	console.log(str_date);  
-	if(str_date!=""){
-		var js_date = $.parseJSON(str_date);
-		var html="";
-		for(var i=0;i<js_date.length;i++){
-			console.log(js_date[i].dehours);
-			html += '<div class="time_item"><p class="tr_data"><span class="inp"><input type="text" class="start_date edit_time" readonly="readonly" value="'+js_date[i].startDate+'"></span><span class="inp"><input type="text" class="end_date edit_time" readonly="readonly" value = "'+js_date[i].endDate+'"></span></p><button class="btn_del">删除</button><input class="json_date" type="hidden" value = "'+js_date[i].dehours+'"></div>'; 
-		}
-		$(".setting .time_box").append(html);
-		$(".time_box .time_item .btn_del").bind("click",function(e){
-				$(this).parents(".time_item").remove();
-			});
-		var date = $("#id-date-picker-1").val().split('to');
-		var s_date = date[0];
-		var e_date = date[1];
-		$(".setting .tr_data").unbind("mousedown").bind("mousedown",function(){
-				var obj_tr = $(this);
-				var th_date_s = $(this).find(".start_date").val();
-				var th_date_e = $(this).find(".end_date").val();
-				var datePickerOptions_td = {
-				"startDate":th_date_s,
-				"endDate":th_date_e,
-				getValue: function(){
-					if (obj_tr.find(".start_date").val() && obj_tr.find(".end_date").val() )
-						return obj_tr.find(".start_date").val() + ' to ' + obj_tr.find(".end_date").val();
-					else
-						return '';
-				},
-				setValue: function(s,s1,s2){
-					obj_tr.find(".start_date").val(s1);
-					obj_tr.find(".end_date").val(s2);
-				}
-			}
-			obj_tr.unbind("datepicker-apply").bind('datepicker-apply',function(event,obj){
-				var date = $("#id-date-picker-1").val().split('to');
-				var s_date = date[0];
-				var e_date = date[1];
-				var checked_date = new Array();
-				var other_box =obj_tr.parent().siblings();
-				var len = other_box.length;
-				for(var i=0;i<len;i++){
-					var json_check = {"startDate":other_box.eq(i).find(".start_date").val(),"endDate":other_box.eq(i).find(".end_date").val()};
-					checked_date.push(json_check);
-				}
-				console.log(checked_date);									
-				var startDate = obj.value.split('to')[0];
-			   	var endDate = obj.value.split('to')[1];
-		   		var flag = true;
-		   		if(flag){
-					var obj = $("#quantum_list1");
-					if(obj.find(".pitchon")){
-						var timeData = obj.find(".pitchon").map(function(i,span){
-							return $(span).attr("title");
-						}).toArray().join(',');
-					}else{
-						var timeData = -1;
-					}
-					obj_tr.find(".start_date").val(startDate);
-					obj_tr.find(".end_date").val(endDate);
-					obj_tr.parent().find(".json_date").val(timeData);
-				}else{alert("请选择正确时间！");}
-			});
-			obj_tr.dateRangePicker1(datePickerOptions_td);
-			$("#quantum_list1").find("p").removeClass("pitchon");
-			var chose_time = obj_tr.parent().find(".json_date").val();
-			console.log(chose_time);
-			if(chose_time!=-1&&chose_time!=""){
-				var chose_arr = chose_time.split(",");
-				for(var n=0;n<chose_arr.length;n++){
-					$("#quantum_list1 p").eq(chose_arr[n]).addClass("pitchon");
-				}
-			}
-		});
-	}
-}
-function setting_date_1(){
 	var str_date = $("#sdayParting").val();
 	console.log(str_date);  
 	if(str_date!=""){
@@ -535,7 +458,7 @@ function setting_date_1(){
 				}
 			}
 			obj_tr.unbind("datepicker-apply").bind('datepicker-apply',function(event,obj){
-				var date = $("#id-date-picker-1").val().split('to');
+				var date = $("#dateRangePicker").val().split('to');
 				var s_date = date[0];
 				var e_date = date[1];
 				var checked_date = new Array();