wangys/schoolNews
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

serv\web-侧边栏 标签统一

Browse Source
This commit is contained in:
wangys
2025-10-27 16:21:00 +08:00
parent e50de4a277
commit 5fa4e1cd42
47 changed files with 1933 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbDataCollectionConfig.java
View File

@@ -35,9 +35,9 @@ public class TbDataCollectionConfig extends BaseDTO {
private String frequency;
/**
* @description 默认分类ID
* @description 默认标签ID（文章分类标签，tagType=1）
*/
private String categoryID;
private String tagID;
/**
* @description 状态（0禁用 1启用）
@@ -91,12 +91,12 @@ public class TbDataCollectionConfig extends BaseDTO {
this.frequency = frequency;
}
public String getCategoryID() {
return categoryID;
public String getTagID() {
return tagID;
}
public void setCategoryID(String categoryID) {
this.categoryID = categoryID;
public void setTagID(String tagID) {
this.tagID = tagID;
}
public Integer getStatus() {

14
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResource.java
View File

@@ -40,9 +40,9 @@ public class TbResource extends BaseDTO {
private String coverImage;
/**
* @description 分类ID
* @description 标签ID（文章分类标签，tagType=1）
*/
private String categoryID;
private String tagID;
/**
* @description 作者
@@ -144,12 +144,12 @@ public class TbResource extends BaseDTO {
this.coverImage = coverImage;
}
public String getCategoryID() {
return categoryID;
public String getTagID() {
return tagID;
}
public void setCategoryID(String categoryID) {
this.categoryID = categoryID;
public void setTagID(String tagID) {
this.tagID = tagID;
}
public String getAuthor() {
@@ -254,7 +254,7 @@ public class TbResource extends BaseDTO {
"id=" + getID() +
", resourceID='" + resourceID + '\'' +
", title='" + title + '\'' +
", categoryID='" + categoryID + '\'' +
", tagID='" + tagID + '\'' +
", author='" + author + '\'' +
", status=" + status +
", viewCount=" + viewCount +

131
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResourceCategory.java
View File

@@ -1,131 +0,0 @@
package org.xyzh.common.dto.resource;
import org.xyzh.common.dto.BaseDTO;
/**
* @description 资源分类表
* @filename TbResourceCategory.java
* @author yslg
* @copyright xyzh
* @since 2025-10-15
*/
public class TbResourceCategory extends BaseDTO {
private static final long serialVersionUID = 1L;
/**
* @description 分类唯一标识
*/
private String categoryID;
/**
* @description 分类名称
*/
private String name;
/**
* @description 父分类ID
*/
private String parentID;
/**
* @description 分类描述
*/
private String description;
/**
* @description 分类图标
*/
private String icon;
/**
* @description 排序号
*/
private Integer orderNum;
/**
* @description 创建者
*/
private String creator;
/**
* @description 更新者
*/
private String updater;
public String getCategoryID() {
return categoryID;
}
public void setCategoryID(String categoryID) {
this.categoryID = categoryID;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getParentID() {
return parentID;
}
public void setParentID(String parentID) {
this.parentID = parentID;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
public Integer getOrderNum() {
return orderNum;
}
public void setOrderNum(Integer orderNum) {
this.orderNum = orderNum;
}
public String getCreator() {
return creator;
}
public void setCreator(String creator) {
this.creator = creator;
}
public String getUpdater() {
return updater;
}
public void setUpdater(String updater) {
this.updater = updater;
}
@Override
public String toString() {
return "TbResourceCategory{" +
"id=" + getID() +
", categoryID='" + categoryID + '\'' +
", name='" + name + '\'' +
", parentID='" + parentID + '\'' +
", orderNum=" + orderNum +
", createTime=" + getCreateTime() +
'}';
}
}

14
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbTag.java
View File

@@ -33,6 +33,11 @@ public class TbTag extends BaseDTO {
*/
private String description;
/**
* @description 标签类型 1-文章分类标签 2-课程分类标签 3-学习任务分类标签
*/
private Integer tagType;
/**
* @description 创建者
*/
@@ -91,6 +96,14 @@ public class TbTag extends BaseDTO {
this.updater = updater;
}
public Integer getTagType() {
return tagType;
}
public void setTagType(Integer tagType) {
this.tagType = tagType;
}
@Override
public String toString() {
return "TbTag{" +
@@ -98,6 +111,7 @@ public class TbTag extends BaseDTO {
", tagID='" + tagID + '\'' +
", name='" + name + '\'' +
", color='" + color + '\'' +
", tagType=" + tagType +
", createTime=" + getCreateTime() +
'}';
}

13
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/ResourceVO.java
View File

@@ -3,7 +3,6 @@ package org.xyzh.common.vo;
import java.io.Serializable;
import org.xyzh.common.dto.resource.TbResource;
import org.xyzh.common.dto.resource.TbResourceCategory;
import org.xyzh.common.dto.resource.TbTag;
import java.util.List;
@@ -20,8 +19,9 @@ public class ResourceVO implements Serializable{
private TbResource resource;
private TbResourceCategory resourceCategory;
/**
* 资源标签列表（包含文章分类标签 tag_type=1）
*/
private List<TbTag> tags;
public TbResource getResource() {
@@ -32,13 +32,6 @@ public class ResourceVO implements Serializable{
this.resource = resource;
}
public TbResourceCategory getResourceCategory() {
return resourceCategory;
}
public void setResourceCategory(TbResourceCategory resourceCategory) {
this.resourceCategory = resourceCategory;
}
public List<TbTag> getTags() {
return tags;
}