|
@@ -150,13 +150,13 @@ public class IndexController {
|
|
modelAndView.addObject("site",site);
|
|
modelAndView.addObject("site",site);
|
|
return modelAndView;
|
|
return modelAndView;
|
|
}
|
|
}
|
|
- //ccmj搜索
|
|
|
|
|
|
+ //搜索
|
|
@RequestMapping("/searchFor")
|
|
@RequestMapping("/searchFor")
|
|
public ModelAndView SearchTitleFor(String type, String lmid, String keyword, String siteId, @RequestParam(value = "number",defaultValue = "1") Integer pageNumber){
|
|
public ModelAndView SearchTitleFor(String type, String lmid, String keyword, String siteId, @RequestParam(value = "number",defaultValue = "1") Integer pageNumber){
|
|
- ModelAndView modelAndView=new ModelAndView("www/ccmj/listss");
|
|
|
|
- Map<String,Object>map=new HashMap<String, Object>(3);
|
|
|
|
|
|
+ ModelAndView modelAndView=new ModelAndView("www/tuiyijunren/listForSearch");
|
|
|
|
+ Map<String,Object>map=new HashMap<>(3);
|
|
map.put("type",type);
|
|
map.put("type",type);
|
|
- if(!lmid.equals("0")){
|
|
|
|
|
|
+ if(lmid != null && !lmid.equals("0")){
|
|
map.put("categoryId",lmid);
|
|
map.put("categoryId",lmid);
|
|
}
|
|
}
|
|
map.put("keyword",keyword);
|
|
map.put("keyword",keyword);
|
|
@@ -172,32 +172,6 @@ public class IndexController {
|
|
return modelAndView;
|
|
return modelAndView;
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- //spdxx搜索
|
|
|
|
- @RequestMapping("/searchFors")
|
|
|
|
- public ModelAndView SearchTitleFors(String keyword, String siteId, @RequestParam(value = "number", defaultValue = "1") Integer pageNumber) {
|
|
|
|
- ModelAndView modelAndView = new ModelAndView("www/spdx/listss");
|
|
|
|
- Map<String, Object> map = new HashMap<String, Object>(4);
|
|
|
|
- map.put("keyword", keyword);
|
|
|
|
- map.put("type", "title");
|
|
|
|
- map.put("status", 1); // 添加status为1的条件
|
|
|
|
-
|
|
|
|
- PageInfo<TCmsContent> tCmsContentPageInfo = contentService.SearchTitleFor(pageNumber, map);
|
|
|
|
- TCmsSite site = new TCmsSite();
|
|
|
|
- site.setSiteId(Integer.parseInt(siteId));
|
|
|
|
- modelAndView.addObject("model", tCmsContentPageInfo);
|
|
|
|
- modelAndView.addObject("frontPath", httpProtocol + "://" + host + ":" + port + "/" + siteName + "/" + sitePrefix);
|
|
|
|
- modelAndView.addObject("resPath", httpProtocol + "://" + host + ":" + port + "/" + siteName + "/static/www");
|
|
|
|
- modelAndView.addObject("keyword", keyword);
|
|
|
|
- modelAndView.addObject("siteId", siteId);
|
|
|
|
- modelAndView.addObject("site", site);
|
|
|
|
- return modelAndView;
|
|
|
|
- }
|
|
|
|
-// @RequestMapping("/ceshi")
|
|
|
|
-// public ModelAndView ceTitleshi(String ceshi1, String ceshi2 ,String ceshi3, @RequestParam(value="number",defaultValue="1") Integer pageNumber){
|
|
|
|
-// Map<String,Object>map=new HashMap<String, Object>
|
|
|
|
-// }
|
|
|
|
/**
|
|
/**
|
|
* 站点首页
|
|
* 站点首页
|
|
* @param siteId
|
|
* @param siteId
|