Merge remote-tracking branch 'refs/remotes/origin/dev'

schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/controller/SchisandraShareCircleController.java

@@ -35,9 +35,9 @@ public class SchisandraShareCircleController {
             if (log.isInfoEnabled()) {
                 log.info("SchisandraShareCircleController.add.dto:{}", JSON.toJSONString(schisandraShareCircleDTO));
             }
-            Preconditions.checkNotNull(schisandraShareCircleDTO.getName(), "不能为空");
+            Preconditions.checkNotNull(schisandraShareCircleDTO.getName(), "名称不能为空");
-            Preconditions.checkNotNull(schisandraShareCircleDTO.getIcon(), "不能为空");
+            Preconditions.checkNotNull(schisandraShareCircleDTO.getIcon(), "图标不能为空");
-            Preconditions.checkNotNull(schisandraShareCircleDTO.getDescription(), "不能为空");
+            Preconditions.checkNotNull(schisandraShareCircleDTO.getDescription(), "描述不能为空");
             SchisandraShareCircleBO SchisandraShareCircleBO = SchisandraShareCircleDTOConverter.INSTANCE.convertDTOToBO(schisandraShareCircleDTO);
             return Result.ok(schisandraShareCircleDomainService.add(SchisandraShareCircleBO));
         } catch (Exception e) {

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

@@ -27,11 +27,25 @@ public class SchisandraShareDetailController {
     @Resource
     private SchisandraShareDetailDomainService schisandraShareDetailDomainService;
 
-
-
     /**
-     *查询详细信息
+     * 新增分享详细信息
+     * @param schisandraShareDetailDTO
+     * @return
      */
+     @PostMapping("add_detail")
+     public Result addDetail(@RequestBody SchisandraShareDetailDTO schisandraShareDetailDTO) {
+         Preconditions.checkNotNull(schisandraShareDetailDTO.getTitle(),"标题不能为空");
+         Preconditions.checkNotNull(schisandraShareDetailDTO.getIcon(),"图标不能为空");
+         Preconditions.checkNotNull(schisandraShareDetailDTO.getDescription(),"摘要不能为空");
+
+         SchisandraShareDetailBO schisandraShareDetailBO = SchisandraShareDetailDTOConverter.INSTANCE.convertDTOToBO(schisandraShareDetailDTO);
+         return Result.ok(schisandraShareDetailDomainService.addDetail(schisandraShareDetailBO));
+     }
+
+
+     /**
+      * 查询分享详细信息
+      */
     @PostMapping("get_detail")
     public Result selectDetail(@RequestParam("Id") Long Id){
         SchisandraShareDetailBO resultList = schisandraShareDetailDomainService.getDetailsById(Id);

schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareDetailDTO.java

@@ -1,5 +1,7 @@
 package com.schisandra.share.application.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.schisandra.share.domain.bo.SchisandraShareUrlBO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -78,6 +80,8 @@ public class SchisandraShareDetailDTO implements Serializable {
     /**
      * 创建时间
      */
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date createdTime;
 
     /**
@@ -88,6 +92,7 @@ public class SchisandraShareDetailDTO implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date updateTime;
 
     /**
@@ -95,11 +100,13 @@ public class SchisandraShareDetailDTO implements Serializable {
      */
     private Integer isDeleted;
 
-    List<SchisandraShareTagsDTO> tags;
-
     private String nickname;
 
     private String avatar;
 
+    List<SchisandraShareTagsDTO> tags;
+
+    List<SchisandraShareUrlDTO> urls;
+
 }
 

schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareTagsDTO.java

@@ -1,5 +1,6 @@
 package com.schisandra.share.application.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -42,6 +43,8 @@ public class SchisandraShareTagsDTO implements Serializable {
     /**
      * 创建时间
      */
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date createdTime;
 
     /**
@@ -52,6 +55,8 @@ public class SchisandraShareTagsDTO implements Serializable {
     /**
      * 更新时间
      */
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date updateTime;
 
     /**

schisandra-cloud-storage-share/schisandra-cloud-storage-share-application/schisandra-cloud-storage-share-application-controller/src/main/java/com/schisandra/share/application/dto/SchisandraShareUrlDTO.java

@@ -1,5 +1,6 @@
 package com.schisandra.share.application.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -57,6 +58,7 @@ public class SchisandraShareUrlDTO implements Serializable {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date createdTime;
 
     /**
@@ -67,6 +69,7 @@ public class SchisandraShareUrlDTO implements Serializable {
     /**
      * 更新时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date updateTime;
 
     /**

schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareTagsBOConverter.java

@@ -22,4 +22,5 @@ public interface SchisandraShareTagsBOConverter {
     SchisandraShareTagsBO convertEntityToBO(SchisandraShareTags schisandraShareTags);
     List<SchisandraShareTagsBO> convertEntityToBOList(List<SchisandraShareTags> schisandraShareTagList);
 
+    List<SchisandraShareTags> convertBOToEntityList(List<SchisandraShareTagsBO> tagsList);
 }

schisandra-cloud-storage-share/schisandra-cloud-storage-share-domain/src/main/java/com/schisandra/share/domain/convert/SchisandraShareUrlBOConverter.java

@@ -1,6 +1,8 @@
 package com.schisandra.share.domain.convert;
 
+import com.schisandra.share.domain.bo.SchisandraShareTagsBO;
 import com.schisandra.share.domain.bo.SchisandraShareUrlBO;
+import com.schisandra.share.infra.basic.entity.SchisandraShareTags;
 import com.schisandra.share.infra.basic.entity.SchisandraShareUrl;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -22,4 +24,6 @@ public interface SchisandraShareUrlBOConverter {
     SchisandraShareUrlBO convertEntityToBO(SchisandraShareUrl schisandraShareUrl);
 
     List<SchisandraShareUrlBO> convertEntityToBOList(List<SchisandraShareUrl> schisandraShareUrlS);
+
+    List<SchisandraShareUrl> convertBOToEntityList(List<SchisandraShareUrlBO> urlsList);
 }

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

@@ -30,4 +30,6 @@ public interface SchisandraShareDetailDomainService {
     List<SchisandraShareDetailBO> list(Long circleId);
 
     SchisandraShareDetailBO getDetailsById(Long Id);
+
+    Boolean addDetail(SchisandraShareDetailBO schisandraShareDetailBO);
 }

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

@@ -29,7 +29,7 @@ public class SchisandraShareCircleDomainServiceImpl implements SchisandraShareCi
     private SchisandraShareCircleService schisandraShareCircleService;
 
     @Resource
-    UserRpc userInfoRpc;
+    UserRpc userRpc;
 
     @Override
     public Boolean add(SchisandraShareCircleBO schisandraShareCircleBO) {
@@ -63,7 +63,7 @@ public class SchisandraShareCircleDomainServiceImpl implements SchisandraShareCi
         ArrayList<SchisandraShareCircleBO> arrayList = new ArrayList<>();
         for (SchisandraShareCircleBO schisandraShareCircleBO : schisandraShareCircleBO_list) {
             SchisandraShareCircleBO shareCircleBO = new SchisandraShareCircleBO();
-            AuthUserInfoEntity info = userInfoRpc.getUserInfo(schisandraShareCircleBO.getUserId());
+            AuthUserInfoEntity info = userRpc.getUserInfo(schisandraShareCircleBO.getUserId());
             shareCircleBO.setUserId(schisandraShareCircleBO.getUserId());
             shareCircleBO.setParentId(schisandraShareCircleBO.getParentId());
             shareCircleBO.setId(schisandraShareCircleBO.getId());

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

@@ -121,4 +121,33 @@ public class SchisandraShareDetailDomainServiceImpl implements SchisandraShareDe
 
         return schisandraShareDetailBO;
     }
+
+    @Override
+    public Boolean addDetail(SchisandraShareDetailBO schisandraShareDetailBO) {
+        SchisandraShareDetail schisandraShareDetail = SchisandraShareDetailBOConverter.INSTANCE.convertBOToEntity(schisandraShareDetailBO);
+        int insert = schisandraShareDetailService.insert(schisandraShareDetail);
+
+        List<SchisandraShareTagsBO> tags_list = schisandraShareDetailBO.getTags();
+        List<SchisandraShareTags> tags = SchisandraShareTagsBOConverter.INSTANCE.convertBOToEntityList(tags_list);
+        schisandraShareTagsService.insertBatch(tags);
+        for (SchisandraShareTags tag : tags) {
+            SchisandraShareDetailTag schisandraShareDetailTag = new SchisandraShareDetailTag();
+            schisandraShareDetailTag.setTagId(tag.getId());
+            schisandraShareDetailTag.setDetailId(schisandraShareDetail.getId());
+            schisandraShareDetailTagService.insert(schisandraShareDetailTag);
+        }
+
+
+        List<SchisandraShareUrlBO> urls_list = schisandraShareDetailBO.getUrls();
+        List<SchisandraShareUrl> urls = SchisandraShareUrlBOConverter.INSTANCE.convertBOToEntityList(urls_list);
+        schisandraShareUrlService.insertBatch(urls);
+        for (SchisandraShareUrl url : urls) {
+            SchisandraShareUrlDetail schisandraShareUrlDetail = new SchisandraShareUrlDetail();
+            schisandraShareUrlDetail.setUrlId(url.getId());
+            schisandraShareUrlDetail.setDetailId(schisandraShareDetail.getId());
+            schisandraShareUrlDetailService.insert(schisandraShareUrlDetail);
+        }
+        return insert>0;
+    }
+
 }

schisandra-cloud-storage-share/schisandra-cloud-storage-share-infra/src/main/java/com/schisandra/share/infra/basic/entity/SchisandraShareCircle.java

@@ -1,5 +1,6 @@
 package com.schisandra.share.infra.basic.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
@@ -84,6 +85,7 @@ public class SchisandraShareCircle implements Serializable {
      * 创建时间
      */
     @Column("created_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date createdTime;
 
     /**
@@ -96,6 +98,7 @@ public class SchisandraShareCircle implements Serializable {
      * 更新时间
      */
     @Column("update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
     private Date updateTime;
 
     /**

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

@@ -46,4 +46,6 @@ public interface SchisandraShareTagsService {
 
 
     List<SchisandraShareTags> queryByIds(List<Long> tagIds);
+
+    int insertBatch(List<SchisandraShareTags> schisandraShareTags);
 }

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

@@ -46,4 +46,6 @@ public interface SchisandraShareUrlService {
 
 
     List<SchisandraShareUrl> queryByIds(List<Long> Ids);
+
+    int insertBatch(List<SchisandraShareUrl> schisandraShareUrls);
 }

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

@@ -16,7 +16,6 @@ import java.util.List;
  */
 @Service("SchisandraShareTagsService")
 public class SchisandraShareTagsServiceImpl implements SchisandraShareTagsService {
-
     @Resource
     private SchisandraShareTagsDao schisandraShareTagsDao;
 
@@ -69,5 +68,10 @@ public class SchisandraShareTagsServiceImpl implements SchisandraShareTagsServic
         return this.schisandraShareTagsDao.selectListByIds(tagIds);
     }
 
+    @Override
+    public int insertBatch(List<SchisandraShareTags> schisandraShareTags) {
+        return this.schisandraShareTagsDao.insertBatch(schisandraShareTags);
+    }
+
 
 }

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

@@ -69,4 +69,11 @@ public class SchisandraShareUrlServiceImpl implements SchisandraShareUrlService
     public List<SchisandraShareUrl> queryByIds(List<Long> Ids) {
         return this.schisandraShareUrlDao.selectListByIds(Ids);
     }
+
+    @Override
+    public int insertBatch(List<SchisandraShareUrl> schisandraShareUrls) {
+        return this.schisandraShareUrlDao.insertBatch(schisandraShareUrls);
+    }
+
+
 }