jun.zhou 9 years ago
parent
commit
4c4fac4381

+ 16 - 1
src/main/java/com/cloudcross/ssp/model/AdGroup.java

@@ -85,8 +85,18 @@ public final class AdGroup implements ISelector{
 	
 	private String placeName;
 	
+	private Integer priority;//优先级
 	
 	
+	
+	public Integer getPriority() {
+		return priority;
+	}
+
+	public void setPriority(Integer priority) {
+		this.priority = priority;
+	}
+
 	public String getZoneId() {
 		return zoneId;
 	}
@@ -387,6 +397,8 @@ public final class AdGroup implements ISelector{
 
 	
 
+	
+
 	@Override
 	public String toString() {
 		return "AdGroup [id=" + id + ", agentId=" + agentId + ", advertiserId="
@@ -405,7 +417,10 @@ public final class AdGroup implements ISelector{
 				+ position + ", retarget=" + retarget + ", period=" + period
 				+ ", status=" + status + ", updated=" + updated
 				+ ", bannerNumber=" + bannerNumber + ", site=" + site + ", os="
-				+ os + "]";
+				+ os + ", zoneIdList=" + zoneIdList + ", placeIdList="
+				+ placeIdList + ", wifigroupIdList=" + wifigroupIdList
+				+ ", zoneId=" + zoneId + ", place=" + place + ", placeName="
+				+ placeName + ", priority=" + priority + "]";
 	}
 
 	@Override

+ 4 - 1
src/main/java/com/cloudcross/ssp/model/PlaceOperator.java

@@ -19,7 +19,10 @@ public class PlaceOperator {
 	private Long placeId;
 	//标准场景名称
 	private String placeName;
-	
+	//显示运营商和场景的组合
+	public String getOperatorShowName(){
+		return operatorName+"-"+name;
+	}
 	public String getOperatorName() {
 		return operatorName;
 	}

+ 7 - 0
src/main/java/com/cloudcross/ssp/model/mapper/operator.sql.xml

@@ -112,4 +112,11 @@
 			</foreach>
 	</update>
 	
+	<select id="queryAll" parameterType="java.util.Map" resultType="com.cloudcross.ssp.model.Operator">
+		select id,company_name companyName from t_operator where status != -1 limit #{pager.offset}, #{pager.limit}
+	</select>
+	
+	<select id="queryAllCount" resultType="java.lang.Integer">
+		select count(1) from t_operator
+	</select>
 </mapper>

+ 8 - 0
src/main/java/com/cloudcross/ssp/model/mapper/place-operator.sql.xml

@@ -155,4 +155,12 @@
 		and (tpor.name like #{searchValue} or tp.name like #{searchValue} or tpci.name like #{searchValue})
 		</if>
 	</select>
+	
+	<select id="queryOperatorPlace" parameterType="java.util.Map" resultType="com.cloudcross.ssp.model.PlaceOperator">
+		select tpo.id id,tpo.name name,tor.company_name operatorName,tpo.place_id placeId  from t_place_operator tpo,t_operator tor where tpo.operator_id = tor.id and tor.status != -1 limit #{pager.offset}, #{pager.limit} 
+	</select>
+	
+	<select id="queryOperatorPlaceCount" resultType="java.lang.Integer">
+		select count(1) from t_place_operator tpo,t_operator tor where tpo.operator_id = tor.id and tor.status != -1
+	</select>
 </mapper>

+ 3 - 0
src/main/java/com/cloudcross/ssp/service/IOperatorService.java

@@ -15,4 +15,7 @@ public interface IOperatorService extends IGenericService<Operator>{
 	List<Operator> findByParamsBack(Map<String, Object> paramMap, Pager pager);
 
 	boolean updateStatusBack(List<Long> idList, int status);
+	
+	public List<Operator> queryAllOperator(Map<String,Object>condition);
+	public Integer queryAllOperatorCount();
 }

+ 4 - 0
src/main/java/com/cloudcross/ssp/service/IPlaceOperatorService.java

@@ -70,4 +70,8 @@ public interface IPlaceOperatorService extends IGenericService<PlaceOperator> {
 	public Integer queryPlaceNameCountByCondition(Map<String,Object>condition);
 	
 	public List<PlaceNamePojo> queryPlaceNameByCondition(Map<String,Object>condition,Pager pager);
+	
+	public List<PlaceOperator> queryOperatorPlace(Map<String,Object>map);
+	
+	public Integer queryOperatorPlaceCount();
 }

+ 8 - 0
src/main/java/com/cloudcross/ssp/service/impl/OperatorService.java

@@ -112,4 +112,12 @@ public class OperatorService implements IOperatorService,ISelectorProvider{
 		// TODO Auto-generated method stub
 		return myBatisDao.get("operatorSqlMapper.getNew", o);
 	}
+	
+	public List<Operator> queryAllOperator(Map<String,Object> condition){
+		return myBatisDao.getList("operatorSqlMapper.queryAll", condition);
+	}
+	
+	public Integer queryAllOperatorCount(){
+		return myBatisDao.get("operatorSqlMapper.queryAllCount", null);
+	}
 }

+ 8 - 0
src/main/java/com/cloudcross/ssp/service/impl/PlaceOperatorService.java

@@ -124,5 +124,13 @@ public class PlaceOperatorService implements IPlaceOperatorService{
 	public List<String> findAllPlace() {
 		return myBatisDao.getList("placeOperatorSqlMapper.findAllPlace");
 	}
+	
+	public List<PlaceOperator> queryOperatorPlace(Map<String,Object>map){
+		return myBatisDao.getList("placeOperatorSqlMapper.queryOperatorPlace",map);
+	}
+	
+	public Integer queryOperatorPlaceCount(){
+		return myBatisDao.get("placeOperatorSqlMapper.queryOperatorPlaceCount",null);
+	}
 
 }

+ 108 - 0
src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/target/AdGroupAlloperatorController.java

@@ -0,0 +1,108 @@
+package com.cloudcross.ssp.web.advertiser.main.ad.target;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import com.cloudcross.ssp.base.web.SimpleController;
+import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.Location;
+import com.cloudcross.ssp.model.Operator;
+import com.cloudcross.ssp.model.PlaceOperator;
+import com.cloudcross.ssp.model.pojo.CampaignPojo;
+import com.cloudcross.ssp.service.ICampaignService;
+import com.cloudcross.ssp.service.ILocationService;
+import com.cloudcross.ssp.service.IOperatorService;
+import com.cloudcross.ssp.service.IPlaceOperatorService;
+
+@Controller
+@RequestMapping("/advertiser/main/ad/target/ad-group-alloperator")
+public class AdGroupAlloperatorController extends SimpleController{
+	
+	@Autowired
+	private ICampaignService campaignService;
+	@Autowired
+	private ILocationService locationService;
+	@Autowired
+	private IOperatorService operatorService;
+	@Autowired
+	private IPlaceOperatorService placeOperatorService;
+	
+	@RequestMapping("create")
+	public String create(Model model, @RequestParam Long campaignId) {
+		Account account = getLoginUser();
+		Long operatorId = account.getOperatorId();
+		
+		Map<String,Object> condition = new HashMap<String,Object>();
+		condition.put("operatorId", operatorId);
+		List<Integer> positionList = new ArrayList<Integer>();
+		positionList.add(1);
+		condition.put("positionList", positionList);
+		//List<Zone> zoneList = zoneService.queryZoneByCondition(condition);//获取广告位
+		CampaignPojo campaign = campaignService.findCampaignById(campaignId);
+		//找到所有的场景,并且显示出来
+		//List<PlaceClassInformation> placeList = placeClassInformationService.findAll();
+		
+		
+		model.addAttribute("campaignId", campaignId);
+		model.addAttribute("advertiserId", campaign.getAdvertiserId());	
+		model.addAttribute("orderId", campaign.getOrderId());
+		model.addAttribute("agentId", campaign.getAgentId());
+		model.addAttribute("budget", campaign.getTotalBudget());
+		//model.addAttribute("placeList",placeList);
+		//model.addAttribute("zoneList",zoneList);
+		return page("create");
+	}
+	
+	/**
+	 * 到选择媒体弹窗
+	 * 创建人:周俊
+	 * 创建时间:2015.12.11 17:00
+	 * @return
+	 */
+	@RequestMapping("chooseOperator")
+	public String chooseOperatorWindow(Model model,@RequestParam(defaultValue = "1") int page){
+		Integer count = this.operatorService.queryAllOperatorCount();
+		Pager pager = new Pager();
+		pager.setPage(page);
+		pager.setTotalRow(count);
+		
+		Map<String,Object> condition = new HashMap<String,Object>();
+		condition.put("pager", pager);
+		List<Operator> list = this.operatorService.queryAllOperator(condition);
+		model.addAttribute("pager", pager);
+		model.addAttribute("list", list);
+		return page("operatorwindow");
+	}
+	
+	
+	/**
+	 * 选择媒体场景
+	 * 创建人:周俊
+	 * 创建时间:2015.12.11 17:52
+	 * @return
+	 */
+	@RequestMapping("chooseOperatorPlace")
+	public String chooseOperatorPlaceWindow(Model model,@RequestParam(defaultValue = "1") int page){
+		Integer count = this.placeOperatorService.queryOperatorPlaceCount();
+		Pager pager = new Pager();
+		pager.setPage(page);
+		pager.setTotalRow(count);
+		
+		Map<String,Object> condition = new HashMap<String,Object>();
+		condition.put("pager", pager);
+		List<PlaceOperator> list = this.placeOperatorService.queryOperatorPlace(condition);
+		model.addAttribute("pager", pager);
+		model.addAttribute("list", list);
+		return page("operatorPlaceWindow");
+	}
+}

+ 1 - 1
src/main/resources/application.properties

@@ -6,7 +6,7 @@ global.encoding=UTF-8
 jdbc.driver=com.mysql.jdbc.Driver
 jdbc.username=ssp_test
 jdbc.password=1q2w3e4r
-jdbc.url=jdbc:mysql://10.0.1.200:3306/ssp?useUnicode=true&amp;characterEncoding=UTF-8
+jdbc.url=jdbc:mysql://test.dc.loc:3306/ssp?useUnicode=true&amp;characterEncoding=UTF-8
 
 #mail server setting
 mail.server=smtp.163.com