运营商广联代理商素材审核

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

@@ -14,6 +14,8 @@ public class BannerTemplate {
 	private Long agentId;
 	//广告主id
 	private Long advertiserId;
+	//运营商id
+	private Long operatorId;
 	//模板名称
 	private String name;
 	//上传文件路径
@@ -50,6 +52,12 @@ public class BannerTemplate {
 	public void setAdvertiserId(Long advertiserId) {
 		this.advertiserId = advertiserId;
 	}
+	public Long getOperatorId() {
+		return operatorId;
+	}
+	public void setOperatorId(Long operatorId) {
+		this.operatorId = operatorId;
+	}
 	public String getName() {
 		return name;
 	}
@@ -98,7 +106,6 @@ public class BannerTemplate {
 	public void setUpdated(Date updated) {
 		this.updated = updated;
 	}
-	
 	public AuditBanner getBanner() {
 		return banner;
 	}
@@ -108,11 +115,11 @@ public class BannerTemplate {
 	@Override
 	public String toString() {
 		return "BannerTemplate [id=" + id + ", agentId=" + agentId
-				+ ", advertiserId=" + advertiserId + ", name=" + name
-				+ ", path=" + path + ", pathSmall=" + pathSmall + ", type="
-				+ type + ", width=" + width + ", height=" + height
-				+ ", status=" + status + ", updated=" + updated + ", banner="
-				+ banner + "]";
+				+ ", advertiserId=" + advertiserId + ", operatorId="
+				+ operatorId + ", name=" + name + ", path=" + path
+				+ ", pathSmall=" + pathSmall + ", type=" + type + ", width="
+				+ width + ", height=" + height + ", status=" + status
+				+ ", updated=" + updated + ", banner=" + banner + "]";
 	}
-	
+
 }

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

@@ -98,4 +98,13 @@
 			</foreach>
 	</update>
 	
+	<select id="getId" parameterType="long" resultType="long">
+		select 
+		id
+		from t_adv_agent
+		<where>
+			operator_id = #{operatorId}
+		</where>
+	</select>
+	
 </mapper>

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

@@ -250,6 +250,9 @@
 			</otherwise>	
 		</choose>
 		</if>
+		<if test="agentId!=null">
+			and b.agent_id = #{agentId}
+		</if>
 	</select>
 	
 	<select id="findByOpertor" parameterType="HashMap" resultMap="AuditBanner">  
@@ -285,6 +288,9 @@
 			</otherwise>	
 		</choose>
 		</if>
+		<if test="agentId!=null">
+			and b.agent_id = #{agentId}
+		</if>
 	    order by  a.id   desc
 	    <if test="pager!=null">
 		limit #{pager.offset}, #{pager.limit}

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

@@ -5,6 +5,7 @@
 		t_banner_template.id,
 		agent_id as agentId,
 		advertiser_id as advertiserId,
+		operator_id as operatorId,
 		name,
 		path,
 		path_small as pathSmall,
@@ -395,8 +396,8 @@ where banner_template_id in
 	</select>
 	<insert id="addBannerTemplate" parameterType="com.cloudcross.ssp.model.BannerTemplate" useGeneratedKeys="true"
         keyProperty="id">
-insert into t_banner_template (agent_id,advertiser_id,name,path,path_small,type,width,height,status,updated) 
-values(#{agentId},#{advertiserId},#{name},#{path},#{pathSmall},#{type},#{width},#{height},#{status},#{updated})	
+insert into t_banner_template (agent_id,advertiser_id,operator_id,name,path,path_small,type,width,height,status,updated) 
+values(#{agentId},#{advertiserId},#{operatorId},#{name},#{path},#{pathSmall},#{type},#{width},#{height},#{status},#{updated})	
 
 </insert>
 	

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

@@ -8,4 +8,5 @@ import com.cloudcross.ssp.model.AdvAgent;
 public interface IAdvAgentService extends IGenericService<AdvAgent>{
 	public AdvAgent getNew(AdvAgent t);
 	public List<AdvAgent> findAll();
+	public Long getId(Long operatorId);
 }

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

@@ -83,4 +83,10 @@ public class AdvAgentService implements IAdvAgentService, ISelectorProvider {
 						.map();
 	}
 
+	@Override
+	public Long getId(Long operatorId) {
+		return myBatisDao.get("advAgentSqlMapper.getId", operatorId);
+	
+	}
+
 }

src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/BannerTemplateController.java

@@ -233,7 +233,8 @@ public class BannerTemplateController extends SimpleController {
 		int _height;
 		Account loginUser = getLoginUser();
 		Long agentId = loginUser.getAgentId();
-	 
+		Long operatorId = loginUser.getOperatorId();
+ 	 
 	if(request.getMethod()=="POST"){ 
 	
 		//转	换成多部分request    
@@ -317,6 +318,7 @@ public class BannerTemplateController extends SimpleController {
 				bannerTemplate.setStatus(0);
 				bannerTemplate.setAdvertiserId(advertiserId);
 				bannerTemplate.setAgentId(agentId);
+				bannerTemplate.setOperatorId(operatorId);
 			
 				//添加素材
 				bannerTemplateService.add(bannerTemplate);

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

@@ -277,6 +277,8 @@ public class CreateBannerController extends SimpleController{
 		int _width;
 		int _height;
 		Long adGroupId = 1l;
+		Account loginUser = getLoginUser();
+		Long operatorId = loginUser.getOperatorId();
 	 
 	if(request.getMethod()=="POST"){ 
 	
@@ -369,6 +371,7 @@ public class CreateBannerController extends SimpleController{
 				bannerTemplate.setStatus(0);
 				bannerTemplate.setAdvertiserId(advertiserId);
 				bannerTemplate.setAgentId(agentId);
+				bannerTemplate.setOperatorId(operatorId);
 				//添加素材
 				bat.add(bannerTemplate);
 				

src/main/java/com/cloudcross/ssp/web/operator/main/BannerAuditController.java

@@ -22,11 +22,14 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.AdvAgent;
 import com.cloudcross.ssp.model.AuditBanner;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
 import com.cloudcross.ssp.model.Banner;
+import com.cloudcross.ssp.service.IAdvAgentService;
+import com.cloudcross.ssp.service.IAdvertiserService;
 import com.cloudcross.ssp.service.IBannerService;;
 
 /**
@@ -42,6 +45,8 @@ public class BannerAuditController extends SimpleController {
 
 	@Autowired
 	private IBannerService bannerService;
+	@Autowired
+	private IAdvAgentService advAgentService;
 	
 	/*for export excel*/
 	@Autowired
@@ -93,8 +98,11 @@ public class BannerAuditController extends SimpleController {
 			
 		}
 		
+		Account account = getLoginUser();
 		Long operatorId = getLoginUser().getOperatorId();
+		Long agentId= advAgentService.getId(operatorId);
 		paramMap.put("operatorId", operatorId);
+		paramMap.put("agentId", agentId);
 		model.addAttribute("operatorId", operatorId);
 		int totalRow = bannerService.countByOperatorIdandParams(operatorId,paramMap);
 		Pager pager = new Pager();