|
@@ -4,6 +4,7 @@ import javax.annotation.Resource;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
import com.caimei.modules.baike.dao.CmBaikeProductDao;
|
|
import com.caimei.modules.baike.dao.CmBaikeProductDao;
|
|
import com.caimei.modules.baike.dao.CmBaikeProductRecommendDao;
|
|
import com.caimei.modules.baike.dao.CmBaikeProductRecommendDao;
|
|
import com.caimei.modules.baike.dao.CmBaikeTypeDao;
|
|
import com.caimei.modules.baike.dao.CmBaikeTypeDao;
|
|
@@ -12,9 +13,12 @@ import com.caimei.modules.baike.service.CmBaikeTypeService;
|
|
import com.caimei.modules.info.dao.InfoDao;
|
|
import com.caimei.modules.info.dao.InfoDao;
|
|
import com.caimei.modules.opensearch.GenerateUtils;
|
|
import com.caimei.modules.opensearch.GenerateUtils;
|
|
import com.caimei.modules.oss.utils.OSSUtils;
|
|
import com.caimei.modules.oss.utils.OSSUtils;
|
|
|
|
+import com.caimei.modules.product.dao.KeywordFrequencyDao;
|
|
import com.caimei.modules.product.entity.CmProductRecommend;
|
|
import com.caimei.modules.product.entity.CmProductRecommend;
|
|
import com.caimei.modules.product.entity.Product;
|
|
import com.caimei.modules.product.entity.Product;
|
|
|
|
+import com.caimei.modules.product.entity.SearchFrequencyVo;
|
|
import com.caimei.modules.user.entity.NewCmShop;
|
|
import com.caimei.modules.user.entity.NewCmShop;
|
|
|
|
+import com.caimei.redis.RedisService;
|
|
import com.caimei.utils.AppUtils;
|
|
import com.caimei.utils.AppUtils;
|
|
import com.google.common.collect.Maps;
|
|
import com.google.common.collect.Maps;
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
@@ -65,6 +69,12 @@ public class CmBaikeProductController extends BaseController {
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
private InfoDao infoDao;
|
|
private InfoDao infoDao;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ private RedisService redisService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ private KeywordFrequencyDao keywordFrequencyDao;
|
|
|
|
|
|
@ModelAttribute
|
|
@ModelAttribute
|
|
public CmBaikeProduct get(@RequestParam(required=false) String id) {
|
|
public CmBaikeProduct get(@RequestParam(required=false) String id) {
|
|
@@ -132,10 +142,18 @@ public class CmBaikeProductController extends BaseController {
|
|
cmBaikeProduct.setShopList(shopList);
|
|
cmBaikeProduct.setShopList(shopList);
|
|
// 敏感词
|
|
// 敏感词
|
|
String sensitiveWords = infoDao.getSensitiveWords(4);
|
|
String sensitiveWords = infoDao.getSensitiveWords(4);
|
|
|
|
+ //先从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("cmBaikeProduct", cmBaikeProduct);
|
|
model.addAttribute("cmBaikeProduct", cmBaikeProduct);
|
|
model.addAttribute("typeList", typeList);
|
|
model.addAttribute("typeList", typeList);
|
|
model.addAttribute("commodityType", commodityType);
|
|
model.addAttribute("commodityType", commodityType);
|
|
model.addAttribute("sensitiveWords", sensitiveWords);
|
|
model.addAttribute("sensitiveWords", sensitiveWords);
|
|
|
|
+ model.addAttribute("SearchFrequencyVo",searchFrequencyVos);
|
|
return "modules/baikePage/cmBaikeProductForm";
|
|
return "modules/baikePage/cmBaikeProductForm";
|
|
}
|
|
}
|
|
|
|
|