From 30e858fa504b268b9b436afca0a1259cf6e8c488 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 19 八月 2025 11:01:40 +0800 Subject: [PATCH] 优化 --- server/src/main/java/com/doumee/dao/business/model/Category.java | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/server/src/main/java/com/doumee/dao/business/model/Category.java b/server/src/main/java/com/doumee/dao/business/model/Category.java index 7bb953a..b6547f5 100644 --- a/server/src/main/java/com/doumee/dao/business/model/Category.java +++ b/server/src/main/java/com/doumee/dao/business/model/Category.java @@ -1,14 +1,13 @@ package com.doumee.dao.business.model; import com.baomidou.mybatisplus.annotation.TableField; -import com.doumee.core.annotation.excel.ExcelExportColumn; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; + import java.util.Date; import java.util.List; @@ -24,69 +23,57 @@ @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") - @ExcelExportColumn(name="涓婚敭") private Integer id; @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1") - @ExcelExportColumn(name="鍒涘缓浜虹紪鐮�") private Integer creator; @ApiModelProperty(value = "鍒涘缓鏃堕棿") - @ExcelExportColumn(name="鍒涘缓鏃堕棿") private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") - @ExcelExportColumn(name="鏇存柊浜虹紪鐮�") private Integer editor; @ApiModelProperty(value = "鏇存柊鏃堕棿") - @ExcelExportColumn(name="鏇存柊鏃堕棿") private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") - @ExcelExportColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�") private Integer isdeleted; @ApiModelProperty(value = "鍚嶇О") - @ExcelExportColumn(name="鍚嶇О") private String name; @ApiModelProperty(value = "澶囨敞") - @ExcelExportColumn(name="澶囨敞") private String remark; @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1") - @ExcelExportColumn(name="鐘舵�� 0鍚敤 1绂佺敤") private Integer status; @ApiModelProperty(value = "鎺掑簭鐮�", example = "1") - @ExcelExportColumn(name="鎺掑簭鐮�") private Integer sortnum; @ApiModelProperty(value = "鍥炬爣") - @ExcelExportColumn(name="鍥炬爣") private String imgurl; @ApiModelProperty(value = "绫诲瀷 0SHE浼ゅ绫诲瀷 1璺岀粖婊戜激瀹崇被鍨� 2璺岀粖婊戝彂鐢熷湴鐐� 3DCA浣嶇疆 4DCA涓婚 5SHE椋庨櫓鍦扮偣 6DCA瑙傚療椤�", example = "1") - @ExcelExportColumn(name="绫诲瀷 0SHE浼ゅ绫诲瀷 1璺岀粖婊戜激瀹崇被鍨� 2璺岀粖婊戝彂鐢熷湴鐐� 3DCA浣嶇疆 4DCA涓婚 5SHE椋庨櫓鍦扮偣 6DCA瑙傚療椤�") private Integer type; @ApiModelProperty(value = "鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�", example = "1") - @ExcelExportColumn(name="鐖剁骇缂栫爜锛堣嚜鍏宠仈锛�") private Integer parentId; @ApiModelProperty(value = "鍚嶇О璺緞") - @ExcelExportColumn(name="鍚嶇О璺緞") private String namePath; @ApiModelProperty(value = "缂栫爜璺緞") - @ExcelExportColumn(name="缂栫爜璺緞") private String idPath; @ApiModelProperty(value = "涓婄骇鍚嶇О") @TableField(exist = false) private String parentName; + @ApiModelProperty(value = "涓婁笂绾у悕绉�") + @TableField(exist = false) + private String rootName; @ApiModelProperty(value = "鎿嶄綔浜哄悕瀛�") @TableField(exist = false) private String editorName; @@ -96,7 +83,11 @@ @ApiModelProperty(value = "鏄惁鏍硅妭鐐� 0鍚� 1鏄�") @TableField(exist = false) private Integer isRoot; - @ApiModelProperty(value = "鎿嶄綔浜哄悕瀛�") + @ApiModelProperty(value = "瀛愰泦闆嗗悎") @TableField(exist = false) private List<Category> childList; + + @ApiModelProperty(value = "瀛愰泦闆嗗悎(鎵归噺瀵煎叆瀵规瘮涓嬮泦锛�") + @TableField(exist = false) + private List<Category> childMatchList; } -- Gitblit v1.9.3