|
@@ -248,7 +248,7 @@ public class ProductNewController extends BaseController {
|
|
|
model.addAttribute("brandList", brandList);
|
|
|
model.addAttribute("classify", classify);
|
|
|
model.addAttribute("page", page);
|
|
|
- model.addAttribute("product",product);
|
|
|
+ model.addAttribute("product", product);
|
|
|
//搜索条件保存
|
|
|
/*model.addAttribute("searchShopName", product.getShopName());
|
|
|
model.addAttribute("searchName", product.getName());
|
|
@@ -405,14 +405,10 @@ public class ProductNewController extends BaseController {
|
|
|
}
|
|
|
List<SplitCode> splitCodeList = productNewDao.findSplitCode(product.getShopID());
|
|
|
//先从reids中获取keyword值,不存在时在查询数据库
|
|
|
- List<SearchFrequencyVo> searchFrequencyVos=new ArrayList<>();
|
|
|
- if(redisService.getExpireTime("keyword")>0){
|
|
|
- searchFrequencyVos= JSONArray.parseArray(redisService.get("keyword").toString(),SearchFrequencyVo.class);
|
|
|
- }else{
|
|
|
- searchFrequencyVos = keywordFrequencyDao.getKeywordList();
|
|
|
- }
|
|
|
- model.addAttribute("splitCodeList",splitCodeList);
|
|
|
- model.addAttribute("SearchFrequencyVo",searchFrequencyVos);
|
|
|
+ List<SearchFrequencyVo> searchFrequencyVos = new ArrayList<>();
|
|
|
+ searchFrequencyVos = keywordFrequencyDao.getKeywordList();
|
|
|
+ model.addAttribute("splitCodeList", splitCodeList);
|
|
|
+ model.addAttribute("SearchFrequencyVo", searchFrequencyVos);
|
|
|
model.addAttribute("combinationList", combinationList);
|
|
|
model.addAttribute("brandList", brandList);
|
|
|
model.addAttribute("shopList", shopList);
|