diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddArticleTagsFormDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddArticleTagsFormDTO.java new file mode 100644 index 0000000000..06c5b49ab8 --- /dev/null +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/AddArticleTagsFormDTO.java @@ -0,0 +1,60 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @CreateTime 2020/6/5 17:36 + */ +@Data +public class AddArticleTagsFormDTO implements Serializable { + + private static final long serialVersionUID = -6009661699565102279L; + + /** + * 主键ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 文章ID + */ + private String articleId; + + /** + * 标签ID + */ + private String tagId; + + /** + * 标签名称 + */ + private String tagName; + + /** + * 删除标识 0.未删除 1.已删除 + */ + private Integer delFlag = 0; + + /** + * 乐观锁 + */ + private Integer revision = 0; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 更新人 + */ + private String updatedBy; +} diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java index cc255c2c0e..041f642be9 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java @@ -137,4 +137,11 @@ public interface ArticleDao extends BaseDao { * @date 2020.06.03 18:28 **/ ArticleDetailResultDTO selectArticleDetail(@Param("gridId")String gridId,@Param("articleId")String articleId); + + /** + * @Description 根据draftId获取文章id + * @param draftId + * @author zxc + */ + String getArticleIdByDraftId(@Param("draftId")String draftId); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleTagsDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleTagsDao.java index 44852adba8..4bba49e743 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleTagsDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleTagsDao.java @@ -18,8 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.AddArticleTagsFormDTO; import com.epmet.entity.ArticleTagsEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 文章标签表 @@ -29,5 +33,12 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ArticleTagsDao extends BaseDao { + + /** + * @Description 插入文章标签 + * @param addArticleTags + * @author zxc + */ + void addArticleTags(@Param("addArticleTags")List addArticleTags); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index da87570a85..36f47c9fc0 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -107,6 +107,10 @@ public class ArticleServiceImpl extends BaseServiceImpl addArticleTags = new ArrayList<>(); + List tagsInfo = formDto.getTagsInfo(); + DraftDTO draft = draftService.get(draftId); + String customerId = draft.getCustomerId(); + String userId = tokenDto.getUserId(); + String articleId = articleDao.getArticleIdByDraftId(draftId); + for (UpdateTagUseCountsResultDTO resultDTO : tagsInfo) { + AddArticleTagsFormDTO addArticleTag = new AddArticleTagsFormDTO(); + addArticleTag.setCreatedBy(userId); + addArticleTag.setUpdatedBy(userId); + addArticleTag.setCustomerId(customerId); + addArticleTag.setArticleId(articleId); + BeanUtils.copyProperties(resultDTO,addArticleTag); + addArticleTags.add(addArticleTag); + } + articleTagsDao.addArticleTags(addArticleTags); + } } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml index 08abf54b28..d1066b44f6 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml @@ -313,4 +313,19 @@ AND art.ID = #{articleId} ORDER BY content2.ORDER_NUM ASC + + + + \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleTagsDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleTagsDao.xml index d4dcad3ce6..974966df8c 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleTagsDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleTagsDao.xml @@ -3,5 +3,14 @@ + + \ No newline at end of file