From 5548e00bdad0da1c441aa1faa0156da214b9c250 Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Wed, 16 Jul 2025 14:26:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9license=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E8=A1=A8=E5=90=8D=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/dataobject/comment/CommentDO.java | 4 ++-- .../dal/dataobject/customer/CustomerDO.java | 18 +++++++++++------- .../dal/dataobject/license/LicenseDO.java | 4 ++-- .../dal/dataobject/project/ProjectDO.java | 4 ++-- .../resources/mapper/comment/CommentMapper.xml | 4 ++-- .../mapper/customer/CustomerMapper.xml | 2 +- .../resources/mapper/project/ProjectMapper.xml | 2 +- 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/comment/CommentDO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/comment/CommentDO.java index b228378..048d61c 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/comment/CommentDO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/comment/CommentDO.java @@ -16,8 +16,8 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; * * @author 管理员 */ -@TableName("lic_comment") -@KeySequence("lic_comment_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("crm_comment") +@KeySequence("crm_comment_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/customer/CustomerDO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/customer/CustomerDO.java index 0bdb706..58342db 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/customer/CustomerDO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/customer/CustomerDO.java @@ -1,10 +1,14 @@ package org.agt.module.license.dal.dataobject.customer; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; import org.agt.framework.mybatis.core.dataobject.BaseDO; /** @@ -12,8 +16,8 @@ import org.agt.framework.mybatis.core.dataobject.BaseDO; * * @author 管理员 */ -@TableName("lic_customer") -@KeySequence("lic_customer_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("crm_customer") +@KeySequence("crm_customer_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/license/LicenseDO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/license/LicenseDO.java index 8cea639..2de73f6 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/license/LicenseDO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/license/LicenseDO.java @@ -21,8 +21,8 @@ import java.util.List; * * @author 管理员 */ -@TableName(value = "lic_license", autoResultMap = true) -@KeySequence("lic_license_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName(value = "crm_license_server", autoResultMap = true) +@KeySequence("crm_license_server_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/project/ProjectDO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/project/ProjectDO.java index e5def05..0f246ea 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/project/ProjectDO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/project/ProjectDO.java @@ -18,8 +18,8 @@ import java.time.LocalDateTime; * * @author 管理员 */ -@TableName("lic_project") -@KeySequence("lic_project_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("crm_project") +@KeySequence("crm_project_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/agt-module-license/agt-module-license-server/src/main/resources/mapper/comment/CommentMapper.xml b/agt-module-license/agt-module-license-server/src/main/resources/mapper/comment/CommentMapper.xml index 81dda6f..7271419 100644 --- a/agt-module-license/agt-module-license-server/src/main/resources/mapper/comment/CommentMapper.xml +++ b/agt-module-license/agt-module-license-server/src/main/resources/mapper/comment/CommentMapper.xml @@ -10,10 +10,10 @@ pc.user_id reply_user_id, pu.nickname reply_user FROM - lic_comment c + crm_comment c LEFT JOIN system_users u ON c.user_id = u.id AND u.deleted = 0 - LEFT JOIN lic_comment pc ON c.parent_id = pc.id + LEFT JOIN crm_comment pc ON c.parent_id = pc.id AND pc.deleted = 0 LEFT JOIN system_users pu ON pc.user_id = pu.id AND pu.deleted = 0 diff --git a/agt-module-license/agt-module-license-server/src/main/resources/mapper/customer/CustomerMapper.xml b/agt-module-license/agt-module-license-server/src/main/resources/mapper/customer/CustomerMapper.xml index be1c9d7..3e988e3 100644 --- a/agt-module-license/agt-module-license-server/src/main/resources/mapper/customer/CustomerMapper.xml +++ b/agt-module-license/agt-module-license-server/src/main/resources/mapper/customer/CustomerMapper.xml @@ -3,7 +3,7 @@ - SELECT max(`code` + 0) from lic_project; + SELECT max(`code` + 0) from crm_project; \ No newline at end of file