From 3041043370ee9dbbd7917b7843f4c72c03081e5e Mon Sep 17 00:00:00 2001 From: 康鲁杰 <60095866+KangLujie@users.noreply.github.com> Date: 星期一, 16 六月 2025 17:15:17 +0800 Subject: [PATCH] 达梦数据库适配 --- ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysConfig.java | 10 + ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatMessage.java | 11 + ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUserRole.java | 6 ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysOssConfig.java | 2 ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysTenant.java | 20 ++ ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysNotice.java | 10 + ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysTenantPackage.java | 19 ++ ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeFragment.java | 14 + ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRoleDept.java | 7 ruoyi-admin/src/main/resources/application.yml | 4 ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUser.java | 84 +++------- ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDictType.java | 10 ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeAttach.java | 48 +---- ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRole.java | 15 + ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysMenu.java | 63 ++----- ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/ChatConfig.java | 2 ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDept.java | 15 + ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDictData.java | 10 + ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysOss.java | 11 + ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRoleMenu.java | 6 ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUserPost.java | 7 ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeInfo.java | 23 ++ ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysLogininfor.java | 14 + ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysPost.java | 10 + 24 files changed, 231 insertions(+), 190 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 4d3e7c6..b507d85 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -27,7 +27,7 @@ # 寮�鍙戠幆澧冮厤缃� server: # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080 - port: 8080 + port: 6039 servlet: # 搴旂敤鐨勮闂矾寰� context-path: / @@ -186,6 +186,7 @@ # 鍏抽棴鏃ュ織璁板綍 (鍙崟绾娇鐢� p6spy 鍒嗘瀽) org.apache.ibatis.logging.nologging.NoLoggingImpl # 榛樿鏃ュ織杈撳嚭 org.apache.ibatis.logging.slf4j.Slf4jImpl logImpl: org.apache.ibatis.logging.nologging.NoLoggingImpl + use-actual-column-names: true global-config: # 鏄惁鎵撳嵃 Logo banner banner: true @@ -205,6 +206,7 @@ # 瀛楁楠岃瘉绛栫暐涔� select,鍦� select 鐨勬椂鍊欑殑瀛楁楠岃瘉绛栫暐鏃� wrapper 鏍规嵁鍐呴儴 entity 鐢熸垚鐨� where 鏉′欢 where-strategy: NOT_NULL columnFormat: '"%s"' + table-underline: true # schema: DMSERVER # 杈炬ⅵ鐧诲綍鐢ㄦ埛鍚嶇О锛岄�氬父涓哄ぇ鍐� # 鏁版嵁鍔犲瘑 diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatMessage.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatMessage.java index 4adcded..b06c09d 100644 --- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatMessage.java +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatMessage.java @@ -1,5 +1,6 @@ package org.ruoyi.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -32,42 +33,48 @@ /** * 鐢ㄦ埛id */ + @TableField("USER_ID") private Long userId; /** * 浼氳瘽id */ + @TableField("SESSION_ID") private Long sessionId; /** * 娑堟伅鍐呭 */ + @TableField("CONTENT") private String content; /** * 瀵硅瘽瑙掕壊 */ + @TableField("ROLE") private String role; /** * 鎵i櫎閲戦 */ + @TableField("DEDUCT_COST") private BigDecimal deductCost; /** * 绱 Tokens */ + @TableField("TOTAL_TOKENS") private Long totalTokens; /** * 妯″瀷鍚嶇О */ + @TableField("MODEL_NAME") private String modelName; /** * 澶囨敞 */ + @TableField("REMARK") private String remark; - - } diff --git a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeAttach.java b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeAttach.java index 199eb07..f3a01e3 100644 --- a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeAttach.java +++ b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeAttach.java @@ -1,5 +1,6 @@ package org.ruoyi.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -22,63 +23,36 @@ @Serial private static final long serialVersionUID = 1L; - /** - * - */ @TableId(value = "id") private Long id; - /** - * 鐭ヨ瘑搴揑D - */ + @TableField("kid") private String kid; - /** - * 鏂囨。ID - */ + @TableField("doc_id") private String docId; - /** - * 鏂囨。鍚嶇О - */ + @TableField("doc_name") private String docName; - /** - * 鏂囨。绫诲瀷 - */ + @TableField("doc_type") private String docType; - /** - * 鏂囨。鍐呭 - */ + @TableField("content") private String content; - /** - * 澶囨敞 - */ + @TableField("remark") private String remark; - - /** - * 瀵硅薄瀛樺偍涓婚敭 - */ + @TableField("oss_id") private Long ossId; - - - /** - * 鎷嗚В鍥剧墖鐘舵��10鏈紑濮嬶紝20杩涜涓紝30宸插畬鎴� - */ + @TableField("pic_status") private Integer picStatus; - /** - * 鍒嗘瀽鍥剧墖鐘舵��10鏈紑濮嬶紝20杩涜涓紝30宸插畬鎴� - */ + @TableField("pic_anys_status") private Integer picAnysStatus; - /** - * 鍐欏叆鍚戦噺鏁版嵁搴撶姸鎬�10鏈紑濮嬶紝20杩涜涓紝30宸插畬鎴� - */ + @TableField("vector_status") private Integer vectorStatus; - } diff --git a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeFragment.java b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeFragment.java index a062128..85bc7fb 100644 --- a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeFragment.java +++ b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeFragment.java @@ -1,5 +1,6 @@ package org.ruoyi.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -16,7 +17,7 @@ */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("knowledge_fragment") +@TableName("KNOWLEDGE_FRAGMENT") public class KnowledgeFragment extends BaseEntity { @Serial @@ -25,38 +26,43 @@ /** * */ - @TableId(value = "id") + @TableId(value = "ID") private Long id; /** * 鐭ヨ瘑搴揑D */ + @TableField("KID") private String kid; /** * 鏂囨。ID */ + @TableField("DOC_ID") private String docId; /** * 鐭ヨ瘑鐗囨ID */ + @TableField("FID") private String fid; /** * 鐗囨绱㈠紩涓嬫爣 */ + @TableField("IDX") private Integer idx; /** * 鏂囨。鍐呭 */ + @TableField("CONTENT") private String content; /** * 澶囨敞 */ + @TableField("REMARK") private String remark; - - } + diff --git a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeInfo.java b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeInfo.java index 627cd3c..a924688 100644 --- a/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeInfo.java +++ b/ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/KnowledgeInfo.java @@ -1,5 +1,6 @@ package org.ruoyi.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -23,80 +24,92 @@ private static final long serialVersionUID = 1L; /** - * + * 涓婚敭ID */ - @TableId(value = "id") + @TableId(value = "ID") private Long id; /** * 鐭ヨ瘑搴揑D */ + @TableField("KID") private String kid; /** * 鐢ㄦ埛ID */ + @TableField("UID") private Long uid; /** * 鐭ヨ瘑搴撳悕绉� */ + @TableField("KNAME") private String kname; /** - * 鏄惁鍏紑鐭ヨ瘑搴擄紙0 鍚� 1鏄級 + * 鏄惁鍏紑鐭ヨ瘑搴擄紙0 鍚� 1 鏄級 */ + @TableField("SHARE") private Integer share; /** * 鎻忚堪 */ + @TableField("DESCRIPTION") private String description; /** * 鐭ヨ瘑鍒嗛殧绗� */ + @TableField("KNOWLEDGE_SEPARATOR") private String knowledgeSeparator; /** * 鎻愰棶鍒嗛殧绗� */ + @TableField("QUESTION_SEPARATOR") private String questionSeparator; /** * 閲嶅彔瀛楃鏁� */ + @TableField("OVERLAP_CHAR") private Long overlapChar; /** * 鐭ヨ瘑搴撲腑妫�绱㈢殑鏉℃暟 */ + @TableField("RETRIEVE_LIMIT") private Long retrieveLimit; /** * 鏂囨湰鍧楀ぇ灏� */ + @TableField("TEXT_BLOCK_SIZE") private Long textBlockSize; /** * 鍚戦噺搴撴ā鍨嬪悕绉� */ + @TableField("VECTOR_MODEL_NAME") private String vectorModelName; /** * 鍚戦噺鍖栨ā鍨嬪悕绉� */ + @TableField("EMBEDDING_MODEL_NAME") private String embeddingModelName; /** * 绯荤粺鎻愮ず璇� */ + @TableField("SYSTEM_PROMPT") private String systemPrompt; /** * 澶囨敞 */ + @TableField("REMARK") private String remark; - - } diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/ChatConfig.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/ChatConfig.java index dccc3bb..9ddce0c 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/ChatConfig.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/ChatConfig.java @@ -16,7 +16,7 @@ */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("chat_config") +@TableName("CHAT_CONFIG") public class ChatConfig extends BaseEntity { @Serial diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysConfig.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysConfig.java index ddd8574..5bc32dc 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysConfig.java @@ -1,5 +1,6 @@ package org.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -14,38 +15,43 @@ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_config") +@TableName("SYS_CONFIG") public class SysConfig extends TenantEntity { /** * 鍙傛暟涓婚敭 */ - @TableId(value = "config_id") + @TableId(value = "CONFIG_ID") private Long configId; /** * 鍙傛暟鍚嶇О */ + @TableField("CONFIG_NAME") private String configName; /** * 鍙傛暟閿悕 */ + @TableField("CONFIG_KEY") private String configKey; /** * 鍙傛暟閿�� */ + @TableField("CONFIG_VALUE") private String configValue; /** * 绯荤粺鍐呯疆锛圷鏄� N鍚︼級 */ + @TableField("CONFIG_TYPE") private String configType; /** * 澶囨敞 */ + @TableField("REMARK") private String remark; } diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDept.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDept.java index 5be5f44..f71887c 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDept.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDept.java @@ -1,5 +1,6 @@ package org.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +18,7 @@ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_dept") +@TableName("SYS_DEPT") public class SysDept extends TenantEntity { @Serial @@ -26,53 +27,63 @@ /** * 閮ㄩ棬ID */ - @TableId(value = "dept_id") + @TableId(value = "DEPT_ID") private Long deptId; /** * 鐖堕儴闂↖D */ + @TableField("PARENT_ID") private Long parentId; /** * 閮ㄩ棬鍚嶇О */ + @TableField("DEPT_NAME") private String deptName; /** * 鏄剧ず椤哄簭 */ + @TableField("ORDER_NUM") private Integer orderNum; /** * 璐熻矗浜� */ + @TableField("LEADER") private Long leader; /** * 鑱旂郴鐢佃瘽 */ + @TableField("PHONE") private String phone; /** * 閭 */ + @TableField("EMAIL") private String email; /** * 閮ㄩ棬鐘舵��:0姝e父,1鍋滅敤 */ + @TableField("STATUS") private String status; /** * 鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛� */ @TableLogic + @TableField("DEL_FLAG") private String delFlag; /** * 绁栫骇鍒楄〃 */ + @TableField("ANCESTORS") private String ancestors; } + diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDictData.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDictData.java index ab6c3f8..aa60517 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDictData.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDictData.java @@ -1,5 +1,6 @@ package org.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -27,46 +28,55 @@ /** * 瀛楀吀鎺掑簭 */ + @TableField("DICT_SORT") private Integer dictSort; /** * 瀛楀吀鏍囩 */ + @TableField("DICT_LABEL") private String dictLabel; /** * 瀛楀吀閿�� */ + @TableField("DICT_VALUE") private String dictValue; /** * 瀛楀吀绫诲瀷 */ + @TableField("DICT_TYPE") private String dictType; /** * 鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛� */ + @TableField("CSS_CLASS") private String cssClass; /** * 琛ㄦ牸瀛楀吀鏍峰紡 */ + @TableField("LIST_CLASS") private String listClass; /** * 鏄惁榛樿锛圷鏄� N鍚︼級 */ + @TableField("IS_DEFAULT") private String isDefault; /** * 鐘舵�侊紙0姝e父 1鍋滅敤锛� */ + @TableField("STATUS") private String status; /** * 澶囨敞 */ + @TableField("REMARK") private String remark; public boolean getDefault() { diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDictType.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDictType.java index 2621a61..5c052d2 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDictType.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysDictType.java @@ -1,5 +1,6 @@ package org.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -14,33 +15,36 @@ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_dict_type") +@TableName("SYS_DICT_TYPE") public class SysDictType extends TenantEntity { /** * 瀛楀吀涓婚敭 */ - @TableId(value = "dict_id") + @TableId(value = "DICT_ID") private Long dictId; /** * 瀛楀吀鍚嶇О */ + @TableField("DICT_NAME") private String dictName; /** * 瀛楀吀绫诲瀷 */ + @TableField("DICT_TYPE") private String dictType; /** * 鐘舵�侊紙0姝e父 1鍋滅敤锛� */ + @TableField("STATUS") private String status; /** * 澶囨敞 */ + @TableField("REMARK") private String remark; - } diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysLogininfor.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysLogininfor.java index fceede4..be8d4bf 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysLogininfor.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysLogininfor.java @@ -1,5 +1,6 @@ package org.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -15,7 +16,7 @@ */ @Data -@TableName("sys_logininfor") +@TableName("SYS_LOGININFOR") public class SysLogininfor implements Serializable { @Serial @@ -24,52 +25,61 @@ /** * ID */ - @TableId(value = "info_id") + @TableId(value = "INFO_ID") private Long infoId; /** * 绉熸埛缂栧彿 */ + @TableField("TENANT_ID") private String tenantId; /** * 鐢ㄦ埛璐﹀彿 */ + @TableField("USER_NAME") private String userName; /** * 鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触 */ + @TableField("STATUS") private String status; /** * 鐧诲綍IP鍦板潃 */ + @TableField("IPADDR") private String ipaddr; /** * 鐧诲綍鍦扮偣 */ + @TableField("LOGIN_LOCATION") private String loginLocation; /** * 娴忚鍣ㄧ被鍨� */ + @TableField("BROWSER") private String browser; /** * 鎿嶄綔绯荤粺 */ + @TableField("OS") private String os; /** * 鎻愮ず娑堟伅 */ + @TableField("MSG") private String msg; /** * 璁块棶鏃堕棿 */ + @TableField("LOGIN_TIME") private Date loginTime; } diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysMenu.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysMenu.java index 85b2b59..c0af1d4 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysMenu.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysMenu.java @@ -21,83 +21,52 @@ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_menu") +@TableName("SYS_MENU") public class SysMenu extends BaseEntity { - /** - * 鑿滃崟ID - */ - @TableId(value = "menu_id") + @TableId(value = "MENU_ID") private Long menuId; - /** - * 鐖惰彍鍗旾D - */ + @TableField("PARENT_ID") private Long parentId; - /** - * 鑿滃崟鍚嶇О - */ + @TableField("MENU_NAME") private String menuName; - /** - * 鏄剧ず椤哄簭 - */ + @TableField("ORDER_NUM") private Integer orderNum; - /** - * 璺敱鍦板潃 - */ + @TableField("PATH") private String path; - /** - * 缁勪欢璺緞 - */ + @TableField("COMPONENT") private String component; - /** - * 璺敱鍙傛暟 - */ + @TableField("QUERY_PARAM") private String queryParam; - /** - * 鏄惁涓哄閾撅紙0鏄� 1鍚︼級 - */ + @TableField("IS_FRAME") private String isFrame; - /** - * 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級 - */ + @TableField("IS_CACHE") private String isCache; - /** - * 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛� - */ + @TableField("MENU_TYPE") private String menuType; - /** - * 鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛� - */ + @TableField("VISIBLE") private String visible; - /** - * 鑿滃崟鐘舵�侊紙0姝e父 1鍋滅敤锛� - */ + @TableField("STATUS") private String status; - /** - * 鏉冮檺瀛楃涓� - */ + @TableField("PERMS") private String perms; - /** - * 鑿滃崟鍥炬爣 - */ + @TableField("ICON") private String icon; - /** - * 澶囨敞 - */ + @TableField("REMARK") private String remark; /** diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysNotice.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysNotice.java index 3ba2c92..44412b2 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysNotice.java @@ -1,5 +1,6 @@ package org.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -14,38 +15,43 @@ */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_notice") +@TableName("SYS_NOTICE") public class SysNotice extends TenantEntity { /** * 鍏憡ID */ - @TableId(value = "notice_id") + @TableId(value = "NOTICE_ID") private Long noticeId; /** * 鍏憡鏍囬 */ + @TableField("NOTICE_TITLE") private String noticeTitle; /** * 鍏憡绫诲瀷锛�1閫氱煡 2鍏憡锛� */ + @TableField("NOTICE_TYPE") private String noticeType; /** * 鍏憡鍐呭 */ + @TableField("NOTICE_CONTENT") private String noticeContent; /** * 鍏憡鐘舵�侊紙0姝e父 1鍏抽棴锛� */ + @TableField("STATUS") private String status; /** * 澶囨敞 */ + @TableField("REMARK") private String remark; } diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysOss.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysOss.java index f03a5a3..51ee7f6 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysOss.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysOss.java @@ -1,5 +1,6 @@ package org.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -13,38 +14,42 @@ */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_oss") +@TableName("SYS_OSS") public class SysOss extends TenantEntity { /** * 瀵硅薄瀛樺偍涓婚敭 */ - @TableId(value = "oss_id") + @TableId(value = "OSS_ID") private Long ossId; /** * 鏂囦欢鍚� */ + @TableField("FILE_NAME") private String fileName; /** * 鍘熷悕 */ + @TableField("ORIGINAL_NAME") private String originalName; /** * 鏂囦欢鍚庣紑鍚� */ + @TableField("FILE_SUFFIX") private String fileSuffix; /** * URL鍦板潃 */ + @TableField("URL") private String url; /** * 鏈嶅姟鍟� */ + @TableField("SERVICE") private String service; - } diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysOssConfig.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysOssConfig.java index cdab79c..fa17793 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysOssConfig.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysOssConfig.java @@ -14,7 +14,7 @@ */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_oss_config") +@TableName("SYS_OSS_CONFIG") public class SysOssConfig extends TenantEntity { /** diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysPost.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysPost.java index bb3b9fb..73cbeec 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysPost.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysPost.java @@ -1,5 +1,6 @@ package org.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -14,38 +15,43 @@ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_post") +@TableName("SYS_POST") public class SysPost extends TenantEntity { /** * 宀椾綅搴忓彿 */ - @TableId(value = "post_id") + @TableId(value = "POST_ID") private Long postId; /** * 宀椾綅缂栫爜 */ + @TableField("POST_CODE") private String postCode; /** * 宀椾綅鍚嶇О */ + @TableField("POST_NAME") private String postName; /** * 宀椾綅鎺掑簭 */ + @TableField("POST_SORT") private Integer postSort; /** * 鐘舵�侊紙0姝e父 1鍋滅敤锛� */ + @TableField("STATUS") private String status; /** * 澶囨敞 */ + @TableField("REMARK") private String remark; } diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRole.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRole.java index f1dd70a..3506479 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRole.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRole.java @@ -1,5 +1,6 @@ package org.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,59 +18,68 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@TableName("sys_role") +@TableName("SYS_ROLE") public class SysRole extends TenantEntity { /** * 瑙掕壊ID */ - @TableId(value = "role_id") + @TableId(value = "ROLE_ID") private Long roleId; /** * 瑙掕壊鍚嶇О */ + @TableField("ROLE_NAME") private String roleName; /** * 瑙掕壊鏉冮檺 */ + @TableField("ROLE_KEY") private String roleKey; /** * 瑙掕壊鎺掑簭 */ + @TableField("ROLE_SORT") private Integer roleSort; /** * 鏁版嵁鑼冨洿锛�1锛氭墍鏈夋暟鎹潈闄愶紱2锛氳嚜瀹氫箟鏁版嵁鏉冮檺锛�3锛氭湰閮ㄩ棬鏁版嵁鏉冮檺锛�4锛氭湰閮ㄩ棬鍙婁互涓嬫暟鎹潈闄愶紱5锛氫粎鏈汉鏁版嵁鏉冮檺锛� */ + @TableField("DATA_SCOPE") private String dataScope; /** * 鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級 */ + @TableField("MENU_CHECK_STRICTLY") private Boolean menuCheckStrictly; /** * 閮ㄩ棬鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀� 锛� */ + @TableField("DEPT_CHECK_STRICTLY") private Boolean deptCheckStrictly; /** * 瑙掕壊鐘舵�侊紙0姝e父 1鍋滅敤锛� */ + @TableField("STATUS") private String status; /** * 鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛� */ @TableLogic + @TableField("DEL_FLAG") private String delFlag; /** * 澶囨敞 */ + @TableField("REMARK") private String remark; public SysRole(Long roleId) { @@ -77,3 +87,4 @@ } } + diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRoleDept.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRoleDept.java index 6753be9..d845917 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRoleDept.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRoleDept.java @@ -1,6 +1,7 @@ package org.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -12,18 +13,20 @@ */ @Data -@TableName("sys_role_dept") +@TableName("SYS_ROLE_DEPT") public class SysRoleDept { /** * 瑙掕壊ID */ - @TableId(type = IdType.INPUT) + @TableId(value = "ROLE_ID", type = IdType.INPUT) private Long roleId; /** * 閮ㄩ棬ID */ + @TableField("DEPT_ID") private Long deptId; } + diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRoleMenu.java index 2f73cba..6f09b4f 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRoleMenu.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysRoleMenu.java @@ -1,6 +1,7 @@ package org.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -12,18 +13,19 @@ */ @Data -@TableName("sys_role_menu") +@TableName("SYS_ROLE_MENU") public class SysRoleMenu { /** * 瑙掕壊ID */ - @TableId(type = IdType.INPUT) + @TableId(value = "ROLE_ID", type = IdType.INPUT) private Long roleId; /** * 鑿滃崟ID */ + @TableField("MENU_ID") private Long menuId; } diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysTenant.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysTenant.java index 064eebe..4ae2281 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysTenant.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysTenant.java @@ -1,5 +1,6 @@ package org.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,7 +18,7 @@ */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_tenant") +@TableName("SYS_TENANT") // 琛ㄥ悕涔熻澶у啓 public class SysTenant extends BaseEntity { @Serial @@ -26,78 +27,91 @@ /** * id */ - @TableId(value = "id") + @TableId(value = "ID") private Long id; /** * 绉熸埛缂栧彿 */ + @TableField("TENANT_ID") private String tenantId; /** * 鑱旂郴浜� */ + @TableField("CONTACT_USER_NAME") private String contactUserName; /** * 鑱旂郴鐢佃瘽 */ + @TableField("CONTACT_PHONE") private String contactPhone; /** * 浼佷笟鍚嶇О */ + @TableField("COMPANY_NAME") private String companyName; /** * 缁熶竴绀句細淇$敤浠g爜 */ + @TableField("LICENSE_NUMBER") private String licenseNumber; /** * 鍦板潃 */ + @TableField("ADDRESS") private String address; /** * 鍩熷悕 */ + @TableField("\"DOMAIN\"") private String domain; /** * 浼佷笟绠�浠� */ + @TableField("INTRO") private String intro; /** * 澶囨敞 */ + @TableField("REMARK") private String remark; /** * 绉熸埛濂楅缂栧彿 */ + @TableField("PACKAGE_ID") private Long packageId; /** * 杩囨湡鏃堕棿 */ + @TableField("EXPIRE_TIME") private Date expireTime; /** * 鐢ㄦ埛鏁伴噺锛�-1涓嶉檺鍒讹級 */ + @TableField("ACCOUNT_COUNT") private Long accountCount; /** * 绉熸埛鐘舵�侊紙0姝e父 1鍋滅敤锛� */ + @TableField("STATUS") private String status; /** * 鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛� */ + @TableField("DEL_FLAG") @TableLogic private String delFlag; - } diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysTenantPackage.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysTenantPackage.java index 65ad803..ed4392e 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysTenantPackage.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysTenantPackage.java @@ -1,5 +1,6 @@ package org.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; @@ -16,7 +17,7 @@ */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_tenant_package") +@TableName("SYS_TENANT_PACKAGE") public class SysTenantPackage extends BaseEntity { @Serial @@ -25,32 +26,44 @@ /** * 绉熸埛濂楅id */ - @TableId(value = "package_id") + @TableId(value = "PACKAGE_ID") private Long packageId; + /** * 濂楅鍚嶇О */ + @TableField("PACKAGE_NAME") private String packageName; + /** * 鍏宠仈鑿滃崟id */ + @TableField("MENU_IDS") private String menuIds; + /** * 澶囨敞 */ + @TableField("REMARK") private String remark; + /** * 鑿滃崟鏍戦�夋嫨椤规槸鍚﹀叧鑱旀樉绀猴紙 0锛氱埗瀛愪笉浜掔浉鍏宠仈鏄剧ず 1锛氱埗瀛愪簰鐩稿叧鑱旀樉绀猴級 */ + @TableField("MENU_CHECK_STRICTLY") private Boolean menuCheckStrictly; + /** * 鐘舵�侊紙0姝e父 1鍋滅敤锛� */ + @TableField("STATUS") private String status; + /** * 鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛� */ @TableLogic + @TableField("DEL_FLAG") private String delFlag; - } + diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUser.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUser.java index f451e98..a28af13 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUser.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUser.java @@ -18,108 +18,72 @@ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@TableName("sys_user") +@TableName("SYS_USER") public class SysUser extends TenantEntity { - /** - * 鐢ㄦ埛ID - */ - @TableId(value = "user_id") + @TableId(value = "USER_ID") private Long userId; - /** - * 閮ㄩ棬ID - */ + @TableField("DEPT_ID") private Long deptId; - /** - * 鐢ㄦ埛璐﹀彿 - */ + @TableField("USER_NAME") private String userName; - /** - * 鐢ㄦ埛濂楅 - */ + @TableField("USER_PLAN") private String userPlan; - /** - * 鐢ㄦ埛鏄电О - */ + @TableField("NICK_NAME") private String nickName; - /** - * 鐢ㄦ埛绫诲瀷锛坰ys_user绯荤粺鐢ㄦ埛锛� - */ + @TableField("USER_TYPE") private String userType; - /** - * 鐢ㄦ埛閭 - */ + @TableField("EMAIL") private String email; - /** - * 鎵嬫満鍙风爜 - */ + @TableField("PHONENUMBER") private String phonenumber; - /** - * 鐢ㄦ埛鎬у埆 - */ + @TableField("SEX") private String sex; - /** - * 鐢ㄦ埛澶村儚 - */ + @TableField("AVATAR") private String avatar; - /** - * 瀵嗙爜 - */ - @TableField( - insertStrategy = FieldStrategy.NOT_EMPTY, - updateStrategy = FieldStrategy.NOT_EMPTY, - whereStrategy = FieldStrategy.NOT_EMPTY + @TableField(value = "PASSWORD", + insertStrategy = FieldStrategy.NOT_EMPTY, + updateStrategy = FieldStrategy.NOT_EMPTY, + whereStrategy = FieldStrategy.NOT_EMPTY ) private String password; - /** - * 甯愬彿鐘舵�侊紙0姝e父 1鍋滅敤锛� - */ + @TableField("STATUS") private String status; - /** - * 鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛� - */ + @TableField(value = "DEL_FLAG") @TableLogic private String delFlag; - /** - * 鏈�鍚庣櫥褰旾P - */ + @TableField("LOGIN_IP") private String loginIp; - /** - * 娉ㄥ唽鍩熷悕 - */ + @TableField("DOMAIN_NAME") private String domainName; - /** - * 鏈�鍚庣櫥褰曟椂闂� - */ + @TableField("LOGIN_DATE") private Date loginDate; - /** - * 澶囨敞 - */ + @TableField("REMARK") private String remark; - /** 鏅�氱敤鎴风殑鏍囪瘑,瀵瑰綋鍓嶅紑鍙戣�呭笎鍙峰敮涓�銆備竴涓猳penid瀵瑰簲涓�涓叕浼楀彿鎴栧皬绋嬪簭 */ + @TableField("OPEN_ID") private String openId; - /** 鐢ㄦ埛浣欓 */ + @TableField("USER_BALANCE") private Double userBalance; - /** 鐢ㄦ埛绛夌骇 */ + @TableField("USER_GRADE") private String userGrade; public SysUser(Long userId) { diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUserPost.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUserPost.java index 6ab0c25..bab2385 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUserPost.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUserPost.java @@ -1,6 +1,7 @@ package org.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -12,18 +13,20 @@ */ @Data -@TableName("sys_user_post") +@TableName("SYS_USER_POST") public class SysUserPost { /** * 鐢ㄦ埛ID */ - @TableId(type = IdType.INPUT) + @TableId(value = "USER_ID", type = IdType.INPUT) private Long userId; /** * 宀椾綅ID */ + @TableField("POST_ID") private Long postId; } + diff --git a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUserRole.java b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUserRole.java index a2d5b25..1a49606 100644 --- a/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUserRole.java +++ b/ruoyi-modules-api/ruoyi-system-api/src/main/java/org/ruoyi/system/domain/SysUserRole.java @@ -1,6 +1,7 @@ package org.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -12,18 +13,19 @@ */ @Data -@TableName("sys_user_role") +@TableName("SYS_USER_ROLE") public class SysUserRole { /** * 鐢ㄦ埛ID */ - @TableId(type = IdType.INPUT) + @TableId(value = "USER_ID", type = IdType.INPUT) private Long userId; /** * 瑙掕壊ID */ + @TableField("ROLE_ID") private Long roleId; } -- Gitblit v1.9.3