fix：缓存

fs-admin/src/main/java/com/fs/api/controller/IndexStatisticsController.java

@@ -64,6 +64,9 @@ public class IndexStatisticsController {
     @GetMapping("/trafficLog")
     public R getTrafficLog(){
         TrafficLogDTO trafficLogDTO = redisCache.getCacheObject(DATA_OVERVIEW_TRAFFIC_LOG);
+        if(trafficLogDTO == null) {
+            return null;
+        }
         SysConfig sysConfig = sysConfigService.selectConfigByConfigKey("redPacket.Traffic.config");
         String configValue = sysConfig.getConfigValue();
         trafficLogDTO.setTraffic(configValue);

fs-admin/src/main/java/com/fs/his/controller/FsDoctorArticleCateController.java

@@ -1,7 +1,9 @@
 package com.fs.his.controller;
 
+import java.util.Collection;
 import java.util.List;
 
+import com.fs.common.core.redis.RedisCache;
 import com.fs.his.vo.OptionsVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,8 @@ public class FsDoctorArticleCateController extends BaseController
 {
     @Autowired
     private IFsDoctorArticleCateService fsDoctorArticleCateService;
+    @Autowired
+    RedisCache redisCache;
 
     /**
      * 查询医生文章分类列表
@@ -78,7 +82,12 @@ public class FsDoctorArticleCateController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsDoctorArticleCate fsDoctorArticleCate)
     {
-        return toAjax(fsDoctorArticleCateService.insertFsDoctorArticleCate(fsDoctorArticleCate));
+        int i = fsDoctorArticleCateService.insertFsDoctorArticleCate(fsDoctorArticleCate);
+        Collection<String> keys = redisCache.keys("getDoctorArticleCateList*");
+        for (String key : keys) {
+            redisCache.deleteObject(key);
+        }
+        return toAjax(i);
     }
 
     /**
@@ -89,7 +98,12 @@ public class FsDoctorArticleCateController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody FsDoctorArticleCate fsDoctorArticleCate)
     {
-        return toAjax(fsDoctorArticleCateService.updateFsDoctorArticleCate(fsDoctorArticleCate));
+        int i = fsDoctorArticleCateService.updateFsDoctorArticleCate(fsDoctorArticleCate);
+        Collection<String> keys = redisCache.keys("getDoctorArticleCateList*");
+        for (String key : keys) {
+            redisCache.deleteObject(key);
+        }
+        return toAjax(i);
     }
 
     /**
@@ -100,7 +114,12 @@ public class FsDoctorArticleCateController extends BaseController
 	@DeleteMapping("/{cateIds}")
     public AjaxResult remove(@PathVariable Long[] cateIds)
     {
-        return toAjax(fsDoctorArticleCateService.deleteFsDoctorArticleCateByCateIds(cateIds));
+        int i = fsDoctorArticleCateService.deleteFsDoctorArticleCateByCateIds(cateIds);
+        Collection<String> keys = redisCache.keys("getDoctorArticleCateList*");
+        for (String key : keys) {
+            redisCache.deleteObject(key);
+        }
+        return toAjax(i);
     }
 
     @GetMapping("/allList")

fs-admin/src/main/java/com/fs/his/controller/FsDoctorArticleController.java

@@ -114,6 +114,11 @@ public class FsDoctorArticleController extends BaseController
 	@DeleteMapping("/{articleIds}")
     public AjaxResult remove(@PathVariable Long[] articleIds)
     {
-        return toAjax(fsDoctorArticleService.deleteFsDoctorArticleByArticleIds(articleIds));
+        int i = fsDoctorArticleService.deleteFsDoctorArticleByArticleIds(articleIds);
+        Collection<String> keys = redisCache.keys("getDoctorArticleList*");
+        for (String key : keys) {
+            redisCache.deleteObject(key);
+        }
+        return toAjax(i);
     }
 }

fs-company/src/main/java/com/fs/company/controller/store/FsPackageController.java

@@ -9,6 +9,7 @@ import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.his.domain.FsPackage;
 import com.fs.his.param.FsPackageParam;
 import com.fs.his.service.IFsPackageService;
+import com.fs.his.utils.RedisCacheUtil;
 import com.fs.his.vo.FsPackageExcelVO;
 import com.fs.his.vo.FsPackageListVO;
 import com.fs.his.vo.OptionsVO;
@@ -31,6 +32,9 @@ public class FsPackageController extends BaseController
     @Autowired
     private IFsPackageService fsPackageService;
 
+    @Autowired
+    RedisCacheUtil redisCacheUtil;
+
     /**
      * 查询套餐包列表
      */
@@ -71,7 +75,10 @@ public class FsPackageController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsPackage fsPackage)
     {
-        return toAjax(fsPackageService.insertFsPackage(fsPackage));
+        int i = fsPackageService.insertFsPackage(fsPackage);
+        redisCacheUtil.delRedisKey("getPackageList");
+        redisCacheUtil.delRedisKey("getPackageById");
+        return toAjax(i);
     }
 
     /**
@@ -82,7 +89,10 @@ public class FsPackageController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody FsPackage fsPackage)
     {
-        return toAjax(fsPackageService.updateFsPackage(fsPackage));
+        int i = fsPackageService.updateFsPackage(fsPackage);
+        redisCacheUtil.delRedisKey("getPackageList");
+        redisCacheUtil.delRedisKey("getPackageById");
+        return toAjax(i);
     }
 
     /**

fs-doctor-app/src/main/java/com/fs/app/controller/DoctorArticleController.java

@@ -32,10 +32,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 
@@ -88,6 +85,10 @@ public class DoctorArticleController extends  AppBaseController {
         param.setDoctorId(Long.parseLong(getDoctorId()));
         param.setViews(0l);
         if(doctorArticleService.insertFsDoctorArticle(param)>0){
+            Collection<String> keys = redisCache.keys("getDoctorArticleList*");
+            for (String key : keys) {
+                redisCache.deleteObject(key);
+            }
             return R.ok();
         }
         else
@@ -101,6 +102,10 @@ public class DoctorArticleController extends  AppBaseController {
     public R editDoctorArticle(@Validated @RequestBody FsDoctorArticle param, HttpServletRequest request) throws ParseException {
 
         if(doctorArticleService.updateFsDoctorArticle(param)>0){
+            Collection<String> keys = redisCache.keys("getDoctorArticleList*");
+            for (String key : keys) {
+                redisCache.deleteObject(key);
+            }
             return R.ok();
         }
         else
@@ -115,6 +120,10 @@ public class DoctorArticleController extends  AppBaseController {
     public R delStoreNotice(  @RequestBody FsDoctorArticle param, HttpServletRequest request) throws ParseException {
 
         if(doctorArticleService.deleteFsDoctorArticleByArticleId(param.getArticleId())>0){
+            Collection<String> keys = redisCache.keys("getDoctorArticleList*");
+            for (String key : keys) {
+                redisCache.deleteObject(key);
+            }
             return R.ok();
         }
         else