From 7e3de7fd955f76e55c7d46681b4ac5f2b4748bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=BA=E6=98=8E=20=E6=B2=88?= <2431685932@qq.com>
Date: Sat, 20 Jul 2024 11:07:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=94=E5=9B=9E=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E4=BF=AE=E5=A4=8D,=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SchisandraShareDetailController.java      | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailController.java b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailController.java
index c1ec84e..f821049 100644
--- a/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailController.java
+++ b/schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareDetailController.java
@@ -38,14 +38,14 @@ public class SchisandraShareDetailController {
      */
     @GetMapping("mydetail")
     public Result mydetail(@RequestParam("userId") String userId) {
-        try {
-            List<SchisandraShareDetailBO> result = (List<SchisandraShareDetailBO>) caffeineUtil
-                    .caffeineBuild().getIfPresent("mydetail" + userId);
-            caffeineUtil.caffeineBuild().put("mydetail" + userId, result);
-            return Result.ok(SchisandraShareDetailDTOConverter.INSTANCE.convertBOToDTOList(schisandraShareDetailDomainService.mydetail(userId)));
-        } catch (Exception e) {
-            return Result.fail(e.getMessage());
+        List<SchisandraShareDetailBO> result = (List<SchisandraShareDetailBO>) caffeineUtil
+                .caffeineBuild().getIfPresent("mydetail" + userId);
+        if(result == null) {
+            result = schisandraShareDetailDomainService.mydetail(userId);
+            caffeineUtil.caffeineBuild().put("list" + userId, result);
+            return Result.ok(SchisandraShareDetailDTOConverter.INSTANCE.convertBOToDTOList(result));
         }
+        return Result.ok(result);
     }
 
     /**
@@ -92,10 +92,12 @@ public class SchisandraShareDetailController {
     public Result<List<SchisandraShareDetailDTO>> selectCircleList(@RequestParam("circleId") String circleId) {
         List<SchisandraShareDetailBO> result = (List<SchisandraShareDetailBO>) caffeineUtil
                 .caffeineBuild().getIfPresent("list" + circleId);
-        List<SchisandraShareDetailBO> resultList = schisandraShareDetailDomainService.list(circleId);
-        caffeineUtil.caffeineBuild().put("list" + circleId, resultList);
-        List<SchisandraShareDetailDTO> schisandraShareDetailDTOS = SchisandraShareDetailDTOConverter.INSTANCE.convertBOToDTOList(resultList);
-        return Result.ok(schisandraShareDetailDTOS);
+        if(result == null){
+            result = schisandraShareDetailDomainService.list(circleId);
+            caffeineUtil.caffeineBuild().put("list" + circleId, result);
+            return Result.ok(SchisandraShareDetailDTOConverter.INSTANCE.convertBOToDTOList(result));
+        }
+        return Result.ok(result);
     }
 
     /**
@@ -115,8 +117,10 @@ public class SchisandraShareDetailController {
             Preconditions.checkNotNull(schisandraShareDetailDTO.getDescription(), "描述不能为空");
             Preconditions.checkNotNull(schisandraShareDetailDTO.getContent(), "内容不能为空");
             SchisandraShareDetailBO SchisandraShareDetailBO = SchisandraShareDetailDTOConverter.INSTANCE.convertDTOToBO(schisandraShareDetailDTO);
-            caffeineUtil.caffeineBuild().invalidate("list" + schisandraShareDetailDTO.getCircleId());
-            caffeineUtil.caffeineBuild().invalidate("mydetail" + schisandraShareDetailDTO.getUserId());
+            if(schisandraShareDetailDomainService.add(SchisandraShareDetailBO)){
+                caffeineUtil.caffeineBuild().invalidate("list" + schisandraShareDetailDTO.getCircleId());
+                caffeineUtil.caffeineBuild().invalidate("mydetail" + schisandraShareDetailDTO.getUserId());
+            }
             return Result.ok(schisandraShareDetailDomainService.add(SchisandraShareDetailBO));
         } catch (Exception e) {
             log.error("SchisandraShareDetailController.register.error:{}", e.getMessage(), e);
@@ -172,8 +176,10 @@ public class SchisandraShareDetailController {
             }
             Preconditions.checkNotNull(schisandraShareDetailDTO.getId(), "详情id不能为空");
             SchisandraShareDetailBO schisandraShareDetailBO = SchisandraShareDetailDTOConverter.INSTANCE.convertDTOToBO(schisandraShareDetailDTO);
-            caffeineUtil.caffeineBuild().invalidate("list" + schisandraShareDetailDTO.getCircleId());
-            caffeineUtil.caffeineBuild().invalidate("mydetail" + schisandraShareDetailDTO.getUserId());
+            if(schisandraShareDetailDomainService.delete(schisandraShareDetailBO)){
+                caffeineUtil.caffeineBuild().invalidate("list" + schisandraShareDetailDTO.getCircleId());
+                caffeineUtil.caffeineBuild().invalidate("mydetail" + schisandraShareDetailDTO.getUserId());
+            }
             return Result.ok(schisandraShareDetailDomainService.delete(schisandraShareDetailBO));
         } catch (Exception e) {
             log.error("SchisandraShareDetailController.delete.error:{}", e.getMessage(), e);