媒体自投

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

@@ -69,6 +69,8 @@ public final class AdGroup implements ISelector{
 	private Integer bannerNumber;
 	//是否全客网站
 	private Integer site;
+	//操作系统 1-iOS，2-Android，3-WP,4-Symbian,5-MAC OS,6-Windows,7-other
+	private Integer os;
 	
 	public Long getAgentId() {
 		return agentId;
@@ -309,26 +311,38 @@ public final class AdGroup implements ISelector{
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
+	
+	
+	
+	public Integer getOs() {
+		return os;
+	}
+
+	public void setOs(Integer os) {
+		this.os = os;
+	}
 
 	
+
 	@Override
 	public String toString() {
 		return "AdGroup [id=" + id + ", agentId=" + agentId + ", advertiserId="
 				+ advertiserId + ", orderId=" + orderId + ", campaignId="
-				+ campaignId + ", adGroupName=" + adGroupName + ", startDate="
-				+ startDate + ", endDate=" + endDate + ", totalBudget="
-				+ totalBudget + ", mode=" + mode + ", price=" + price
-				+ ", dailyBudget=" + dailyBudget + ", maxImpression="
-				+ maxImpression + ", maxClick=" + maxClick + ", maxConversion="
-				+ maxConversion + ", dailyMaxImpression=" + dailyMaxImpression
-				+ ", dailyMaxClick=" + dailyMaxClick + ", dailyMaxConversion="
-				+ dailyMaxConversion + ", perImpressionType="
-				+ perImpressionType + ", perImpression=" + perImpression
-				+ ", perClickType=" + perClickType + ", perClick=" + perClick
-				+ ", position=" + position + ", retarget=" + retarget
-				+ ", period=" + period + ", status=" + status + ", updated="
-				+ updated + ", bannerNumber=" + bannerNumber + ", site=" + site
-				+ "]";
+				+ campaignId + ", operatorId=" + operatorId + ", adGroupName="
+				+ adGroupName + ", startDate=" + startDate + ", endDate="
+				+ endDate + ", totalBudget=" + totalBudget + ", mode=" + mode
+				+ ", price=" + price + ", dailyBudget=" + dailyBudget
+				+ ", maxImpression=" + maxImpression + ", maxClick=" + maxClick
+				+ ", maxConversion=" + maxConversion + ", dailyMaxImpression="
+				+ dailyMaxImpression + ", dailyMaxClick=" + dailyMaxClick
+				+ ", dailyMaxConversion=" + dailyMaxConversion
+				+ ", perImpressionType=" + perImpressionType
+				+ ", perImpression=" + perImpression + ", perClickType="
+				+ perClickType + ", perClick=" + perClick + ", position="
+				+ position + ", retarget=" + retarget + ", period=" + period
+				+ ", status=" + status + ", updated=" + updated
+				+ ", bannerNumber=" + bannerNumber + ", site=" + site + ", os="
+				+ os + "]";
 	}
 
 	@Override

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

@@ -1,43 +0,0 @@
-package com.cloudcross.ssp.model;
-
-/**
- * 投放与广告位关联表
- * @author chenyou
- *
- */
-public class AdGroupZone {
-	private Long id;
-	//投放id
-	private Long adGroupId;
-	//广告位id
-	private Long zoneId;
-	
-	public Long getId() {
-		return id;
-	}
-	public void setId(Long id) {
-		this.id = id;
-	}
-	public Long getAdGroupId() {
-		return adGroupId;
-	}
-	public void setAdGroupId(Long adGroupId) {
-		this.adGroupId = adGroupId;
-	}
-	public Long getZoneId() {
-		return zoneId;
-	}
-	public void setZoneId(Long zoneId) {
-		this.zoneId = zoneId;
-	}
-	
-	@Override
-	public String toString() {
-		return "AdGroupZone [id=" + id + ", adGroupId=" + adGroupId
-				+ ", zoneId=" + zoneId + "]";
-	}
-	
-	
-	
-	
-}

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

@@ -0,0 +1,55 @@
+package com.cloudcross.ssp.model;
+
+/**
+ * 创建人：周俊
+ * 创建时间：2015.11.24 17.23
+ *投放热点分组对应关系
+ */
+public class AdgroupWifigroup {
+	private Long id;
+	private Long adgroupId;//投放id（t_adgroup.id）
+	private Long wifigroupId;//热点分组id（t_wifi_group_info）
+	private Integer status;//状态（0开启，-1删除）
+	private Long supdated;//更新时间(时间毫秒数/1000)
+	
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Long getAdgroupId() {
+		return adgroupId;
+	}
+	public void setAdgroupId(Long adgroupId) {
+		this.adgroupId = adgroupId;
+	}
+	public Long getWifigroupId() {
+		return wifigroupId;
+	}
+	public void setWifigroupId(Long wifigroupId) {
+		this.wifigroupId = wifigroupId;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public Long getSupdated() {
+		return supdated;
+	}
+	public void setSupdated(Long supdated) {
+		this.supdated = supdated;
+	}
+	@Override
+	public String toString() {
+		return "AdgroupWifigroup [id=" + id + ", adgroupId=" + adgroupId
+				+ ", wifigroupId=" + wifigroupId + ", status=" + status
+				+ ", supdated=" + supdated + "]";
+	}
+	
+	
+	
+
+}

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

@@ -0,0 +1,53 @@
+package com.cloudcross.ssp.model;
+
+/**
+ *创建人：周俊
+ *创建时间：2015.11.24 17：43
+ *投放广告位对应关系
+ */
+public class AdgroupZone {
+	private Long id;
+	private Long adgroupId;//投放id（t_adgroup.id）
+	private Long zoneId;//广告位id（t_zone.id）
+	private Integer status;//状态（0开启，-1删除）
+	private Long supdate;//更新时间(时间毫秒数/1000)
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Long getAdgroupId() {
+		return adgroupId;
+	}
+	public void setAdgroupId(Long adgroupId) {
+		this.adgroupId = adgroupId;
+	}
+	public Long getZoneId() {
+		return zoneId;
+	}
+	public void setZoneId(Long zoneId) {
+		this.zoneId = zoneId;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public Long getSupdate() {
+		return supdate;
+	}
+	public void setSupdate(Long supdate) {
+		this.supdate = supdate;
+	}
+	@Override
+	public String toString() {
+		return "AdGroupZone [id=" + id + ", adgroupId=" + adgroupId
+				+ ", zoneId=" + zoneId + ", status=" + status + ", supdate="
+				+ supdate + "]";
+	}
+	
+	
+	
+}

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

@@ -30,7 +30,8 @@
 		retarget,
 		period,
 		t_adgroup.status,
-		t_adgroup.updated as updated
+		t_adgroup.updated as updated,
+		t_adgroup.os os
 	</sql>
 	
 	
@@ -272,6 +273,7 @@
 			<if test="period !=null">period,</if>
 			<if test="site !=null">site,</if>
 			<if test="position !=null">position,</if>
+			<if test="os !=null">os,</if>
 			status,updated,supdated)
 		values
 			(#{adGroupName},#{campaignId},#{orderId},#{agentId},#{advertiserId},#{startDate},#{endDate},#{totalBudget},#{mode},
@@ -292,6 +294,7 @@
 			<if test="period !=null">#{period},</if>
 			<if test="site !=null">#{site},</if>
 			<if test="position !=null">#{position},</if>
+			<if test="os !=null">#{os},</if>
 			#{status},NOW(),NOW())
 	</insert>
 	
@@ -477,4 +480,5 @@
 			#{campaignId}
 		</foreach>
 	</update>
+	
 </mapper>

src/main/java/com/cloudcross/ssp/model/mapper/adgroup-wifigroup.sql.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="adgroupWifigroupSqlMapper">
+	<!-- 批量插入 -->
+	<insert id="addAdgroupWifigroupBatch" parameterType="java.util.Map">
+		insert into t_adgroup_wifigroup
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="adgroupId != null">
+				adgroup_id,
+			</if>
+			<if test="wifigroupId != null">
+				wifigroup_id,
+			</if>
+			<if test="status != null">
+				status,
+			</if>
+			<if test="supdated != null">
+				supdated
+			</if>
+		</trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+        	<foreach collection="wifigroupIdList" item="wifigroupId" index="index" separator=",">
+        		<if test="adgroupId != null">
+					#{adgroupWifigroup.adgroupId},
+				</if>
+				<if test="wifigroupId != null">
+					#{wifigroupId},
+				</if>
+				<if test="status != null">
+					#{adgroupWifigroup.status},
+				</if>
+				<if test="supdated != null">
+					#{adgroupWifigroup.supdated}
+				</if>
+        	</foreach>
+        </trim>
+	</insert>
+	
+
+</mapper>

src/main/java/com/cloudcross/ssp/model/mapper/adgroup-zone.sql.xml

@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="adGroupZoneSqlMapper">
-
-
-	<insert id="addAdGroupZone" parameterType="com.cloudcross.ssp.model.AdGroupZone">
-		insert into t_adgroup_zone(adgroup_id,zone_id) values(#{adGroupId},#{zoneId})
+<mapper namespace="adgroupZoneSqlMapper">
+	<!-- 批量插入 -->
+	<insert id="addAdgroupZoneBatch">
+		insert into t_adgroup_zone 
+		(adgroup_id,zone_id,status,supdate)
+		values
+		<foreach collection="zoneIdList" item="zoneId" index="index" separator=",">
+			(#{adgroupId},#{zoneId},#{status},#{supdate})
+		</foreach>
 	</insert>
-	
-	<delete id="deleteByAdGroupId" parameterType="long">
-		delete from t_adgroup_zone where adgroup_id = #{adGroupId}
-	</delete>
-	
-	<select id="findAllByAdGroupId" parameterType="long" resultType="com.cloudcross.ssp.model.AdGroupZone">
-		select id, adgroup_id as adGroupId, zone_id as zoneId
-		from t_adgroup_zone
-		where adgroup_id = #{adGroupId}
-		order by zone_id asc
- 	</select>
 </mapper>

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

@@ -26,7 +26,7 @@
 		clickRate,
 		visitRate,
 		conversionRate,
-		ecmp as eCmp,
+		ecpm as eCmp,
 		consume,
 		os,
 		location,
@@ -62,7 +62,7 @@
 	
 	<select id="findCountForDeliverEffectAnalysisAdvertiser" parameterType="map" resultType="int">
 		select count(1) from (
-		select b.name advertiserName,c.name orderName,d.name campaignName,e.name adgroupName,g.name bannerName,a.date reportDate,sum(a.impression) as impression,sum(a.click) as click,100*sum(a.click)/sum(a.impression) as clickRate,sum(a.visit) as visit,100*sum(a.visit)/sum(a.click) as visitRate,sum(a.conversion) as conversion,100*sum(a.conversion)/sum(a.visit) as conversionRate,sum(a.ecmp) as ecmp,sum(a.consume) as consume 
+		select b.name advertiserName,c.name orderName,d.name campaignName,e.name adgroupName,g.name bannerName,a.date reportDate,sum(a.impression) as impression,sum(a.click) as click,100*sum(a.click)/sum(a.impression) as clickRate,sum(a.visit) as visit,100*sum(a.visit)/sum(a.click) as visitRate,sum(a.conversion) as conversion,100*sum(a.conversion)/sum(a.visit) as conversionRate,sum(a.ecpm) as ecmp,sum(a.consume) as consume 
 		from t_rpt_advertiser a,t_advertiser b,t_order c,t_campaign d,t_adgroup e,t_banner f,t_banner_template g
 		where a.advertiser_id=b.id and a.order_id=c.id and a.campaign_id=d.id and a.adgroup_id=e.id and a.banner_id=f.id and f.banner_template_id=g.id
 		<if test="advertiserId != null and advertiserId ">
@@ -152,7 +152,7 @@
 		        </if>
 	) as impressionRate,100*rp.click/rp.impression as clickRate ,
 	100*visit/rp.click as visitRate ,100*rp.conversion/visit as
-	conversionRate,ecmp as eCmp,consume
+	conversionRate,ecpm as eCmp,consume
 	from t_rpt_adv_banner rp,
 	t_banner_template bt
               <where>      
@@ -210,7 +210,7 @@
 		        </if>
 	) as impressionRate,100*rp.click/rp.impression as clickRate ,
 	100*visit/rp.click as visitRate ,100*rp.conversion/visit as
-	conversionRate,ecmp as eCmp,consume
+	conversionRate,ecpm as eCmp,consume
 	from t_rpt_adv_banner rp,
 	t_banner_template bt
               <where>      
@@ -452,7 +452,7 @@
 	</select>
 	
 	 <select id="findByTotalReportAdvertiser" parameterType="map" resultType="com.cloudcross.ssp.model.DeliverAnalysis">
-		select b.name advertiserName,c.name orderName,d.name campaignName,e.name adgroupName,g.name bannerName,a.date reportDate,sum(a.impression) as impression,sum(a.click) as click,100*sum(a.click)/sum(a.impression) as clickRate,sum(a.visit) as visit,100*sum(a.visit)/sum(a.click) as visitRate,sum(a.conversion) conversion,100*sum(a.conversion)/sum(a.visit) as conversionRate,sum(a.ecmp) ecmp,sum(a.consume) as consume 
+		select b.name advertiserName,c.name orderName,d.name campaignName,e.name adgroupName,g.name bannerName,a.date reportDate,sum(a.impression) as impression,sum(a.click) as click,100*sum(a.click)/sum(a.impression) as clickRate,sum(a.visit) as visit,100*sum(a.visit)/sum(a.click) as visitRate,sum(a.conversion) conversion,100*sum(a.conversion)/sum(a.visit) as conversionRate,sum(a.ecpm) ecmp,sum(a.consume) as consume 
 		from t_rpt_advertiser a,t_advertiser b,t_order c,t_campaign d,t_adgroup e,t_banner f,t_banner_template g
 		where a.advertiser_id=b.id and a.order_id=c.id and a.campaign_id=d.id and a.adgroup_id=e.id and a.banner_id=f.id and f.banner_template_id=g.id
 		<if test="advertiserId != null and advertiserId ">
@@ -527,7 +527,7 @@
 	    <if test="startDate!=null and endDate!=null"> 
             and date &gt;= #{startDate} and #{endDate} &gt;=date
 	    </if>) as impressionSum,ad.impression,ad.click,visit,ad.conversion, 
-        100*ad.click/ad.impression as clickRate ,100*visit/ad.click as visitRate ,100*ad.conversion/visit as conversionRate ,ecmp as eCmp,ad.consume,
+        100*ad.click/ad.impression as clickRate ,100*visit/ad.click as visitRate ,100*ad.conversion/visit as conversionRate ,ecpm as eCmp,ad.consume,
 		(select sum(t_rpt_advertiser.click) from t_rpt_advertiser ,t_advertiser,t_order, t_campaign, t_banner, t_adgroup, t_banner_template where  t_rpt_advertiser.advertiser_id=t_advertiser.id  and  t_rpt_advertiser.order_id = t_order.id  and t_rpt_advertiser.campaign_id= t_campaign.id   
 	 	    and  t_rpt_advertiser.adgroup_id=t_adgroup.id
             and  t_rpt_advertiser.banner_id=t_banner.id 
@@ -596,7 +596,7 @@
 	    <if test="startDate!=null and endDate!=null"> 
             and date &gt;= #{startDate} and #{endDate} &gt;=date
 	    </if>) as conversionSum, 
-		(select sum(t_rpt_advertiser.ecmp) from t_rpt_advertiser ,t_advertiser,t_order, t_campaign, t_banner, t_adgroup, t_banner_template where  t_rpt_advertiser.advertiser_id=t_advertiser.id  and  t_rpt_advertiser.order_id = t_order.id  and t_rpt_advertiser.campaign_id= t_campaign.id   
+		(select sum(t_rpt_advertiser.ecpm) from t_rpt_advertiser ,t_advertiser,t_order, t_campaign, t_banner, t_adgroup, t_banner_template where  t_rpt_advertiser.advertiser_id=t_advertiser.id  and  t_rpt_advertiser.order_id = t_order.id  and t_rpt_advertiser.campaign_id= t_campaign.id   
 	 	    and  t_rpt_advertiser.adgroup_id=t_adgroup.id
             and  t_rpt_advertiser.banner_id=t_banner.id 
             and  t_banner.banner_template_id = t_banner_template.id 
@@ -859,10 +859,10 @@
         
          ad.date as reportDate,   ad.hour as hour,  
         (select sum(impression) from t_rpt_advertiser_hour) as impressionSum,ad.impression,ad.click,visit,ad.conversion, 
-        100*ad.click/ad.impression as clickRate ,100*visit/ad.click as visitRate ,100*ad.conversion/visit as conversionRate ,ecmp as eCmp,ad.consume,
+        100*ad.click/ad.impression as clickRate ,100*visit/ad.click as visitRate ,100*ad.conversion/visit as conversionRate ,ecpm as eCmp,ad.consume,
 		(select sum(click) from t_rpt_advertiser_hour) as clickSum, (select sum(visit) from t_rpt_advertiser_hour) as visitSum,
         (select sum(conversion) from t_rpt_advertiser_hour) as conversionSum, 
-		(select sum(ecmp) from t_rpt_advertiser_hour) as eCmpSum, (select sum(consume) from t_rpt_advertiser_hour) as consumeSum, 
+		(select sum(ecpm) from t_rpt_advertiser_hour) as eCmpSum, (select sum(consume) from t_rpt_advertiser_hour) as consumeSum, 
         100*(select sum(click) from t_rpt_advertiser_hour)/(select sum(impression) from t_rpt_advertiser_hour) as clickRatesum, 
 		100*(select sum(visit) from t_rpt_advertiser_hour)/(select sum(click) from t_rpt_advertiser_hour) as visitRatesum,
 		100*(select sum(conversion) from t_rpt_advertiser_hour)/(select sum(visit) from t_rpt_advertiser_hour) as conversionRatesum
@@ -940,7 +940,7 @@
 		</where>
 		) as impressionRate, sum(impression) as impression, sum(click) as click, 100 * sum(click) / sum(impression) as clickRate,
 		sum(visit) as visit, 100 * sum(visit) / sum(click) as visitRate, 100 * sum(conversion) / sum(visit) as conversionRate,
-		sum(conversion) as conversion, sum(ecmp) as eCmp, sum(consume) as consume from t_rpt_adv_location a, t_advertiser b,t_location
+		sum(conversion) as conversion, sum(ecpm) as eCmp, sum(consume) as consume from t_rpt_adv_location a, t_advertiser b,t_location
 		 	<where>	
        	a.advertiser_id = b.id and a.location = t_location.location and a.date &gt;= #{startDate} and #{endDate} &gt;=a.date
 			<if test="advertiserId ==null">
@@ -1010,7 +1010,7 @@
 	  	 <if test="startDate!=null and endDate!=null"> 
             and t_rpt_adv_location.date &gt;= #{startDate} and #{endDate} &gt;=t_rpt_adv_location.date
 		 </if>) as impressionRate,100*rl.click/rl.impression as clickRate ,
-        100*visit/rl.click as visitRate ,100*rl.conversion/visit as conversionRate,ecmp as eCmp,consume   
+        100*visit/rl.click as visitRate ,100*rl.conversion/visit as conversionRate,ecpm as eCmp,consume   
         from t_rpt_adv_location rl, t_advertiser, t_order, t_campaign, t_adgroup
         
            <where>	
@@ -1046,7 +1046,7 @@
 		t_advertiser.name as advertiserName,  t_order.name as orderName, t_campaign.name as campaignName, t_adgroup.name  as adGroupName,
 
               ros.date as reportDate,
-        ros.impression,ros.click,visit,ros.conversion,os,
+        ros.impression,ros.click,visit,ros.conversion,ros.os,
         100*ros.impression/(select sum(t_rpt_adv_os.impression) from t_rpt_adv_os, t_advertiser, t_order, t_campaign, t_adgroup        
 
 
@@ -1074,7 +1074,7 @@
             and t_rpt_adv_os.date &gt;= #{startDate} and #{endDate} &gt;=t_rpt_adv_os.date
 		     </if>
 	) as impressionRate,100*ros.click/ros.impression as clickRate ,
-        100*visit/ros.click as visitRate ,100*ros.conversion/visit as conversionRate,ecmp as eCmp,consume   
+        100*visit/ros.click as visitRate ,100*ros.conversion/visit as conversionRate,ecpm as eCmp,consume   
         from t_rpt_adv_os ros, t_advertiser, t_order, t_campaign, t_adgroup        
 
 
@@ -1180,7 +1180,7 @@
 	  		 <if test="startDate!=null and endDate!=null"> 
             and t_rpt_adv_place.date &gt;= #{startDate} and #{endDate} &gt;=t_rpt_adv_place.date
 		        </if>) as impressionRate,100*rp.click/rp.impression as clickRate ,
-              100*visit/rp.click as visitRate ,100*rp.conversion/visit as conversionRate,ecmp as eCmp,consume   
+              100*visit/rp.click as visitRate ,100*rp.conversion/visit as conversionRate,ecpm as eCmp,consume   
             from t_rpt_adv_place rp, t_advertiser, t_order, t_campaign, t_adgroup , t_place      
 
 
@@ -1230,7 +1230,7 @@
 	
 	<!--<select id="findByOrderName" parameterType="map" resultType="DeliverAnalysis">
 		select 
-		t_order.name as orderName,impression,click,visit,conversion,click/impression as clickRate ,visit/click as visitRate ,conversion/visit as conversionRate,eCmp,income
+		t_order.name as orderName,impression,click,visit,conversion,click/impression as clickRate ,visit/click as visitRate ,conversion/visit as conversionRate,ecpm,income
 		from t_rpt_daily
 		left join t_order
 		ON t_rpt_daily.order_id=t_order.id
@@ -1240,7 +1240,7 @@
 	
 	<select id="findByCampaignName" parameterType="map" resultType="DeliverAnalysis">
 		select 
-		t_campaign.name as campaignName,impression,click,visit,conversion,click/impression as clickRate ,visit/click as visitRate ,conversion/visit as conversionRate ,eCmp,income
+		t_campaign.name as campaignName,impression,click,visit,conversion,click/impression as clickRate ,visit/click as visitRate ,conversion/visit as conversionRate ,ecpm,income
 		from t_rpt_daily
 		left join t_campaign
 		ON t_rpt_daily.campaign_id=t_campaign.id
@@ -1250,7 +1250,7 @@
 	
 	<select id="findByAdGroupName" parameterType="map" resultType="DeliverAnalysis">
 		select 
-		t_adgroup.name as adGroupName,impression,click,visit,conversion,click/impression as clickRate ,visit/click as visitRate ,conversion/visit as conversionRate ,eCmp,income
+		t_adgroup.name as adGroupName,impression,click,visit,conversion,click/impression as clickRate ,visit/click as visitRate ,conversion/visit as conversionRate ,ecpm,income
 		from t_rpt_daily
 		left join t_adgroup
 		ON t_rpt_daily.adgroup_id=t_adgroup.id
@@ -1386,7 +1386,7 @@ sum(click) as totalClick, if(sum(a.impression) > 0,sum(a.click)/sum(a.impression
 	
 	<!--数据报表 导出excel -->
 	<select id="findByTotalForExcelAdvertiser" parameterType="map" resultType="com.cloudcross.ssp.model.DeliverAnalysis">
-		select b.name advertiserName,c.name orderName,d.name campaignName,e.name adgroupName,g.name bannerName,a.date reportDate,sum(a.impression) as impression,sum(a.click) as click,100*sum(a.click)/sum(a.impression) as clickRate,sum(a.visit) as visit,100*sum(a.visit)/sum(a.click) as visitRate,sum(a.conversion) conversion,100*sum(a.conversion)/sum(a.visit) as conversionRate,sum(a.ecmp) ecmp,sum(a.consume) as consume 
+		select b.name advertiserName,c.name orderName,d.name campaignName,e.name adgroupName,g.name bannerName,a.date reportDate,sum(a.impression) as impression,sum(a.click) as click,100*sum(a.click)/sum(a.impression) as clickRate,sum(a.visit) as visit,100*sum(a.visit)/sum(a.click) as visitRate,sum(a.conversion) conversion,100*sum(a.conversion)/sum(a.visit) as conversionRate,sum(a.ecpm) ecmp,sum(a.consume) as consume 
 		from t_rpt_advertiser a,t_advertiser b,t_order c,t_campaign d,t_adgroup e,t_banner f,t_banner_template g
 		where a.advertiser_id=b.id and a.order_id=c.id and a.campaign_id=d.id and a.adgroup_id=e.id and a.banner_id=f.id and f.banner_template_id=g.id
 		<if test="advertiserId != null and advertiserId ">
@@ -1449,7 +1449,7 @@ sum(click) as totalClick, if(sum(a.impression) > 0,sum(a.click)/sum(a.impression
 		</where>
 		) as impressionRate, sum(impression) as impression, sum(click) as click, 100 * sum(click) / sum(impression) as clickRate,
 		sum(visit) as visit, 100 * sum(visit) / sum(click) as visitRate, 100 * sum(conversion) / sum(visit) as conversionRate,
-		sum(conversion) as conversion, sum(ecmp) as eCmp, sum(consume) as consume from t_rpt_adv_location a, t_advertiser b,t_location
+		sum(conversion) as conversion, sum(ecpm) as eCmp, sum(consume) as consume from t_rpt_adv_location a, t_advertiser b,t_location
 		 	<where>	
        	a.advertiser_id = b.id and a.location = t_location.location and a.date &gt;= #{startDate} and #{endDate} &gt;=a.date
 			<if test="advertiserId ==null">
@@ -1512,7 +1512,7 @@ sum(click) as totalClick, if(sum(a.impression) > 0,sum(a.click)/sum(a.impression
 	    <if test="startDate!=null and endDate!=null"> 
             and date &gt;= #{startDate} and #{endDate} &gt;=date
 	    </if>) as impressionSum,ad.impression,ad.click,visit,ad.conversion, 
-        100*ad.click/ad.impression as clickRate ,100*visit/ad.click as visitRate ,100*ad.conversion/visit as conversionRate ,ecmp as eCmp,ad.consume,
+        100*ad.click/ad.impression as clickRate ,100*visit/ad.click as visitRate ,100*ad.conversion/visit as conversionRate ,ecpm as eCmp,ad.consume,
 		(select sum(t_rpt_advertiser.click) from t_rpt_advertiser ,t_advertiser,t_order, t_campaign, t_banner, t_adgroup, t_banner_template where  t_rpt_advertiser.advertiser_id=t_advertiser.id  and  t_rpt_advertiser.order_id = t_order.id  and t_rpt_advertiser.campaign_id= t_campaign.id   
 	 	    and  t_rpt_advertiser.adgroup_id=t_adgroup.id
             and  t_rpt_advertiser.banner_id=t_banner.id 
@@ -1581,7 +1581,7 @@ sum(click) as totalClick, if(sum(a.impression) > 0,sum(a.click)/sum(a.impression
 	    <if test="startDate!=null and endDate!=null"> 
             and date &gt;= #{startDate} and #{endDate} &gt;=date
 	    </if>) as conversionSum, 
-		(select sum(t_rpt_advertiser.ecmp) from t_rpt_advertiser ,t_advertiser,t_order, t_campaign, t_banner, t_adgroup, t_banner_template where  t_rpt_advertiser.advertiser_id=t_advertiser.id  and  t_rpt_advertiser.order_id = t_order.id  and t_rpt_advertiser.campaign_id= t_campaign.id   
+		(select sum(t_rpt_advertiser.ecpm) from t_rpt_advertiser ,t_advertiser,t_order, t_campaign, t_banner, t_adgroup, t_banner_template where  t_rpt_advertiser.advertiser_id=t_advertiser.id  and  t_rpt_advertiser.order_id = t_order.id  and t_rpt_advertiser.campaign_id= t_campaign.id   
 	 	    and  t_rpt_advertiser.adgroup_id=t_adgroup.id
             and  t_rpt_advertiser.banner_id=t_banner.id 
             and  t_banner.banner_template_id = t_banner_template.id 
@@ -1822,7 +1822,7 @@ sum(click) as totalClick, if(sum(a.impression) > 0,sum(a.click)/sum(a.impression
               ros.date as reportDate,
         ros.impression,ros.click,visit,ros.conversion,os,
         100*ros.impression/(select sum(impression) from t_rpt_adv_os) as impressionRate,100*ros.click/ros.impression as clickRate ,
-        100*visit/ros.click as visitRate ,100*ros.conversion/visit as conversionRate,ecmp as eCmp,consume   
+        100*visit/ros.click as visitRate ,100*ros.conversion/visit as conversionRate,ecpm as eCmp,consume   
         from t_rpt_adv_os ros, t_advertiser, t_order, t_campaign, t_adgroup        
 
 
@@ -1862,7 +1862,7 @@ sum(click) as totalClick, if(sum(a.impression) > 0,sum(a.click)/sum(a.impression
 	              rp.date as reportDate,
                   rp.impression,rp.click,visit,rp.conversion,
               100*rp.impression/(select sum(impression) from t_rpt_adv_place) as impressionRate,100*rp.click/rp.impression as clickRate ,
-              100*visit/rp.click as visitRate ,100*rp.conversion/visit as conversionRate,ecmp as eCmp,consume   
+              100*visit/rp.click as visitRate ,100*rp.conversion/visit as conversionRate,ecpm as eCmp,consume   
             from t_rpt_adv_place rp, t_advertiser, t_order, t_campaign, t_adgroup , t_place      
 
 

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

@@ -3,7 +3,7 @@
 <mapper namespace="rptAdvertiserHourSqlMapper">
 	
 	<select id="findEveryHourData" parameterType="map" resultType="com.cloudcross.ssp.model.RptAdvertiserHour">
-		select hour,sum(impression) as impression,sum(click) as click,sum(visit) as visit, sum(conversion) as conversion, sum(ecmp) as ecmp,sum(consume) as consume
+		select hour,sum(impression) as impression,sum(click) as click,sum(visit) as visit, sum(conversion) as conversion, sum(ecpm) as ecmp,sum(consume) as consume
 		from t_rpt_advertiser_hour where  date = #{startDate}
 		<if test="advertiserId!=null">
         	and advertiser_id = #{advertiserId}

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

@@ -36,6 +36,7 @@
         </trim>
 	</insert>
 	
+	<!-- operatorId查询分组信息 -->
 	<select id="queryGroupNames" resultType="com.cloudcross.ssp.model.WifiGroupInfo">
 		select id,name from t_wifi_group_info where status != -1 and operator_id = #{operatorId}
 	</select>

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

@@ -1,18 +0,0 @@
-package com.cloudcross.ssp.service;
-
-import java.util.List;
-
-import com.cloudcross.ssp.base.service.IGenericService;
-import com.cloudcross.ssp.model.AdGroupZone;
-
-/**
- * 投放与广告位关联服务接口定义
- * @author chenyou
- *
- */
-public interface IAdGroupZoneService extends IGenericService<AdGroupZone> {
-	//根据投放id删除投放和广告位对应的信息
-	boolean deleteByAdGroupId(Long adGroupId);
-	//根据投放id找到所有的广告位id，并且得到的这个集合要按广告位id升序排序
-	List<AdGroupZone> findAllByAdGroupId(Long adGroupId);
-}

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

@@ -0,0 +1,8 @@
+package com.cloudcross.ssp.service;
+
+import com.cloudcross.ssp.base.service.IGenericService;
+import com.cloudcross.ssp.model.AdgroupWifigroup;
+
+public interface IAdgroupWifigroupService extends IGenericService<AdgroupWifigroup> {
+
+}

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

@@ -0,0 +1,9 @@
+package com.cloudcross.ssp.service;
+
+
+import com.cloudcross.ssp.base.service.IGenericService;
+import com.cloudcross.ssp.model.AdgroupZone;
+
+public interface IAdgroupZoneService extends IGenericService<AdgroupZone> {
+	
+}

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

@@ -26,7 +26,7 @@ import com.cloudcross.ssp.model.Location;
 import com.cloudcross.ssp.service.IAdGroupPlaceService;
 import com.cloudcross.ssp.service.IAdGroupScheduleService;
 import com.cloudcross.ssp.service.IAdGroupService;
-import com.cloudcross.ssp.service.IAdGroupZoneService;
+
 import com.cloudcross.ssp.service.IBannerService;
 import com.cloudcross.ssp.service.IDirectService;
 import com.cloudcross.ssp.service.ILocationService;
@@ -42,8 +42,6 @@ public class AdGroupService implements IAdGroupService, ISelectorProvider {
 	@Autowired
 	private GenericIBatisDao myBatisDao;
 	@Autowired
-	private IAdGroupZoneService adGroupZoneService;
-	@Autowired
 	private IAdGroupPlaceService adGroupPlaceService;
 	@Autowired
 	private ILocationService locationService;

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

@@ -1,70 +0,0 @@
-package com.cloudcross.ssp.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.cloudcross.ssp.base.dao.GenericIBatisDao;
-import com.cloudcross.ssp.common.utils.Pager;
-import com.cloudcross.ssp.model.AdGroupZone;
-import com.cloudcross.ssp.service.IAdGroupZoneService;
-
-@Service
-public class AdGroupZoneService implements IAdGroupZoneService {
-	private static final Logger LOG = Logger.getLogger(AdGroupService.class);
-	
-	@Autowired
-	private GenericIBatisDao myBatisDao;
-
-	@Override
-	public AdGroupZone findById(Long id) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public int countByParams(Map<String, Object> paramMap) {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public List<AdGroupZone> findByParams(Map<String, Object> paramMap,
-			Pager pager) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public boolean add(AdGroupZone t) {
-		myBatisDao.save("operator.adGroupZoneSqlMapper.addAdGroupZone", t);
-		return true;
-	}
-
-	@Override
-	public boolean edit(AdGroupZone t) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean updateStatus(List<Long> idList, int status) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public boolean deleteByAdGroupId(Long adGroupId) {
-		myBatisDao.delete("operator.adGroupZoneSqlMapper.deleteByAdGroupId", adGroupId);
-		return true;
-	}
-
-	@Override
-	public List<AdGroupZone> findAllByAdGroupId(Long adGroupId) {
-		return myBatisDao.getList("operator.adGroupZoneSqlMapper.findAllByAdGroupId", adGroupId);
-	}
-
-}

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

@@ -0,0 +1,53 @@
+package com.cloudcross.ssp.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.model.AdgroupWifigroup;
+import com.cloudcross.ssp.service.IAdgroupWifigroupService;
+
+@Service
+public class AdgroupWifigroupService implements IAdgroupWifigroupService{
+
+	@Override
+	public AdgroupWifigroup findById(Long id) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int countByParams(Map<String, Object> paramMap) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public List<AdgroupWifigroup> findByParams(Map<String, Object> paramMap,
+			Pager pager) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean add(AdgroupWifigroup t) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean edit(AdgroupWifigroup t) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean updateStatus(List<Long> idList, int status) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	
+}

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

@@ -0,0 +1,54 @@
+package com.cloudcross.ssp.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.model.AdgroupZone;
+import com.cloudcross.ssp.service.IAdgroupZoneService;
+
+
+
+@Service
+public class AdgroupZoneService implements IAdgroupZoneService {
+
+	@Override
+	public AdgroupZone findById(Long id) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int countByParams(Map<String, Object> paramMap) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public List<AdgroupZone> findByParams(Map<String, Object> paramMap,
+			Pager pager) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean add(AdgroupZone t) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean edit(AdgroupZone t) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public boolean updateStatus(List<Long> idList, int status) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+}

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

@@ -51,6 +51,7 @@ import com.cloudcross.ssp.model.Log;
 import com.cloudcross.ssp.model.Order;
 import com.cloudcross.ssp.model.Place;
 import com.cloudcross.ssp.model.Wifi;
+import com.cloudcross.ssp.model.WifiGroupInfo;
 import com.cloudcross.ssp.model.Zone;
 import com.cloudcross.ssp.model.pojo.CampaignPojo;
 import com.cloudcross.ssp.service.IAdGroupPlaceService;
@@ -64,6 +65,7 @@ import com.cloudcross.ssp.service.ILogService;
 import com.cloudcross.ssp.service.IOrderService;
 import com.cloudcross.ssp.service.IPlaceService;
 import com.cloudcross.ssp.service.IWifiService;
+import com.cloudcross.ssp.service.impl.WifiGroupInfoService;
 import com.cloudcross.ssp.service.impl.ZoneService;
 
 
@@ -104,6 +106,9 @@ public class AdGroupController extends SimpleController {
 	private IAdvertiserService advertiserService;
 	@Autowired
 	private ZoneService zoneService;
+	@Autowired
+	private WifiGroupInfoService wifiGroupInfoService;
+	
 	/**
 	 * 投放管理列表页
 	 * 前端需要传递三个参数分别为广告主id(advertiserId),订单id(orderId),活动id(campaginId)
@@ -1860,8 +1865,10 @@ public class AdGroupController extends SimpleController {
 		return this.zoneService.queryZoneByCondition(condition);
 	}
 	
-	/*public List<Place> queryPlaceAll(){
-		
-	}*/
-	
+	public List<WifiGroupInfo> queryWifiGroupInfoByCondition(){
+		Map<String,Object>condition = new HashMap<String,Object>();
+		condition.put("operatorId",getLoginUser().getOperatorId());
+		return this.wifiGroupInfoService.queryWifiGroupInfoByCondition(condition);
+	}
+	 
 }