supdated修改

src/main/java/com/cloudcross/ssp/model/Order.java

@@ -26,7 +26,7 @@ public class Order implements ISelector {
 		// 更新日期
 		private Date updated;
 		// 新增/status更新时间
-		private Date supdated;
+		//private Date supdated;
 		/**
 		 * 活动个数
 		 * <p/>
@@ -100,12 +100,12 @@ public class Order implements ISelector {
 		public void setUpdated(Date updated) {
 			this.updated = updated;
 		}
-		public Date getSupdated() {
-			return supdated;
-		}
-		public void setSupdated(Date supdated) {
-			this.supdated = supdated;
-		}
+//		public Date getSupdated() {
+//			return supdated;
+//		}
+//		public void setSupdated(Date supdated) {
+//			this.supdated = supdated;
+//		}
 		@Override
 		public String toString() {
 			return "Order [id=" + id + ", advertiserId=" + advertiserId

src/main/java/com/cloudcross/ssp/model/mapper/ad-group.sql.xml

@@ -269,7 +269,7 @@
 			<if test="site !=null">site,</if>
 			<if test="position !=null">position,</if>
 			<if test="os !=null">os,</if>
-			status,updated,supdated)
+			status,updated)
 		values
 			(#{adGroupName},#{campaignId},#{orderId},#{agentId},#{advertiserId},#{startDate},#{endDate},#{totalBudget},#{mode},
 			#{price},
@@ -290,7 +290,7 @@
 			<if test="site !=null">#{site},</if>
 			<if test="position !=null">#{position},</if>
 			<if test="os !=null">#{os},</if>
-			#{status},NOW(),NOW())
+			#{status},NOW())
 	</insert>
 	
 	<insert id="addAdGroupBack" parameterType="com.cloudcross.ssp.model.AdGroup"  useGeneratedKeys="true"
@@ -313,7 +313,7 @@
 			<if test="period !=null">period,</if>
 			<if test="site !=null">site,</if>
 			<if test="position !=null">position,</if>
-			status,updated,supdated)
+			status,updated)
 		values
 			(#{adGroupName},#{campaignId},#{orderId},#{startDate},#{endDate},#{totalBudget},
 			<if test="price !=null">#{price},</if>
@@ -332,7 +332,7 @@
 			<if test="period !=null">#{period},</if>
 			<if test="site !=null">#{site},</if>
 			<if test="position !=null">#{position},</if>
-			#{status},NOW(),NOW())
+			#{status},NOW())
 	</insert>
 	
 	
@@ -416,37 +416,10 @@
 	<select id="findAllAdGroudByAdvertiserId" parameterType = "long" resultType = "long">
 		select id from t_adgroup where t_adgroup.advertiser_id = #{advertiserId}
 	</select>
-	<!-- 根据advertiser_id修改ad_group的supdated -->
-	<update id="updateSupdatedByAdvertiserID" parameterType="HashMap">
-		update t_adgroup
-			set t_adgroup.supdated= #{modifyDate}
-			where  t_adgroup.advertiser_id in
-			<foreach item="advertiserId" collection="advertiserIdList"
-		      open="(" separator="," close=")">
-		        #{advertiserId}
-			</foreach>
-	</update>
 	
-	<update id="updateSupdatedByOrderId" parameterType="HashMap">
-		update t_adgroup
-			set t_adgroup.supdated= #{modifyDate}
-			where  t_adgroup.order_id in
-			<foreach item="orderId" collection="orderIdList"
-		      open="(" separator="," close=")">
-		        #{orderId}
-			</foreach>
-	</update>
 	
-	<!-- 根据campaignid修改adgroup的supdated -->
-	<update id="updateSupdatedByCampaignId" parameterType="HashMap">
-		update t_adgroup
-			set t_adgroup.supdated= #{modifyDate}
-			where  t_adgroup.campaign_id in
-			<foreach item="campaignId" collection="campaignIdList"
-		      open="(" separator="," close=")">
-		        #{campaignId}
-			</foreach>
-	</update>
+	
+	
 	
 	<update id="updateStatusByAdvertiserId" parameterType="HashMap">
 		update t_adgroup

src/main/java/com/cloudcross/ssp/model/mapper/advertiser.sql.xml

@@ -485,15 +485,7 @@
 		        #{advertiserId}
 			</foreach>
 	</update>
-	<update id="updateSupdated" parameterType="HashMap">
-		update t_adgroup
-			set t_adgroup.supdated= NOW()
-			where  t_adgroup.advertiser_id in
-			<foreach item="advertiserId" collection="advertiserIdList"
-		      open="(" separator="," close=")">
-		        #{advertiserId}
-			</foreach>
-	</update>
+	
 	
 	<!-- 导出Excel用 -->
 	<select id="findDeliverEffectAnalysis" parameterType="map" resultType="com.cloudcross.ssp.model.Advertiser">

src/main/java/com/cloudcross/ssp/model/mapper/banner-template.sql.xml

@@ -152,7 +152,7 @@ where id in
 <update id="updataDeleteBannerStatus" parameterType="HashMap">
 update t_banner 
 set status=#{status},
- updated = #{updated},supdated = #{updated} 
+ updated = #{updated},supdated = #{supdated} 
 where banner_template_id in 
 	<foreach item="id" collection="idList" open="(" separator=","
 			close=")">
@@ -166,7 +166,7 @@ where banner_template_id in
 <update id="updataDeleteBannerTemplateOperatorStatus" parameterType="HashMap">
 		update t_banner_operator 
 		set checked =3,
-		supdated=#{updated}
+		supdated=#{supdated}
 		where banner_id in (select id from t_banner 
 		where t_banner.banner_template_id in
 		<foreach item="id" collection="idList" open="(" separator=","
@@ -204,7 +204,7 @@ where banner_template_id in
 	<update id="updataBannerReplace" parameterType="map">
 	update t_banner 
 	set checked = 0,
-		updated = #{supdated},
+		updated = #{updated},
 		supdated = #{supdated}	
 	where banner_template_id = #{id}
 	</update>

src/main/java/com/cloudcross/ssp/model/mapper/campaign.sql.xml

@@ -221,15 +221,7 @@
 		</foreach>
 	</update>
 	
-	<update id="updateSupdated" parameterType="HashMap">
-		update t_adgroup
-			set t_adgroup.supdated= NOW()
-			where  t_adgroup.campaign_id in
-			<foreach item="id" collection="idList" open="(" separator=","
-			close=")">
-			#{id}
-		</foreach>
-	</update>
+	
 	
 	<select id="findById" parameterType="long" resultType="com.cloudcross.ssp.model.Campaign">
 		select

src/main/java/com/cloudcross/ssp/model/mapper/order.sql.xml

@@ -224,15 +224,7 @@
 			</foreach>
 	</update>
 	
-	<update id="updateSupdated" parameterType="HashMap">
-		update t_adgroup
-			set t_adgroup.supdated= NOW()
-			where  t_adgroup.order_id in
-			<foreach item="orderId" collection="orderIdList"
-		      open="(" separator="," close=")">
-		        #{orderId}
-			</foreach>
-	</update>
+	
 	
 	<!-- 导出Excel用 -->
 	<select id="findDeliverEffectAnalysis" parameterType="map" resultType="com.cloudcross.ssp.model.Order">

src/main/java/com/cloudcross/ssp/model/pojo/WifiPojo.java

@@ -17,7 +17,7 @@ import com.cloudcross.ssp.model.Wifi;
  */
 public class WifiPojo extends Wifi{
 	private String groupName;//分组名
-	private Date supdated;//分组修改时间
+	private Long supdated;//分组修改时间
 	private Integer status;//分组热点对应关系状态
 	
 	
@@ -31,12 +31,12 @@ public class WifiPojo extends Wifi{
 	}
 
 
-	public Date getSupdated() {
+	public Long getSupdated() {
 		return supdated;
 	}
 
 
-	public void setSupdated(Date supdated) {
+	public void setSupdated(Long supdated) {
 		this.supdated = supdated;
 	}
 

src/main/java/com/cloudcross/ssp/service/impl/BannerTemplateService.java

@@ -77,7 +77,8 @@ public class BannerTemplateService implements IBannerTemplateService {
 		Long id = t.getId();
 		myBatisDao.save("bannerTemplateSqlMapper.updataBannerReplace", MapBuilder.create(HashMap.class)	
 						.add("id",id)
-						.add("supdated",date)
+						.add("updated",date)
+						.add("supdated",date.getTime()/1000)
 						.map());
 		//更新素材对应运营商审核状态
 		myBatisDao.save("bannerTemplateSqlMapper.updataBannerOperatorReplace", MapBuilder.create(HashMap.class)	
@@ -132,6 +133,7 @@ public class BannerTemplateService implements IBannerTemplateService {
 	@Override
 	public boolean deleteUpdata(List<Long> idList, int status){
 		Date date = new Date();
+		Long supdated = date.getTime()/1000;
 		//删除创意素材
 		myBatisDao.save("bannerTemplateSqlMapper.updataDeleteBannerTemplateStatus",MapBuilder.create(HashMap.class)
 				.add("status", status)
@@ -143,12 +145,13 @@ public class BannerTemplateService implements IBannerTemplateService {
 				.add("status", status)
 				.add("idList", idList)
 				.add("updated", date)
+				.add("supdated", supdated)
 				.map());
 		//更新运营商素材状态
 		myBatisDao.save("bannerTemplateSqlMapper.updataDeleteBannerTemplateOperatorStatus",MapBuilder.create(HashMap.class)
 				.add("status", status)
 				.add("idList", idList)
-				.add("updated", date)
+				.add("supdated", supdated)
 				.map());
 		
 		return true;

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

@@ -23,9 +23,11 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
+import com.cloudcross.ssp.common.consts.DirectType;
 import com.cloudcross.ssp.common.utils.AdvertiserSortByDate;
 import com.cloudcross.ssp.common.utils.Common;
 import com.cloudcross.ssp.common.utils.Pager;
@@ -213,6 +215,7 @@ public class OperatorAdGroupController extends SimpleController{
 	 * @return
 	 */
 	@RequestMapping("/zonelist")
+	@ResponseBody
 	public List<Zone> queryZoneByPosition(Integer position){
 		Map<String,Object>condition = new HashMap<String,Object>();
 		condition.put("position", position);
@@ -225,6 +228,7 @@ public class OperatorAdGroupController extends SimpleController{
 	 * @return
 	 */
 	@RequestMapping("/wifiGroupInfoList")
+	@ResponseBody
 	public List<WifiGroupInfo> queryWifiGroupInfoByCondition(){
 		Map<String,Object>condition = new HashMap<String,Object>();
 		condition.put("operatorId",getLoginUser().getOperatorId());
@@ -240,9 +244,99 @@ public class OperatorAdGroupController extends SimpleController{
 		return this.placeService.findAll();
 	}
 	 
-	
-	public String editWithOperator(){
+	/**
+	 * 媒体自投修改
+	 * @param model
+	 * @param paramMap
+	 * @return
+	 */
+	@RequestMapping("/edit")
+	public String edit(Model model,Long adGroupId) {
+		AdGroup adGroup = adGroupService.findById(adGroupId);
+		
+		//找到这个投放对应的活动，然后保存活动预算
+		Campaign campaign = campaignService.findById(adGroup.getCampaignId());
+		model.addAttribute("budget", campaign.getTotalBudget());
+		
+		//找到所有的场景，并且显示出来
+		List<Place> placeList = placeService.findAll();
+		
+		//获取所有已选择的场景并且用,分割存放到place里面
+		String place = "0,";
+		List<AdGroupPlace> adGroupPlaceList = adGroupPlaceService.findAll(adGroup.getId());
+		for(AdGroupPlace pc:adGroupPlaceList) {
+			if(pc != adGroupPlaceList) {
+				place += pc.getPlaceId() + ",";
+			}else {
+				place += adGroupPlaceList;
+			}
+		}
+		// 千次转换
+	    adGroup.setMaxImpression(adGroup.getMaxImpression() / 1000);
+	    adGroup.setDailyMaxImpression(adGroup.getDailyMaxImpression() / 1000);
+	    /**
+	     * 把数据库里面的日期转换为前端的需要的格式显示
+	     */
+	    String activeTime = "";
+	    SimpleDateFormat formatter;   
+	    formatter = new SimpleDateFormat ("yyyy-MM-dd");   
+	    String startTime = formatter.format(adGroup.getStartDate());
+	    String endTime = formatter.format(adGroup.getEndDate());
+	    activeTime = startTime + " to " + endTime;	    
+		
+	  //找到所有的已选择的wifi
+		List<Wifi> adGroupWifiList = wifiService.findAllAdgroupWifi(adGroup.getId());
+		//把找到的已选wifi热点转换为前端需要的数据格式
+		String cacheSelected = "[";
+		String selectedWifi ="";
+		if(adGroupWifiList != null) {
+			int index = 0;
+			for(Wifi wf: adGroupWifiList) {
+				index ++;
+				cacheSelected += "{" + "\"" + "id" + "\"" + ":\"" +  wf.getId() 
+						     + "\",\"" + "address" + "\"" + ":" + "\"" +  wf.getAddress() + "\","
+						     + "\"" + "lng" + "\"" + ":" + "\"" +  (float)(Math.round(wf.getLongitude()*100))/100 + "\","
+						     + "\"" + "lat" + "\"" + ":" + "\"" + (float)(Math.round(wf.getLatitude()*100))/100 + "\"" + "}";
+				selectedWifi += wf.getId();
+				String str = "[" + wf + "]";
+				if(index != adGroupWifiList.size()) {
+					cacheSelected += ",";
+					selectedWifi += ",";
+				}
+			}
+		}
+		cacheSelected += "]";
 		
+		/**
+		 * 找到所有的地域定向,排期
+		 */    
+		Direct locationDirect = directService.findByadGroupId(adGroup.getId(), 1);
+		String areas = ""; 
+		if(null != locationDirect) {
+			areas = locationDirect.getBackShow();
+		}
+		//批量查询
+		List<Direct> directs = directService.findByBatch(adGroupId);				
+		Long campaignId = adGroup.getCampaignId();
+		model.addAttribute("campaignId", campaignId);			
+		if(directs!=null){
+			for(Direct tmpDirect : directs ) {
+				if (tmpDirect.getDirectType() == DirectType.locateType) {
+					model.addAttribute("locate", tmpDirect.getBackShow());
+				}else if(tmpDirect.getDirectType() == DirectType.timeType) {
+					model.addAttribute("time", tmpDirect.getBackShow());
+				}
+			}
+		}	
+	
+		model.addAttribute("placeList",placeList);
+		model.addAttribute("areas", areas);
+		model.addAttribute("selectedwifi", selectedWifi);
+		model.addAttribute("cacheSelected", cacheSelected);
+		model.addAttribute("activeTime", activeTime);
+		model.addAttribute("place",place);
+		model.addAttribute("adGroup", adGroup);
+		model.addAttribute("adGroupPlaceList",adGroupPlaceList);
 		return page("edit");
 	}
 	/**

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/list.ftl

@@ -66,7 +66,6 @@
 			    <div id="navButtons">
 					<div id="button">					
 						<a href="${ctx}/advertiser/main/ad/target/ad-group/create?campaignId=${campaignId!}" class="btn2" id="btn-create">创建投放</a>
-						<a href="${ctx}/advertiser/main/ad/target/ad-group/createbyoperator?campaignId=${campaignId!}" class="btn2" id="btn-sinceVote">媒体自投</a>
 						<a class="btn2" id="all-btn-enable">批量开启</a>
 						<a class="btn2" id="all-btn-disable">批量停用</a>
 						<a class="btn2" id="all-btn-delete">批量删除</a>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/list.ftl

@@ -86,7 +86,10 @@
 								<td class="tbodyTd">${campaign.id!}</td>
 								<td class="tbodyTd">${campaign.name!}</td>
 								<td class="tbodyTd">${campaign.totalBudget!}</td>
-								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaign.id!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="tableTdStyle">${campaign.groupNumber!}个投放</a></td>
+								<td class="tbodyTd">
+									<a href="${ctx}/advertiser/main/ad/target/ad-group/list?campaignId=${campaign.id!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="tableTdStyle">${campaign.groupNumber!}个投放</a>
+									<#--<a href="${ctx}/advertiser/main/ad/target/operator-ad-group/list?campaignId=${campaign.id!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="tableTdStyle">${campaign.groupNumber!}个投放</a>-->
+								</td>
 								<td class="tbodyTd">${campaign.activeTime?date}~${campaign.expireTime?date}</td>
 								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/target/campaign/update?campaignId=${campaign.id!}&advertiserId=${advertiserId!}" class="tableTdStyle">${campaign.upDated?datetime}</a></td>
 								<td class="tbodyTd"><#if campaign.status==0>正常<#else>停用</#if></td>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/operator-ad-group/list.ftl

@@ -98,7 +98,7 @@
 								<td class="tbodyTd">${adGroup.adGroupName!}</td>
 								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/target/ad/list?adGroupId=${adGroup.id!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="tableTdStyle">${adGroup.bannerNumber!}个创意</a></td>
 								<td class="tbodyTd">${adGroup.startDate!?date}~${adGroup.endDate!?date}</td>
-								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/target/ad-group/update?adGroupId=${adGroup.id!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="tableTdStyle">${adGroup.updated!?datetime}</a></td>
+								<td class="tbodyTd"><a href="${ctx}/advertiser/main/ad/target/operator-ad-group/update?adGroupId=${adGroup.id!}&campaignId=${campaignId!}&orderId=${orderId!}&advertiserId=${advertiserId!}" class="tableTdStyle">${adGroup.updated!?datetime}</a></td>
 								<td class="tbodyTd"><#if adGroup.status==0>正常<#else>停用</#if></td>
 								<td class="tbodyTd">
 									<div id="listButtons">