peihaoyu/forest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎨 标签/专题管理维护功能完善

Browse Source
This commit is contained in:
ronger 2024-03-22 22:45:16 +08:00
parent 58c9a2995d
commit 29894ce631
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/rymcu/forest/entity/Tag.java
View File

@ -3,10 +3,7 @@ package com.rymcu.forest.entity;
import lombok.Data; import lombok.Data;
import javax.persistence.Column; import javax.persistence.*;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
@ -75,4 +72,9 @@ public class Tag implements Serializable, Cloneable {
* 描述 * 描述
*/ */
private String tagDescriptionHtml; private String tagDescriptionHtml;
/**
* 图标类型
*/
@Transient
private transient String tagImageType;
} }

10
src/main/java/com/rymcu/forest/entity/Topic.java
View File

@ -3,10 +3,7 @@ package com.rymcu.forest.entity;
import lombok.Data; import lombok.Data;
import javax.persistence.Column; import javax.persistence.*;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import java.util.Date; import java.util.Date;
/** /**
@ -71,5 +68,10 @@ public class Topic {
* 专题描述 Html * 专题描述 Html
*/ */
private String topicDescriptionHtml; private String topicDescriptionHtml;
/**
* 专题图片类型
*/
@Transient
private transient String topicImageType;
} }

5
src/main/java/com/rymcu/forest/service/impl/TagServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.rymcu.forest.dto.ArticleTagDTO;
import com.rymcu.forest.dto.LabelModel; import com.rymcu.forest.dto.LabelModel;
import com.rymcu.forest.entity.Article; import com.rymcu.forest.entity.Article;
import com.rymcu.forest.entity.Tag; import com.rymcu.forest.entity.Tag;
import com.rymcu.forest.enumerate.FileDataType;
import com.rymcu.forest.enumerate.FilePath; import com.rymcu.forest.enumerate.FilePath;
import com.rymcu.forest.mapper.ArticleMapper; import com.rymcu.forest.mapper.ArticleMapper;
import com.rymcu.forest.mapper.TagMapper; import com.rymcu.forest.mapper.TagMapper;
@ -126,7 +127,7 @@ public class TagServiceImpl extends AbstractService<Tag> implements TagService {
throw new BusinessException("标签 '" + tag.getTagTitle() + "' 已存在!"); throw new BusinessException("标签 '" + tag.getTagTitle() + "' 已存在!");
} }
} }
if (StringUtils.isNotBlank(tag.getTagIconPath()) && tag.getTagIconPath().contains("base64")) { if (FileDataType.BASE64.equals(tag.getTagImageType())) {
String tagIconPath = UploadController.uploadBase64File(tag.getTagIconPath(), FilePath.TAG); String tagIconPath = UploadController.uploadBase64File(tag.getTagIconPath(), FilePath.TAG);
tag.setTagIconPath(tagIconPath); tag.setTagIconPath(tagIconPath);
} else { } else {
@ -137,7 +138,7 @@ public class TagServiceImpl extends AbstractService<Tag> implements TagService {
result = tagMapper.insertSelective(tag); result = tagMapper.insertSelective(tag);
} else { } else {
tag.setUpdatedTime(new Date()); tag.setUpdatedTime(new Date());
if (StringUtils.isNotBlank(tag.getTagIconPath()) && tag.getTagIconPath().contains("base64")) { if (FileDataType.BASE64.equals(tag.getTagImageType())) {
String tagIconPath = UploadController.uploadBase64File(tag.getTagIconPath(), FilePath.TAG); String tagIconPath = UploadController.uploadBase64File(tag.getTagIconPath(), FilePath.TAG);
tag.setTagIconPath(tagIconPath); tag.setTagIconPath(tagIconPath);
} }

5
src/main/java/com/rymcu/forest/service/impl/TopicServiceImpl.java
View File

@ -8,6 +8,7 @@ import com.rymcu.forest.dto.admin.TopicDTO;
import com.rymcu.forest.dto.admin.TopicTagDTO; import com.rymcu.forest.dto.admin.TopicTagDTO;
import com.rymcu.forest.entity.Tag; import com.rymcu.forest.entity.Tag;
import com.rymcu.forest.entity.Topic; import com.rymcu.forest.entity.Topic;
import com.rymcu.forest.enumerate.FileDataType;
import com.rymcu.forest.enumerate.FilePath; import com.rymcu.forest.enumerate.FilePath;
import com.rymcu.forest.mapper.TopicMapper; import com.rymcu.forest.mapper.TopicMapper;
import com.rymcu.forest.service.TopicService; import com.rymcu.forest.service.TopicService;
@ -59,7 +60,7 @@ public class TopicServiceImpl extends AbstractService<Topic> implements TopicSer
throw new BusinessException("专题 '" + topic.getTopicTitle() + "' 已存在!"); throw new BusinessException("专题 '" + topic.getTopicTitle() + "' 已存在!");
} }
} }
if (StringUtils.isNotBlank(topic.getTopicIconPath()) && topic.getTopicIconPath().contains("base64")) { if (FileDataType.BASE64.equals(topic.getTopicImageType())) {
String topicIconPath = UploadController.uploadBase64File(topic.getTopicIconPath(), FilePath.TOPIC); String topicIconPath = UploadController.uploadBase64File(topic.getTopicIconPath(), FilePath.TOPIC);
topic.setTopicIconPath(topicIconPath); topic.setTopicIconPath(topicIconPath);
} else { } else {
@ -74,7 +75,7 @@ public class TopicServiceImpl extends AbstractService<Topic> implements TopicSer
topic.setUpdatedTime(topic.getCreatedTime()); topic.setUpdatedTime(topic.getCreatedTime());
result = topicMapper.insertSelective(topic); result = topicMapper.insertSelective(topic);
} else { } else {
if (StringUtils.isNotBlank(topic.getTopicIconPath()) && topic.getTopicIconPath().contains("base64")) { if (FileDataType.BASE64.equals(topic.getTopicImageType())) {
String topicIconPath = UploadController.uploadBase64File(topic.getTopicIconPath(), FilePath.TOPIC); String topicIconPath = UploadController.uploadBase64File(topic.getTopicIconPath(), FilePath.TOPIC);
topic.setTopicIconPath(topicIconPath); topic.setTopicIconPath(topicIconPath);
} }