楼层清除缓存

src/main/java/com/caimei/modules/cmpage/web/CmPageCentreController.java

@@ -111,13 +111,8 @@ public class CmPageCentreController extends BaseController {
         }
         cmPageCentreService.save(cmPageCentre);
         addMessage(redirectAttributes, "保存成功");
-        if ("5".equals(cmPageCentre.getType())) {
-            //清除产品仪器缓存
-            cleanRedisCache();
-        } else {
-            //清除活动专题缓存
-            redisService.removePattern("getPageFloorData*");
-        }
+        //清除产品仪器缓存
+        cleanRedisCache();
         return "redirect:" + Global.getAdminPath() + "/cmpage/cmPageCentre/?pageId=" + cmPageCentre.getPageId() + "&type=" + cmPageCentre.getType();
     }
 
@@ -125,13 +120,8 @@ public class CmPageCentreController extends BaseController {
     @RequestMapping(value = "delete")
     public String delete(CmPageCentre cmPageCentre, RedirectAttributes redirectAttributes) {
         cmPageCentreService.delete(cmPageCentre);
-        if ("5".equals(cmPageCentre.getType())) {
-            //清除产品仪器缓存
-            cleanRedisCache();
-        } else {
-            //清除活动专题缓存
-            redisService.removePattern("getPageFloorData*");
-        }
+        //清除缓存
+        cleanRedisCache();
         addMessage(redirectAttributes, "删除成功");
         return "redirect:" + Global.getAdminPath() + "/cmpage/cmPageCentre/?pageId=" + cmPageCentre.getPageId() + "&type=" + cmPageCentre.getType();
     }
@@ -216,8 +206,6 @@ public class CmPageCentreController extends BaseController {
             }
             //清除产品仪器缓存
             cleanRedisCache();
-            //清除活动专题缓存
-            redisService.removePattern("activityData*");
             map.put("success", true);
             map.put("msg", "更新排序成功");
             return map;
@@ -251,6 +239,10 @@ public class CmPageCentreController extends BaseController {
         // 重新生成静态产品仪器页
         generateUtils.generateProductType(286);
         generateUtils.generateProductType(287);
+        //清除活动专题缓存
+        redisService.removePattern("getPageFloorData*");
+        //清除活动专题缓存
+        redisService.removePattern("activityData*");
     }
 
 }

src/main/java/com/caimei/modules/cmpage/web/CmPageController.java

@@ -155,16 +155,14 @@ public class CmPageController extends BaseController {
                     }
                 }
             }
+        }
 
+        cleanRedisCache();
 
-        }
         addMessage(redirectAttributes, "保存成功");
         if ("2".equals(cmPage.getType())) {
             // 更新索引
             coreServiceUitls.updateEquipmentIndex(Integer.parseInt(cmPage.getId()));
-        } else {
-            //清除活动专题缓存
-            redisService.removePattern("getPageFloorData*");
         }
         if (StringUtils.equals("1", cmPage.getFlag())) { // 1讲师设置页面
             return "redirect:" + Global.getAdminPath() + "/cmpage/cmPage/form?id=1";
@@ -179,6 +177,7 @@ public class CmPageController extends BaseController {
     @RequestMapping(value = "delete")
     public String delete(CmPage cmPage, RedirectAttributes redirectAttributes) {
         cmPageService.delete(cmPage);
+        cleanRedisCache();
         addMessage(redirectAttributes, "删除成功");
         return "redirect:" + Global.getAdminPath() + "/cmpage/cmPage?flag=2";
     }
@@ -192,6 +191,7 @@ public class CmPageController extends BaseController {
             cmPageService.updateEnabledStatusByIds(enabledStatus, ids);
             map.put("success", true);
             map.put("msg", "修改成功");
+            cleanRedisCache();
         } catch (Exception e) {
             logger.debug(e.toString(), e);
             map.put("success", false);
@@ -232,6 +232,8 @@ public class CmPageController extends BaseController {
         if (redisService.exists(getSearchHotWord)) {
             redisService.remove(getSearchHotWord);
         }
+        //清除活动专题缓存
+        redisService.removePattern("getPageFloorData*");
         //清除产品仪器缓存
         redisService.removePattern("instrumentData*");
         redisService.removePattern("insCommodityData*");

src/main/java/com/caimei/modules/newhome/web/NewPageFloorController.java

@@ -308,17 +308,12 @@ public class NewPageFloorController extends BaseController {
         if (floorContent.getFloorId() != null) {
             return "redirect:" + Global.getAdminPath() + "/newhome/newPageFloor/?repage";
         } else if (StringUtils.isNotBlank(floorContent.getFormType())) {
-            //清除活动专题缓存
-            redisService.removePattern("getPageFloorData*");
             if (floorContent.getRedirectFlag() == 1) {
                 return "redirect:" + Global.getAdminPath() + "/cmpage/cmPageCentre/?pageId=" + floorContent.getPageId() + "&type=" + floorContent.getFormType();
             } else {
                 return "redirect:" + Global.getAdminPath() + "/cmpage/cmPageCentre/goContentPage?centreId=" + floorContent.getCentreId() + "&pageId=" + floorContent.getPageId() + "&type=" + floorContent.getFormType();
             }
         } else {
-            //清除产品仪器缓存
-            redisService.removePattern("instrumentData*");
-            redisService.removePattern("insCommodityData*");
             return "redirect:" + Global.getAdminPath() + "/cmpage/cmPageCentre/?pageId=" + floorContent.getPageId() + "&type=5";
         }
     }
@@ -332,6 +327,11 @@ public class NewPageFloorController extends BaseController {
      * 有数据变动时需要清除缓存
      */
     public void cleanRedisCache() {
+        //清除活动专题缓存
+        redisService.removePattern("getPageFloorData*");
+        //清除产品仪器缓存
+        redisService.removePattern("instrumentData*");
+        redisService.removePattern("insCommodityData*");
         //首页缓存
         String homeData = "getHomeData*";
         redisService.removePattern(homeData);