Merge remote-tracking branch 'remotes/origin/developer' into developerB

src/main/java/com/caimei/modules/opensearch/GenerateUtils.java

@@ -2,6 +2,8 @@ package com.caimei.modules.opensearch;
 
 import com.thinkgem.jeesite.common.config.Global;
 import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -17,9 +19,10 @@ public class GenerateUtils {
         // 获取www服务器地址
         String wwwServer = Global.getConfig("wwwServer");
         RestTemplate restTemplate = new RestTemplate();
+        MultiValueMap<String, Integer> paramMap = new LinkedMultiValueMap<>();
         String uri = wwwServer + "/generate/home";
         // 发起Post请求
-        String result = restTemplate.postForObject(uri, null, String.class);
+        String result = restTemplate.postForObject(uri, paramMap, String.class);
         System.out.println("生成www静态首页：" + result);
     }
 

src/main/java/com/caimei/modules/product/web/CmSecondHandDetailController.java

@@ -14,6 +14,7 @@ import com.caimei.modules.product.service.CmSecondHandTransactionService;
 import com.caimei.modules.product.service.ProductNewService;
 import com.caimei.modules.sys.utils.UploadImageUtils;
 import com.caimei.po.ProductImage;
+import com.caimei.redis.RedisService;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.Encodes;
@@ -60,6 +61,8 @@ public class CmSecondHandDetailController extends BaseController {
     private ProductNewService productNewService;
     @Autowired
     private ProductNewDao productNewDao;
+    @Autowired
+    private RedisService redisService;
 
     @ModelAttribute
     public CmSecondHandDetail get(@RequestParam(required = false) String id) {
@@ -357,6 +360,8 @@ public class CmSecondHandDetailController extends BaseController {
             redirectAttributes.addAttribute("searchBrandID", cmSecondHandDetail.getSearchBrandID());
             redirectAttributes.addAttribute("searchPreferredFlag", cmSecondHandDetail.getSearchPreferredFlag());
         }
+        // 有数据变动时需要清除缓存
+        cleanRedisCache();
         return "redirect:" + Global.getAdminPath() + "/product/new/list?searchProductCategory=2";
     }
 
@@ -402,7 +407,18 @@ public class CmSecondHandDetailController extends BaseController {
     public String delete(CmSecondHandDetail cmSecondHandDetail, RedirectAttributes redirectAttributes) {
         cmSecondHandDetailService.delete(cmSecondHandDetail);
         addMessage(redirectAttributes, "删除成功");
+        // 有数据变动时需要清除缓存
+        cleanRedisCache();
         return "redirect:" + Global.getAdminPath() + "/product/cmSecondHandDetail/?repage";
     }
 
+    /**
+     * 有数据变动时需要清除缓存
+     */
+    public void cleanRedisCache() {
+        // 首页缓存
+        String homeData = "getHomeData*";
+        redisService.removePattern(homeData);
+        redisService.removePattern("getHomeCommodityData*");
+    }
 }

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -12,6 +12,7 @@ import com.caimei.modules.user.entity.CmUserOrganize;
 import com.caimei.modules.user.service.CmUserOrganizeService;
 import com.caimei.po.ProductImage;
 import com.caimei.po.ProductLadderPrice;
+import com.caimei.redis.RedisService;
 import com.caimei.utils.AppUtils;
 import com.caimei.vo.JsonModel;
 import com.google.common.collect.Maps;
@@ -69,6 +70,8 @@ public class ProductNewController extends BaseController {
     private CmBrandService cmBrandService;
     @Resource
     private CmSecondHandDetailService cmSecondHandDetailService;
+    @Autowired
+    private RedisService redisService;
 
     @ModelAttribute
     public Product get(@RequestParam(required = false) String id) {
@@ -324,7 +327,6 @@ public class ProductNewController extends BaseController {
         addMessage(redirectAttributes, "保存商品成功");
         // 更新索引
         searchUitls.updateProductIndex(product.getProductID());
-
         String editFlag = product.getEditFlag();
         if (StringUtils.equals("1", editFlag)) {
             redirectAttributes.addAttribute("id", product.getId());
@@ -342,7 +344,8 @@ public class ProductNewController extends BaseController {
             redirectAttributes.addAttribute("searchPreferredFlag", product.getSearchPreferredFlag());
             redirectAttributes.addAttribute("searchProductCategory", product.getSearchProductCategory());
         }
-
+        // 有数据变动时需要清除缓存
+        cleanRedisCache();
         return "redirect:" + Global.getAdminPath() + "/product/new/list/";
     }
 
@@ -475,6 +478,8 @@ public class ProductNewController extends BaseController {
         redirectAttributes.addAttribute("searchBrandID", product.getSearchBrandID());
         redirectAttributes.addAttribute("searchPreferredFlag", product.getSearchPreferredFlag());
         redirectAttributes.addAttribute("searchProductCategory", product.getSearchProductCategory());
+        // 有数据变动时需要清除缓存
+        cleanRedisCache();
         return "redirect:" + Global.getAdminPath() + "/product/new/list/";
     }
 
@@ -595,6 +600,8 @@ public class ProductNewController extends BaseController {
             map.put("msg", "操作成功");
             // 更新索引
             searchUitls.updateProductIndex(productID);
+            // 有数据变动时需要清除缓存
+            cleanRedisCache();
         } catch (Exception e) {
             logger.debug(e.toString(), e);
             map.put("success", false);
@@ -851,6 +858,14 @@ public class ProductNewController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/product/new/recommend?id=" + productID;
     }
 
-
+    /**
+     * 有数据变动时需要清除缓存
+     */
+    public void cleanRedisCache() {
+        // 首页缓存
+        String homeData = "getHomeData*";
+        redisService.removePattern(homeData);
+        redisService.removePattern("getHomeCommodityData*");
+    }
 }