fix: 套餐包分类缓存修改

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

@@ -86,10 +86,10 @@ public class FsPackageCateController extends BaseController
     public AjaxResult add(@RequestBody FsPackageCate fsPackageCate)
     {
         fsPackageCateService.insertFsPackageCate(fsPackageCate);
-        Collection<String> keys = redisCache.keys("getPackagCateList*");
-        for (String key : keys) {
-            redisCache.deleteObject(key);
-        }
+//        Collection<String> keys = redisCache.keys("getPackagCateList*");
+//        for (String key : keys) {
+//            redisCache.deleteObject(key);
+//        }
         return toAjax(1);
     }
 
@@ -102,10 +102,10 @@ public class FsPackageCateController extends BaseController
     public AjaxResult edit(@RequestBody FsPackageCate fsPackageCate)
     {
         fsPackageCateService.updateFsPackageCate(fsPackageCate);
-        Collection<String> keys = redisCache.keys("getPackagCateList*");
-        for (String key : keys) {
-            redisCache.deleteObject(key);
-        }
+//        Collection<String> keys = redisCache.keys("getPackagCateList*");
+//        for (String key : keys) {
+//            redisCache.deleteObject(key);
+//        }
         return toAjax(1);
     }
 

fs-service/src/main/java/com/fs/his/mapper/FsPackageMapper.java

@@ -117,7 +117,7 @@ public interface FsPackageMapper
             "<if test = 'maps.diseaseType != null and maps.diseaseType !=0    '> " +
             "and p.disease_type = #{maps.diseaseType} " +
             "</if>" +
-            "<if test = 'maps.privateType != null and maps.privateType !=0    '> " +
+            "<if test = 'maps.privateType != null'> " +
             "and p.private_type = #{maps.privateType} " +
             "</if>" +
             "<if test = 'maps.isShow != null '> " +

fs-service/src/main/java/com/fs/his/param/FsPackageCateUParam.java

@@ -41,4 +41,7 @@ public class FsPackageCateUParam implements Serializable
 
     private List<Integer> companyPackageCates;
 
+    private Long companyUserId;
+
+
 }

fs-service/src/main/java/com/fs/his/service/impl/FsPackageCateServiceImpl.java

@@ -10,6 +10,7 @@ import com.fs.his.param.FsPackageCateUParam;
 import com.fs.his.vo.OptionsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import com.fs.his.mapper.FsPackageCateMapper;
 import com.fs.his.domain.FsPackageCate;
@@ -46,6 +47,7 @@ public class FsPackageCateServiceImpl implements IFsPackageCateService
      * @return 套餐包分类
      */
     @Override
+    @Cacheable(value = "getPackagCateList", key = "#param")
     public List<FsPackageCate> selectFsPackageCateList(FsPackageCateUParam param)
     {
         return fsPackageCateMapper.selectFsPackageCateList(param);
@@ -58,7 +60,7 @@ public class FsPackageCateServiceImpl implements IFsPackageCateService
      * @return 结果
      */
     @Override
-    @CacheEvict(value = "getPackageList", allEntries = true)
+    @CacheEvict(value = {"getPackageList","getPackagCateList"}, allEntries = true)
     public int insertFsPackageCate(FsPackageCate fsPackageCate)
     {
         Long cateCode = fsPackageCate.getCateCode();
@@ -77,7 +79,7 @@ public class FsPackageCateServiceImpl implements IFsPackageCateService
      * @return 结果
      */
     @Override
-    @CacheEvict(value = "getPackageList", allEntries = true)
+    @CacheEvict(value = {"getPackageList","getPackagCateList"}, allEntries = true)
     public int updateFsPackageCate(FsPackageCate fsPackageCate)
     {
         Long cateCode = fsPackageCate.getCateCode();
@@ -96,7 +98,7 @@ public class FsPackageCateServiceImpl implements IFsPackageCateService
      * @return 结果
      */
     @Override
-    @CacheEvict(value = "getPackageList", allEntries = true)
+    @CacheEvict(value = {"getPackageList","getPackagCateList"}, allEntries = true)
     public int deleteFsPackageCateByCateIds(Long[] cateIds)
     {
         return fsPackageCateMapper.deleteFsPackageCateByCateIds(cateIds);
@@ -109,7 +111,7 @@ public class FsPackageCateServiceImpl implements IFsPackageCateService
      * @return 结果
      */
     @Override
-    @CacheEvict(value = "getPackageList", allEntries = true)
+    @CacheEvict(value = {"getPackageList","getPackagCateList"}, allEntries = true)
     public int deleteFsPackageCateByCateId(Long cateId)
     {
         return fsPackageCateMapper.deleteFsPackageCateByCateId(cateId);

fs-service/src/main/java/com/fs/his/service/impl/FsPackageServiceImpl.java

@@ -26,6 +26,8 @@ import com.fs.system.oss.OSSFactory;
 import com.fs.system.service.ISysConfigService;
 import net.coobird.thumbnailator.Thumbnails;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import com.fs.his.mapper.FsPackageMapper;
 import com.fs.his.domain.FsPackage;
@@ -75,6 +77,7 @@ public class FsPackageServiceImpl implements IFsPackageService {
      * @return 结果
      */
     @Override
+    @CacheEvict(value = "getPackageList",allEntries = true)
     public int insertFsPackage(FsPackage fsPackage) {
 
         fsPackage.setCreateTime(DateUtils.getNowDate());
@@ -105,6 +108,7 @@ public class FsPackageServiceImpl implements IFsPackageService {
      * @return 结果
      */
     @Override
+    @CacheEvict(value = "getPackageList",allEntries = true)
     public int updateFsPackage(FsPackage fsPackage) {
         fsPackage.setUpdateTime(DateUtils.getNowDate());
 //        if (fsPackage.getPackageSubType() != null && fsPackage.getPackageSubType() != 1) {
@@ -136,6 +140,7 @@ public class FsPackageServiceImpl implements IFsPackageService {
      * @return 结果
      */
     @Override
+    @CacheEvict(value = "getPackageList",allEntries = true)
     public int deleteFsPackageByPackageIds(Long[] packageIds) {
 
         return fsPackageMapper.deleteFsPackageByPackageIds(packageIds);
@@ -233,6 +238,7 @@ public class FsPackageServiceImpl implements IFsPackageService {
     }
 
     @Override
+    @Cacheable(value = "getPackageList", key = "#param")
     public List<FsPackageListUVO> selectFsPackageListUVO(FsPackageListUParam param) {
         return fsPackageMapper.selectFsPackageListUVO(param);
     }
@@ -243,6 +249,7 @@ public class FsPackageServiceImpl implements IFsPackageService {
     }
 
     @Override
+    @CacheEvict(value = "getPackageList",allEntries = true)
     public int updatePackagesStatus(Long[] packageIds, Long status) {
         return fsPackageMapper.updatePackagesStatus(packageIds, status);
     }

fs-user-app/src/main/java/com/fs/app/controller/PackageController.java

@@ -67,9 +67,9 @@ public class PackageController extends AppBaseController {
     private ICompanyService companyService;
 
     @ApiOperation("获取套餐分类")
-    @Cacheable(value = "getPackagCateList", key = "#param")
     @GetMapping("/getPackagCateList")
     public R getPackagCateList(FsPackageCateUParam param) {
+        log.info("获取套餐分类: {} ",param);
         try {
             ObjectMapper objectMapper = new ObjectMapper();
             Long companyUserId = getCompanyUserId();
@@ -80,6 +80,7 @@ public class PackageController extends AppBaseController {
             if (param.getType()==2){
                 param.setCompanyPackageCates(cateIdList);
             }
+            param.setCompanyUserId(companyUserId);
         } catch (Exception e) {
             log.info("获取套餐分类:销售未登录");
         } finally {
@@ -90,7 +91,6 @@ public class PackageController extends AppBaseController {
     }
 
     @ApiOperation("获取套餐列表")
-    @Cacheable(value = "getPackageList", key = "#param")
     @GetMapping("/getPackageList")
     public R getPackageList(FsPackageListUParam param) {
         PageHelper.startPage(param.getPageNum(), param.getPageSize());