feat(web): 添加了环境中所有缓存

kt-web/src/main/java/org/matrix/autotest/controller/DynamicVariableController.java

@@ -50,11 +50,11 @@ public class DynamicVariableController {
      */
     @ApiOperation(value = "分页查询动参")
     @GetMapping("/{projectId}")
-    @Cacheable(cacheNames = "connectPageCache",
+    @Cacheable(cacheNames = "dynamicVariablePageCache",
             key = "#pageSize + '_' + #pageNum + '_' + #projectId",
             condition = "#pageNum != null && #pageSize != null",
             unless = "#result.statusCodeValue != 200")
-    public ResponseEntity<CommonResultObj<Page<DynamicVariable>>> findPageConnects(
+    public ResponseEntity<CommonResultObj<Page<DynamicVariable>>> findPageDynamicVariable(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
             @RequestParam(required = false, defaultValue = "") String name,
@@ -76,10 +76,10 @@ public class DynamicVariableController {
     @ApiOperation(value = "添加动态变量")
     @PostMapping
     @Caching(
-            put = {@CachePut(cacheNames = "connectPageCache", key = "#result.body.data.id",
+            put = {@CachePut(cacheNames = "dynamicVariablePageCache", key = "#result.body.data.id",
                     condition = "#p0 != null", unless = "#result.statusCodeValue != 200")
             },
-            evict = {@CacheEvict(cacheNames = "connectPageCache", allEntries = true)}
+            evict = {@CacheEvict(cacheNames = "dynamicVariablePageCache", allEntries = true)}
     )
     public ResponseEntity<CommonResultObj<DynamicVariable>> insertDynamicVariable(@RequestBody DynamicVariable dynamicVariable) {
         return CommonResult.pred(dynamicVariableService::save, dynamicVariable
@@ -95,10 +95,10 @@ public class DynamicVariableController {
     @ApiOperation(value = "修改动态变量")
     @PutMapping
     @Caching(
-            put = {@CachePut(cacheNames = "connectPageCache", key = "#result.body.data.id",
+            put = {@CachePut(cacheNames = "dynamicVariablePageCache", key = "#result.body.data.id",
                     condition = "#p0 != null", unless = "#result.statusCodeValue != 200")
             },
-            evict = {@CacheEvict(cacheNames = "connectPageCache", key = "#p0.id",
+            evict = {@CacheEvict(cacheNames = "dynamicVariablePageCache", key = "#p0.id",
                     condition = "#p0 != null")}
     )
     public ResponseEntity<CommonResultObj<DynamicVariable>> updateDynamicVariable(@RequestBody DynamicVariable dynamicVariable) {
@@ -114,7 +114,7 @@ public class DynamicVariableController {
      */
     @ApiOperation(value = "根据主键id删除动态变量")
     @DeleteMapping("/{id}")
-    @CacheEvict(cacheNames = "connectPageCache", allEntries = true, condition = "#p0 != null")
+    @CacheEvict(cacheNames = "dynamicVariablePageCache", allEntries = true, condition = "#p0 != null")
     public ResponseEntity<CommonResultObj<Long>> deleteDynamicVariable(@PathVariable Long id) {
         return CommonResult.pred(dynamicVariableService::removeById, id
                 , "删除成功", "删除失败或id不存在");

kt-web/src/main/java/org/matrix/autotest/controller/EnvironmentController.java

@@ -9,6 +9,10 @@ import org.matrix.database.entity.Environment;
 import org.matrix.database.service.IEnvironmentService;
 import org.matrix.database.vo.CommonResult;
 import org.matrix.database.vo.CommonResultObj;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cache.annotation.Caching;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -46,10 +50,14 @@ public class EnvironmentController {
      */
     @ApiOperation(value = "分页查询环境")
     @GetMapping("/{projectId}")
-    public ResponseEntity<CommonResultObj<Page<Environment>>> findPageConnects(
+    @Cacheable(cacheNames = "environmentPageCache",
+            key = "#pageSize + '_' + #pageNum + '_' + #projectId",
+            condition = "#pageNum != null && #pageSize != null",
+            unless = "#result.statusCodeValue != 200")
+    public ResponseEntity<CommonResultObj<Page<Environment>>> findPageEnvironment(
             @RequestParam(defaultValue = "10") int pageSize,
             @RequestParam(defaultValue = "1") int pageNum,
-            @RequestParam(required = false,defaultValue = "")String name,
+            @RequestParam(required = false, defaultValue = "") String name,
             @PathVariable Long projectId) {
         Page<Environment> results = Optional.ofNullable(environmentService.page(Page.of(pageNum, pageSize)
                 , Wrappers.lambdaQuery(Environment.class).eq(Environment::getProjectId, projectId)
@@ -67,6 +75,12 @@ public class EnvironmentController {
      */
     @ApiOperation(value = "添加环境")
     @PostMapping
+    @Caching(
+            put = {@CachePut(cacheNames = "environmentPageCache", key = "#result.body.data.id",
+                    condition = "#p0 != null", unless = "#result.statusCodeValue != 200")
+            },
+            evict = {@CacheEvict(cacheNames = "environmentPageCache", allEntries = true)}
+    )
     public ResponseEntity<CommonResultObj<Environment>> insertEnvironment(@RequestBody Environment environment) {
         return CommonResult.pred(environmentService::save, environment
                 , "添加成功", "添加失败");
@@ -80,6 +94,13 @@ public class EnvironmentController {
      */
     @ApiOperation(value = "修改环境")
     @PutMapping
+    @Caching(
+            put = {@CachePut(cacheNames = "environmentPageCache", key = "#result.body.data.id",
+                    condition = "#p0 != null", unless = "#result.statusCodeValue != 200")
+            },
+            evict = {@CacheEvict(cacheNames = "environmentPageCache", key = "#p0.id",
+                    condition = "#p0 != null")}
+    )
     public ResponseEntity<CommonResultObj<Environment>> updateEnvironment(@RequestBody Environment environment) {
         return CommonResult.pred(environmentService::updateById, environment
                 , "修改成功", "修改失败");
@@ -93,6 +114,7 @@ public class EnvironmentController {
      */
     @ApiOperation(value = "根据主键id删除环境")
     @DeleteMapping("/{id}")
+    @CacheEvict(cacheNames = "environmentPageCache", allEntries = true, condition = "#p0 != null")
     public ResponseEntity<CommonResultObj<Long>> deleteEnvironment(@PathVariable Long id) {
         return CommonResult.pred(environmentService::removeById, id
                 , "删除成功", "删除失败或id不存在");