From 67f1bb10d0907cad0e4f99d13b73232c0476475c Mon Sep 17 00:00:00 2001
From: sheng <2094038054@qq.com>
Date: Mon, 17 Apr 2023 16:44:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8Spring=20Cache=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E5=A5=97=E9=A4=90=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  14 +++++++++++---
 pom.xml                                       |   7 +++++++
 .../cn/edu/hactcm/TakeOutApplication.java     |   2 ++
 src/main/java/cn/edu/hactcm/common/R.java     |   4 +++-
 .../hactcm/cotroller/SetmealController.java   |   5 +++++
 src/main/resources/application.yml            |   3 +++
 target/classes/application.yml                |   3 +++
 .../cn/edu/hactcm/TakeOutApplication.class    | Bin 1219 -> 1278 bytes
 target/classes/cn/edu/hactcm/common/R.class   | Bin 4342 -> 4392 bytes
 .../edu/hactcm/cotroller/DishController.class | Bin 9896 -> 10897 bytes
 10 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 27fd2b3..5447202 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,10 +6,16 @@
   <component name="ChangeListManager">
     <list default="true" id="09a0ab93-8583-4cca-9183-2b28acbb0d2c" name="Changes" comment="redis环境配置">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/edu/hactcm/cotroller/DishController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/edu/hactcm/cotroller/DishController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/edu/hactcm/cotroller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/edu/hactcm/cotroller/UserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/edu/hactcm/TakeOutApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/edu/hactcm/TakeOutApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/edu/hactcm/common/R.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/edu/hactcm/common/R.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/edu/hactcm/cotroller/SetmealController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/edu/hactcm/cotroller/SetmealController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/cn/edu/hactcm/cotroller/UserController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/edu/hactcm/cotroller/UserController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/cn/edu/hactcm/TakeOutApplication.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/edu/hactcm/TakeOutApplication.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/cn/edu/hactcm/common/R.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/cn/edu/hactcm/cotroller/DishController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/edu/hactcm/cotroller/DishController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/cn/edu/hactcm/cotroller/SetmealController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/cn/edu/hactcm/cotroller/SetmealController.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -143,6 +149,8 @@
         <item itemvalue="Spring Boot.TakeOutApplication" />
         <item itemvalue="JUnit.UploadFileTest.testString" />
         <item itemvalue="JUnit.UploadFileTest.testRealPath" />
+        <item itemvalue="Spring Boot.TakeOutApplication" />
+        <item itemvalue="JUnit.UploadFileTest.testString" />
       </list>
     </recent_temporary>
   </component>
diff --git a/pom.xml b/pom.xml
index 65d6531..f76777c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,8 +84,15 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
     </dependencies>
 
+
+
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
diff --git a/src/main/java/cn/edu/hactcm/TakeOutApplication.java b/src/main/java/cn/edu/hactcm/TakeOutApplication.java
index d4cfecf..d8fd211 100644
--- a/src/main/java/cn/edu/hactcm/TakeOutApplication.java
+++ b/src/main/java/cn/edu/hactcm/TakeOutApplication.java
@@ -5,11 +5,13 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cache.annotation.EnableCaching;
 
 @Slf4j
 @SpringBootApplication
 @ServletComponentScan("cn.edu.hactcm.filter")
 @MapperScan("cn.edu.hactcm.mapper")
+@EnableCaching//开启Spring Cache 注解方式的缓存功能
 public class TakeOutApplication {
     public static void main(String[] args) {
         SpringApplication.run(TakeOutApplication.class, args);
diff --git a/src/main/java/cn/edu/hactcm/common/R.java b/src/main/java/cn/edu/hactcm/common/R.java
index 4bcaaa7..6d14877 100644
--- a/src/main/java/cn/edu/hactcm/common/R.java
+++ b/src/main/java/cn/edu/hactcm/common/R.java
@@ -1,6 +1,8 @@
 package cn.edu.hactcm.common;
 
 import lombok.Data;
+
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -9,7 +11,7 @@ import java.util.Map;
  * @param <T>
  */
 @Data
-public class R<T> {
+public class R<T> implements Serializable {
 
     private Integer code; //编码：1成功，0和其它数字为失败
 
diff --git a/src/main/java/cn/edu/hactcm/cotroller/SetmealController.java b/src/main/java/cn/edu/hactcm/cotroller/SetmealController.java
index a41fd42..f9eb826 100644
--- a/src/main/java/cn/edu/hactcm/cotroller/SetmealController.java
+++ b/src/main/java/cn/edu/hactcm/cotroller/SetmealController.java
@@ -12,6 +12,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -38,6 +40,7 @@ public class SetmealController {
      */
     @PostMapping
     @Transactional
+    @CacheEvict(value = "setmealCache",allEntries = true)
     public R<String> saveMealDish(@RequestBody SetmealDto setmealDto){
         setmealService.saveWithDish(setmealDto);
         return R.success("添加成功！");
@@ -78,6 +81,7 @@ public class SetmealController {
      * @return
      */
     @DeleteMapping
+    @CacheEvict(value = "setmealCache",allEntries = true)
     public R<String> deleteWithDish(@RequestParam List<Long> ids){
         setmealService.removeWithDish(ids);
         return R.success("删除成功");
@@ -89,6 +93,7 @@ public class SetmealController {
      * @return
      */
     @GetMapping("/list")
+    @Cacheable(value = "setmealCache",key = "#setmeal.categoryId+'_'+#setmeal.status")
     public R<List<Setmeal>> get(Setmeal setmeal){
 
         Long categoryId = setmeal.getCategoryId();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0aa8245..6727c77 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,6 +14,9 @@ spring:
     host: localhost
     port: 6379
     database: 0
+  cache:
+    redis:
+      time-to-live: 1800000 #设置缓存数据的过期时间
 mybatis-plus:
   configuration:
     #在映射实体或者属性时，将数据库中表名和字段名中的下划线去掉，按照驼峰命名法映射
diff --git a/target/classes/application.yml b/target/classes/application.yml
index 0aa8245..6727c77 100644
--- a/target/classes/application.yml
+++ b/target/classes/application.yml
@@ -14,6 +14,9 @@ spring:
     host: localhost
     port: 6379
     database: 0
+  cache:
+    redis:
+      time-to-live: 1800000 #设置缓存数据的过期时间
 mybatis-plus:
   configuration:
     #在映射实体或者属性时，将数据库中表名和字段名中的下划线去掉，按照驼峰命名法映射
diff --git a/target/classes/cn/edu/hactcm/TakeOutApplication.class b/target/classes/cn/edu/hactcm/TakeOutApplication.class
index b462b700c941b8b2909efedcb77357cd8e3fe038..86bc30a575723d2cf18b015732be518817e45cbc 100644
GIT binary patch
delta 200
zcmX|*y-vbV07lQfG?dl`1I9$;r-J+_R*ST<FcJsC<jg`P1e%b`0I%V6pM<zExUl&`
zZp1q=os(}l-_bca!SCtt1H=qmax`r2U7EBUB<&oX3m$lM>GEU~>;p??1hM`Q*Zw@2
zuNGmV)Ml6L(v1q=Rr0xBjLe*><xuxzH~Z}ILa1lb&-XlD>Dxq}X}x`a$yA6-{g)X#
m1#F5GxYA>561gUPV-875+!{8pC>vG~RHuk7HT<*RQHOt+EFtLt

delta 132
zcmWm7OAf(60D$4YV`4gEJQ^EBh<DYfR~<qeMBKt1X5k!SXJNz2AsnSqtAF?XxqfN)
z$sbQ3V{Zr<D29d+V~t=EGOaKpHq1#Bi<^_epF~o2mL;jbihgZnS+h}WEjzONTbzTS
e>Qi~pbrcOEB7c#`<{xYoBSD)^(H<rLmE9l20~4<R

diff --git a/target/classes/cn/edu/hactcm/common/R.class b/target/classes/cn/edu/hactcm/common/R.class
index a24036ad6ef6bcf5697e96acf5ec83fc2ecb37b7..d0316799c23aebf0670c85cc8f38a39ed32cde96 100644
GIT binary patch
literal 4392
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
Lowb3QdaC~y{XH0X

literal 4342
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

diff --git a/target/classes/cn/edu/hactcm/cotroller/DishController.class b/target/classes/cn/edu/hactcm/cotroller/DishController.class
index aa12676654fc393d0119931d8e1c00ec77920338..1c7bd28845491b9c87c0acc439185bdeb1a63c2a 100644
GIT binary patch
literal 10897
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
HIlVsvFoQQ#

delta 4185
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