创意中心修改

Signed-off-by: jiapeng.dong <jiapeng.dong@cloudcross.com>

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

@@ -121,26 +121,18 @@ public class BannerTemplateController extends SimpleController {
 	@RequestMapping("/list")
 	public String list(Model model, 
 			@RequestParam Map<String, Object> paramMap,
-			@RequestParam(defaultValue = "1") int page,
-			@RequestParam(required = false) Integer width,
-			@RequestParam(required = false) Integer height,
-			@RequestParam(required = false) Integer type,
-			@RequestParam(required = false) Integer status,
-			HttpServletRequest request) {
-		HttpSession session = request.getSession();
+			@RequestParam(defaultValue = "1") int page
+			//HttpServletRequest request
+			) {
+		//HttpSession session = request.getSession();
 		model.addAttribute("width", paramMap.get("width"));
 		model.addAttribute("height", paramMap.get("height"));
 		model.addAttribute("type", paramMap.get("type"));
 		model.addAttribute("status", paramMap.get("status"));
+		model.addAttribute("advertiserId",paramMap.get("advertiserId"));
 		Account loginUser = getLoginUser();
 		Long agentId = loginUser.getAgentId();
 		paramMap.put("agentId", agentId);
-		Long advertiserId = loginUser.getAdvertiserId();
-		if (advertiserId == 0){
-			paramMap.put("advertiserId", null);
-		}else{
-			paramMap.put("advertiserId", advertiserId);
-		}
 		// 根据广告策略名模糊统计符合条件的策略总数
 		int totalRow = bannerTemplateService.countByParams2(paramMap);
 		// 查询符合条件的广告策略
@@ -153,7 +145,6 @@ public class BannerTemplateController extends SimpleController {
 		model.addAllAttributes(paramMap);
 		model.addAttribute("pager", pager);
 		model.addAttribute("bannerTemplateList", bannerTemplateList);
-		model.addAttribute("sessionid",session.getId());
 		return page("list");
 	}
 

src/main/webapp/WEB-INF/pages/advertiser/main/ad/banner-template/index.ftl

@@ -8,6 +8,7 @@
 	<link rel="stylesheet" href="${ctx}/assets/advertiser/css/banner-template-list.css"/>
 	<!--Include Required Prerequisites js-->
 	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
+	
 <style>
 
     .replace-file {
@@ -89,7 +90,7 @@ width:90px
 
        <div id="searchBar" >
          	<div>
-	           <button href="${ctx}/advertiser/main/ad/banner-template/upload" >创建创意</button>
+	           <button href="${ctx}/advertiser/main/ad/banner-template/upload" >创建创意素材</button>
 	           <button href="${ctx}/advertiser/main/ad/banner-template/enable">批量开启</button>
 	           <button href="${ctx}/advertiser/main/ad/banner-template/disable">批量停用</button>
 	           <button href="${ctx}/advertiser/main/ad/banner-template/delete" >批量删除</button>
@@ -303,8 +304,13 @@ width:90px
 						});
 					}
 				} else {
-					console.log(_url);
+					selectValue = $("#selectedAdvertiserId").val();
+					if(selectValue != -1){
+						alert($("#selectedAdvertiserId").val())
 					$('#fileupload_input').trigger('click');
+					}else{
+						alert("请选择广告主");
+					}
 				}
 		});
 		
@@ -331,7 +337,8 @@ $(function () {
     $("#fileupload_input").fileupload({
     	autoUpload: true,
 	    url:"${ctx}/advertiser/main/ad/banner-template/upload",//文件上传地址，当然也可以直接写在input的data-url属性内
-	    //formData:{param1:"p1",param2:"p2"},//如果需要额外添加参数可以在这里添加
+	    formData:{advertiserId:$('#selectedAdvertiserId').val()},
+	    //如果需要额外添加参数可以在这里添加
 	    done:function(e,data){
 	    	alert(data.result);
 	        //done方法就是上传完毕的回调函数，其他回调函数可以自行查看api
@@ -345,6 +352,7 @@ $(function () {
 
 });
 </script>
+
 <!-- 以下实现下拉框联动,以及表格数据联动 -->
 <script type="text/javascript">
 	//给下拉列表框准备数据