|
@@ -90,9 +90,7 @@ public class BannerTemplateController extends SimpleController {
|
|
|
|
|
|
@RequestMapping
|
|
@RequestMapping
|
|
public String index(Model model,
|
|
public String index(Model model,
|
|
- @RequestParam Map<String, Object> paramMap,
|
|
|
|
- HttpServletRequest request) {
|
|
|
|
- HttpSession session = request.getSession();
|
|
|
|
|
|
+ @RequestParam Map<String, Object> paramMap) {
|
|
// 查询符合条件的广告策略
|
|
// 查询符合条件的广告策略
|
|
Account loginUser = getLoginUser();
|
|
Account loginUser = getLoginUser();
|
|
Long agentId = loginUser.getAgentId();
|
|
Long agentId = loginUser.getAgentId();
|
|
@@ -109,7 +107,6 @@ public class BannerTemplateController extends SimpleController {
|
|
model.addAttribute("bannerTemplateList", bannerTemplateList);
|
|
model.addAttribute("bannerTemplateList", bannerTemplateList);
|
|
model.addAttribute("sizeList", sizeList);
|
|
model.addAttribute("sizeList", sizeList);
|
|
model.addAttribute("pager", pager);
|
|
model.addAttribute("pager", pager);
|
|
- model.addAttribute("sessionid",session.getId());
|
|
|
|
return page("index");
|
|
return page("index");
|
|
}
|
|
}
|
|
|
|
|
|
@@ -217,7 +214,7 @@ public class BannerTemplateController extends SimpleController {
|
|
|
|
|
|
@RequestMapping(value="/upload")
|
|
@RequestMapping(value="/upload")
|
|
|
|
|
|
- public @ResponseBody String upload(Model model,HttpServletResponse response,HttpServletRequest request) throws IOException{
|
|
|
|
|
|
+ public @ResponseBody String upload(Model model,HttpServletResponse response,HttpServletRequest request,Long advertiserId) throws IOException{
|
|
String uploadName;
|
|
String uploadName;
|
|
String fileType;
|
|
String fileType;
|
|
//文件路径
|
|
//文件路径
|
|
@@ -227,7 +224,6 @@ public class BannerTemplateController extends SimpleController {
|
|
String responseStr="null";
|
|
String responseStr="null";
|
|
Account loginUser = getLoginUser();
|
|
Account loginUser = getLoginUser();
|
|
Long agentId = loginUser.getAgentId();
|
|
Long agentId = loginUser.getAgentId();
|
|
- Long advertiserId = loginUser.getAdvertiserId();
|
|
|
|
|
|
|
|
if(request.getMethod()=="POST"){
|
|
if(request.getMethod()=="POST"){
|
|
|
|
|
|
@@ -373,13 +369,13 @@ public class BannerTemplateController extends SimpleController {
|
|
bannerTemplate.setType(judgeType(fileType));
|
|
bannerTemplate.setType(judgeType(fileType));
|
|
//更新素材
|
|
//更新素材
|
|
bannerTemplateService.edit(bannerTemplate);
|
|
bannerTemplateService.edit(bannerTemplate);
|
|
- responseStr="upload success";
|
|
|
|
|
|
+ responseStr="上传成功";
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}catch(IOException e){
|
|
}catch(IOException e){
|
|
|
|
|
|
- responseStr="upload failed";
|
|
|
|
|
|
+ responseStr="上传失败";
|
|
return responseStr;
|
|
return responseStr;
|
|
}
|
|
}
|
|
}
|
|
}
|