Merge remote-tracking branch 'origin/dev' into dev

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

@@ -28,6 +28,15 @@ public class SchisandraShareDetailController {
     @Resource
     private SchisandraShareDetailDomainService schisandraShareDetailDomainService;
 
+    @GetMapping("mydetail")
+    public Result mydetail(@RequestParam("userId") String userId) {
+        try{
+            return Result.ok(SchisandraShareDetailDTOConverter.INSTANCE.convertBOToDTOList(schisandraShareDetailDomainService.mydetail(userId)));
+        } catch (Exception e) {
+            return Result.fail(e.getMessage());
+        }
+    }
+
     /**
      * 新增分享详细信息
      * @param schisandraShareDetailDTO

schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/SchisandraShareDetailDomainService.java

@@ -32,4 +32,6 @@ public interface SchisandraShareDetailDomainService {
     SchisandraShareDetailBO getDetailsById(String Id);
 
     Boolean addDetail(SchisandraShareDetailBO schisandraShareDetailBO);
+
+    List<SchisandraShareDetailBO> mydetail(String userId);
 }

schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/service/impl/SchisandraShareDetailDomainServiceImpl.java

@@ -150,4 +150,9 @@ public class SchisandraShareDetailDomainServiceImpl implements SchisandraShareDe
         return insert>0;
     }
 
+    @Override
+    public List<SchisandraShareDetailBO> mydetail(String userId) {
+        return SchisandraShareDetailBOConverter.INSTANCE.convertEntityToBOList(schisandraShareDetailService.queryByuserId(userId));
+    }
+
 }

schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/SchisandraShareDetailService.java

@@ -46,4 +46,6 @@ public interface SchisandraShareDetailService {
 
 
     List<SchisandraShareDetail> queryByCircleId(String circleId);
+
+    List<SchisandraShareDetail> queryByuserId(String userId);
 }

schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/service/impl/SchisandraShareDetailServiceImpl.java

@@ -70,5 +70,8 @@ public class SchisandraShareDetailServiceImpl implements SchisandraShareDetailSe
         return this.schisandraShareDetailDao.selectListByCondition(SchisandraShareDetailTableDef.SCHISANDRA_SHARE_DETAIL.CIRCLE_ID.eq(circleId));
     }
 
-
+    @Override
+    public List<SchisandraShareDetail> queryByuserId(String userId) {
+        return this.schisandraShareDetailDao.selectListByCondition(SchisandraShareDetailTableDef.SCHISANDRA_SHARE_DETAIL.CIRCLE_ID.eq(userId));
+    }
 }