ソースを参照

添加确实dict注解

syh 4 年 前
コミット
a9a124759a
16 ファイル変更73 行追加29 行削除
  1. 3 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/Advertiser.java
  2. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAreaInfo.java
  3. 6 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/entity/SysMessage.java
  4. 8 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
  5. 3 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
  6. 5 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java
  7. 6 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysLog.java
  8. 5 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.java
  9. 10 10
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java
  10. 2 0
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/Actor.java
  11. 1 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/entity/ByteDanceCreative.java
  12. 5 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/entity/BytedanceEffectVideoInfo.java
  13. 5 0
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/OptimizerRoleInfo.java
  14. 4 0
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/Performance.java
  15. 4 0
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformancRraise.java
  16. 5 0
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformanceCommission.java

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/Advertiser.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.entity;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -46,6 +47,7 @@ public class Advertiser {
      */
     @Excel(name = "行业ID", width = 15)
     @ApiModelProperty(value = "行业ID")
+    @Dict(dicCode = "id",dictTable="sys_category",dicText="name")
     private String industryId;
     private String industryCode;
     /**
@@ -53,6 +55,7 @@ public class Advertiser {
      */
     @Excel(name = "销售ID", width = 15)
     @ApiModelProperty(value = "销售ID")
+    @Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
     private String saleId;
     /**
      * 销售ID

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAreaInfo.java

@@ -29,7 +29,7 @@ public class BytedanceAreaInfo {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
     private Integer id;
     /**

+ 6 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/entity/SysMessage.java

@@ -1,15 +1,14 @@
 package org.jeecg.modules.message.entity;
 
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @Description: 消息
@@ -39,6 +38,7 @@ public class SysMessage extends JeecgEntity {
 	private java.lang.Integer esSendNum;
 	/**推送状态 0未推送 1推送成功 2推送失败*/
 	@Excel(name = "推送状态 0未推送 1推送成功 2推送失败", width = 15)
+	@Dict(dicCode = "msgSendStatus")
     private java.lang.String esSendStatus;
 	/**推送时间*/
 	@Excel(name = "推送时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@@ -50,6 +50,7 @@ public class SysMessage extends JeecgEntity {
 	private java.lang.String esTitle;
 	/**推送方式:1短信 2邮件 3微信*/
 	@Excel(name = "推送方式:1短信 2邮件 3微信", width = 15)
+	@Dict(dicCode = "msgType")
     private java.lang.String esType;
 	/**备注*/
 	@Excel(name = "备注", width = 15)

+ 8 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java

@@ -1,15 +1,16 @@
 package org.jeecg.modules.system.entity;
 
-import java.io.Serializable;
-
+import cn.com.ctop.common.module.annotation.Dict;
 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 lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
+
 /**
  * @Description: 系统通告表
  * @Author: jeecg-boot
@@ -59,22 +60,26 @@ public class SysAnnouncement implements Serializable {
      * 优先级(L低,M中,H高)
      */
     @Excel(name = "优先级", width = 15, dicCode = "priority")
+    @Dict(dicCode = "priority")
     private java.lang.String priority;
 
     /**
      * 消息类型1:通知公告2:系统消息
      */
     @Excel(name = "消息类型", width = 15, dicCode = "msg_category")
+    @Dict(dicCode = "msg_category")
     private java.lang.String msgCategory;
     /**
      * 通告对象类型(USER:指定用户,ALL:全体用户)
      */
     @Excel(name = "通告对象类型", width = 15, dicCode = "msg_type")
+    @Dict(dicCode = "msg_type")
     private java.lang.String msgType;
     /**
      * 发布状态(0未发布,1已发布,2已撤销)
      */
     @Excel(name = "发布状态", width = 15, dicCode = "send_status")
+    @Dict(dicCode = "send_status")
     private java.lang.String sendStatus;
     /**
      * 发布时间

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDepart.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.entity;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -64,9 +65,11 @@ public class SysDepart implements Serializable {
 	private String memo;
 	/**状态(1启用,0不启用)*/
 	@Excel(name="状态",width=15)
+	@Dict(dicCode = "depart_status")
     private String status;
 	/**删除状态(0,正常,1已删除)*/
 	@Excel(name="删除状态",width=15)
+	@Dict(dicCode = "del_flag")
     private String delFlag;
 	/**创建人*/
 	private String createBy;

+ 5 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDictItem.java

@@ -1,16 +1,16 @@
 package org.jeecg.modules.system.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  *
@@ -65,6 +65,7 @@ public class SysDictItem implements Serializable {
     /**
      * 状态(1启用 0不启用)
      */
+    @Dict(dicCode = "dict_item_status")
     private Integer status;
 
     private String createBy;

+ 6 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysLog.java

@@ -1,15 +1,16 @@
 package org.jeecg.modules.system.entity;
 
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -99,6 +100,7 @@ public class SysLog implements Serializable {
 	/**
 	 * 日志类型(1登录日志,2操作日志)
 	 */
+	@Dict(dicCode = "log_type")
 	private Integer logType;
 
 	/**

+ 5 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysPermission.java

@@ -1,7 +1,6 @@
 package org.jeecg.modules.system.entity;
 
-import java.io.Serializable;
-import java.util.Date;
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,6 +8,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 菜单权限表
@@ -81,6 +83,7 @@ public class SysPermission implements Serializable {
 	/**
 	 * 类型(0:一级菜单;1:子菜单 ;2:按钮权限)
 	 */
+	@Dict(dicCode = "menu_type")
 	private Integer menuType;
 
 	/**

+ 10 - 10
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -1,21 +1,19 @@
 package org.jeecg.modules.system.entity;
 
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serializable;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -78,6 +76,7 @@ public class SysUser implements Serializable {
      * 性别(1:男 2:女)
      */
     @Excel(name = "性别", width = 15, dicCode = "sex")
+    @Dict(dicCode = "sex")
     private Integer sex;
 
     /**
@@ -101,6 +100,7 @@ public class SysUser implements Serializable {
      * 状态(1:正常  2:冻结 )
      */
     @Excel(name = "状态", width = 15, dicCode = "user_status")
+    @Dict(dicCode = "user_status")
     private Integer status;
 
     /**

+ 2 - 0
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/Actor.java

@@ -1,5 +1,6 @@
 package cn.com.ctop.manage.modules.actor.entity;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -27,6 +28,7 @@ public class Actor {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date birthday;
     private String coverUrl;
+    @Dict(dicCode = "sex")
     private Integer sex;
     private String speciality;
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")

+ 1 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/entity/ByteDanceCreative.java

@@ -42,6 +42,7 @@ public class ByteDanceCreative {
     /**
      * 本平台广告主id
      */
+    @Dict(dicCode = "account_id",dictTable="ctop_user_allocation",dicText="auth_name")
     private String accountId;
     /**
      * 创意素材标题

+ 5 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/entity/BytedanceEffectVideoInfo.java

@@ -1,5 +1,6 @@
 package cn.com.ctop.toutiao.modules.material.entity;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -28,9 +29,13 @@ public class BytedanceEffectVideoInfo {
 	private String url;
 	private String initialCostDate;
 	private String finalCostDate;
+	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
 	private String plane;
+	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
 	private String plan;
+	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
 	private String shot;
+	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
 	private String clip;
 	private String manager;
 	private java.math.BigDecimal twoWeekCost;

+ 5 - 0
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/OptimizerRoleInfo.java

@@ -1,5 +1,6 @@
 package cn.com.ctop.performanceappraisal.entity;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -43,12 +44,14 @@ public class OptimizerRoleInfo {
      */
     @Excel(name = "角色类型 1:运营经理 2:运营专员", width = 15)
     @ApiModelProperty(value = "角色类型 1:运营经理 2:运营专员")
+    @Dict(dicCode = "optimizer_type")
     private Integer type;
     /**
      * 用户id
      */
     @Excel(name = "用户id", width = 15)
     @ApiModelProperty(value = "用户id")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     private String userId;
     private String realname;
     /**
@@ -56,12 +59,14 @@ public class OptimizerRoleInfo {
      */
     @Excel(name = "归属人id", width = 15)
     @ApiModelProperty(value = "归属人id")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     private String belongerId;
     /**
      * enabled
      */
     @Excel(name = "enabled", width = 15)
     @ApiModelProperty(value = "enabled")
+    @Dict(dicCode = "valid_status")
     private Integer enabled;
     /**
      * createTime

+ 4 - 0
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/Performance.java

@@ -1,5 +1,6 @@
 package cn.com.ctop.performanceappraisal.entity;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -37,12 +38,14 @@ public class Performance {
      */
     @Excel(name = "sys_user的主键id", width = 15)
     @ApiModelProperty(value = "sys_user的主键id")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     private String userId;
     /**
      * sys_role的主键id
      */
     @Excel(name = "sys_role的主键id", width = 15)
     @ApiModelProperty(value = "sys_role的主键id")
+    @Dict(dicCode = "id", dictTable = "sys_role", dicText = "role_name")
     private String roleId;
     /**
      * 年度
@@ -103,6 +106,7 @@ public class Performance {
      */
     @Excel(name = "媒体类型1_头条2_快手", width = 15)
     @ApiModelProperty(value = "媒体类型1_头条2_快手")
+    @Dict(dicCode = "app_type")
     private Integer appType;
     /**
      * 创建时间

+ 4 - 0
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformancRraise.java

@@ -1,5 +1,6 @@
 package cn.com.ctop.performanceappraisal.entity;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -37,6 +38,7 @@ public class RolePerformancRraise {
      */
     @Excel(name = "角色id", width = 15)
     @ApiModelProperty(value = "角色id")
+    @Dict(dicCode = "id", dictTable = "sys_role", dicText = "role_name")
     private String roleId;
     /**
      * 提点梯度级别
@@ -61,12 +63,14 @@ public class RolePerformancRraise {
      */
     @Excel(name = "媒体类型1_头条2_快手", width = 15)
     @ApiModelProperty(value = "媒体类型1_头条2_快手")
+    @Dict(dicCode = "media_type")
     private Integer appType;
     /**
      * 是否可用
      */
     @Excel(name = "是否可用", width = 15)
     @ApiModelProperty(value = "是否可用")
+    @Dict(dicCode = "valid_status")
     private Integer enabled;
     /**
      * createTime

+ 5 - 0
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformanceCommission.java

@@ -1,5 +1,6 @@
 package cn.com.ctop.performanceappraisal.entity;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -37,6 +38,7 @@ public class RolePerformanceCommission {
      */
     @Excel(name = "sys_role的主键id", width = 15)
     @ApiModelProperty(value = "sys_role的主键id")
+    @Dict(dicCode = "id", dictTable = "sys_role", dicText = "role_name")
     private String roleId;
     /**
      * 角色提成比例
@@ -49,16 +51,19 @@ public class RolePerformanceCommission {
      */
     @Excel(name = "是否可用", width = 15)
     @ApiModelProperty(value = "是否可用 1:可用 2:不可用")
+    @Dict(dicCode = "valid_status")
     private Integer enabled;
     /**
      * 1:快手  2:头条
      */
     @Excel(name = "媒体类型1_头条2_快手", width = 15)
     @ApiModelProperty(value = "媒体类型1_头条2_快手")
+    @Dict(dicCode = "media_type")
     private Integer appType;
 
     @Excel(name = "是否有平面", width = 15)
     @ApiModelProperty(value = "是否有平面")
+    @Dict(dicCode = "has_plane")
     private Integer hasPlane;
     /**
      * 开始时间