From ba8009fd8da351ae2567d14fd80b3c85823c98ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?= <14096380+qwe963852@user.noreply.gitee.com> Date: Wed, 2 Oct 2024 14:49:25 +0800 Subject: [PATCH] =?UTF-8?q?chore:=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/common/domain/Enterprise.java | 12 ++++ .../common/domain/MessageTemplateType.java | 3 +- .../muyu/common/domain/SysCarEnterprise.java | 59 ------------------- .../controller/form/InsertEnterprise.java | 3 + .../controller/form/UpdateEnterprise.java | 3 + .../com/muyu/server/mapper/KafkaMapper.java | 1 + .../resources/mapper/EnterpriseMapper.xml | 6 +- 7 files changed, 25 insertions(+), 62 deletions(-) delete mode 100644 cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarEnterprise.java diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/Enterprise.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/Enterprise.java index ac1f9b4..f4f1a88 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/Enterprise.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/Enterprise.java @@ -1,6 +1,8 @@ package com.muyu.common.domain; import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,17 +22,27 @@ public class Enterprise { /** * 企业编号 */ + @Excel(name = "企业编号") private Integer enterpriseId; /** * 企业名称 */ + @Excel(name = "企业名称") private String enterpriseName; /** * 企业车辆数量 */ + @Excel(name = "企业拥有车辆数据") private Integer enterpriseCarCount; /** * 企业电子围栏数量 */ + @Excel(name = "企业所属电子围栏") private Integer enterpriseFenceCount; + + /** + * 企业数据库名称 + */ + @Excel(name = "企业所属数据库") + private String enterpriseDatabaseName; } diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplateType.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplateType.java index 6d84684..3c2cd95 100644 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplateType.java +++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplateType.java @@ -11,7 +11,8 @@ import lombok.experimental.SuperBuilder; import java.io.Serializable; /** - * @Author：liuxinyue + * 报文模版 + * @author liuxinyue * @Package：com.sheep.message.domain * @Project：cloud-server-c * @name：MessageTemplateType diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarEnterprise.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarEnterprise.java deleted file mode 100644 index b6bf5a6..0000000 --- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarEnterprise.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.muyu.common.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; - -/** - * 企业信息 sys_car_enterprise - * @author 袁子龙 - * @package com.muyu.breakdown.domain - * @name: SysCarEnterprise - * @date: 2024/9/26 19:54 - */ - -@Data -@Setter -@Getter -@NoArgsConstructor -@AllArgsConstructor -@TableName("sys_car_enterprise") -public class SysCarEnterprise extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** 企业id*/ - @TableId(type = IdType.AUTO) - private Long id; - - /** 企业名称*/ - @Excel(name = "企业名称") - private String enterpriseName; - /** 用户姓名 */ - @Excel(name = "用户姓名") - private String name; - - @Excel(name = "用户职位") - private String position; - - @Excel(name = "公司所在省") - private String province; - - @Excel(name = "公司所在市") - private String city; - - @Excel(name = "公司所在县/区") - private String county; - - @Excel(name = "公司详细地址") - private String address; - - @Excel(name = "统一社会信用代码") - private String creditCode; - - @Excel(name = "营业执照") - private String businessLicense; - -} diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/InsertEnterprise.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/InsertEnterprise.java index ef2c82e..7a2225b 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/InsertEnterprise.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/InsertEnterprise.java @@ -22,4 +22,7 @@ public class InsertEnterprise { @NotNull(message = "enterpriseFenceCount企业围栏组不能为空") private Integer enterpriseFenceCount; + + @NotNull(message = "enterpriseDatabaseName企业数据库名称不能为空") + private String enterpriseDatabaseName; } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/UpdateEnterprise.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/UpdateEnterprise.java index 2b62125..9fda537 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/UpdateEnterprise.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/form/UpdateEnterprise.java @@ -28,4 +28,7 @@ public class UpdateEnterprise { @NotNull(message = "enterpriseFenceCount企业围栏组不能为空") private Integer enterpriseFenceCount; + + @NotNull(message = "enterpriseDatabaseName企业数据库名称不能为空") + private String enterpriseDatabaseName; } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/KafkaMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/KafkaMapper.java index 9b36ff6..3afe4f4 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/KafkaMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/KafkaMapper.java @@ -3,6 +3,7 @@ package com.muyu.server.mapper; import org.apache.ibatis.annotations.Mapper; /** + * kafka * @author liuxinyue * @Package：com.muyu.server.mapper * @name：KafkaMapper diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/EnterpriseMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/EnterpriseMapper.xml index 76e2c13..843c139 100644 --- a/cloud-modules/saas/saas-server/src/main/resources/mapper/EnterpriseMapper.xml +++ b/cloud-modules/saas/saas-server/src/main/resources/mapper/EnterpriseMapper.xml @@ -31,7 +31,8 @@ insert into tb_enterprise set enterprise_name = #{enterpriseName}, enterprise_car_count = #{enterpriseCarCount}, - enterprise_fence_count = #{enterpriseFenceCount} + enterprise_fence_count = #{enterpriseFenceCount}, + enterprise_database_name=#{enterpriseDatabaseName} @@ -47,7 +48,8 @@ update tb_enterprise set enterprise_name = #{enterpriseName}, enterprise_car_count = #{enterpriseCarCount}, - enterprise_fence_count = #{enterpriseFenceCount} + enterprise_fence_count = #{enterpriseFenceCount}, + enterprise_database_name=#{enterpriseDatabaseName} where enterprise_id = #{enterpriseId} and enterprise_id != 0