From b90448c2d12158cfc826d02c29fc7a354f4d2c51 Mon Sep 17 00:00:00 2001 From: Vinjor Date: Thu, 1 Aug 2024 13:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dl-module-base/pom.xml | 10 +++++++--- .../controller/admin/DlCompanyController.java | 9 +++++---- .../module/{custom => company}/entity/DlCompany.java | 10 ++++------ .../{custom => company}/mapper/DlCompanyMapper.java | 6 +++--- .../{custom => company}/service/DlCompanyService.java | 6 +++--- .../service/impl/DlCompanyServiceImpl.java | 10 +++++----- .../module/{custom => company}/vo/CompanyReqVO.java | 4 ++-- .../main/resources/mapper/custom/DlCompanyMapper.xml | 2 +- yudao-server/pom.xml | 2 +- 9 files changed, 31 insertions(+), 28 deletions(-) rename dl-module-base/src/main/java/cn/iocoder/yudao/module/{custom => company}/controller/admin/DlCompanyController.java (86%) rename dl-module-base/src/main/java/cn/iocoder/yudao/module/{custom => company}/entity/DlCompany.java (84%) rename dl-module-base/src/main/java/cn/iocoder/yudao/module/{custom => company}/mapper/DlCompanyMapper.java (78%) rename dl-module-base/src/main/java/cn/iocoder/yudao/module/{custom => company}/service/DlCompanyService.java (80%) rename dl-module-base/src/main/java/cn/iocoder/yudao/module/{custom => company}/service/impl/DlCompanyServiceImpl.java (78%) rename dl-module-base/src/main/java/cn/iocoder/yudao/module/{custom => company}/vo/CompanyReqVO.java (59%) diff --git a/dl-module-base/pom.xml b/dl-module-base/pom.xml index 5578010f..8d5385a2 100644 --- a/dl-module-base/pom.xml +++ b/dl-module-base/pom.xml @@ -12,8 +12,7 @@ jar ${project.artifactId} - crm 包下，客户关系管理（Customer Relationship Management）。 - 例如说：客户、联系人、商机、合同、回款等等 + 点亮业务基础库 @@ -26,7 +25,11 @@ yudao-module-infra-api ${revision} - + + cn.iocoder.boot + yudao-spring-boot-starter-biz-tenant + 2.1.0-jdk8-snapshot + cn.iocoder.boot @@ -78,5 +81,6 @@ org.springframework.boot spring-boot-starter-mail + \ No newline at end of file diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/DlCompanyController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/controller/admin/DlCompanyController.java similarity index 86% rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/DlCompanyController.java rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/company/controller/admin/DlCompanyController.java index eaeef294..ad118849 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/DlCompanyController.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/controller/admin/DlCompanyController.java @@ -1,8 +1,8 @@ -package cn.iocoder.yudao.module.custom.controller.admin; -import cn.iocoder.yudao.module.custom.entity.DlCompany; +package cn.iocoder.yudao.module.company.controller.admin; +import cn.iocoder.yudao.module.company.entity.DlCompany; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import cn.iocoder.yudao.module.custom.vo.CompanyReqVO; +import cn.iocoder.yudao.module.company.vo.CompanyReqVO; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -14,7 +14,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import org.springframework.beans.factory.annotation.Autowired; -import cn.iocoder.yudao.module.custom.service.DlCompanyService; +import cn.iocoder.yudao.module.company.service.DlCompanyService; /** * 企业信息表（每个租户的下属企业信息）;(dl_company)表控制层 @@ -32,6 +32,7 @@ public class DlCompanyController{ @GetMapping("/page") @Operation(summary = "获得企业信息表（每个租户的下属企业信息）分页") @PreAuthorize("@ss.hasPermission('base:company:query')") + public CommonResult> getCompanyPage(CompanyReqVO pageReqVO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/DlCompany.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/entity/DlCompany.java similarity index 84% rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/DlCompany.java rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/company/entity/DlCompany.java index 93e7fb95..8fa60c47 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/DlCompany.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/entity/DlCompany.java @@ -1,12 +1,11 @@ -package cn.iocoder.yudao.module.custom.entity; +package cn.iocoder.yudao.module.company.entity; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.util.Date; /** @@ -17,7 +16,7 @@ import java.util.Date; @TableName("dl_company") @Data @EqualsAndHashCode(callSuper = true) -public class DlCompany extends BaseDO { +public class DlCompany extends TenantBaseDO { /** 主键标识 */ @TableId private String id ; @@ -47,6 +46,5 @@ public class DlCompany extends BaseDO { private String loginAccount ; /** 关联的菜单编号(实际就是这个企业的用户登录后有哪些菜单权限) */ private String menuIds ; - /** 租户号 */ - private String tenantId ; + } \ No newline at end of file diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/DlCompanyMapper.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/mapper/DlCompanyMapper.java similarity index 78% rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/DlCompanyMapper.java rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/company/mapper/DlCompanyMapper.java index d7872742..5f7b8434 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/mapper/DlCompanyMapper.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/mapper/DlCompanyMapper.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.custom.mapper; +package cn.iocoder.yudao.module.company.mapper; -import cn.iocoder.yudao.module.custom.entity.DlCompany; -import cn.iocoder.yudao.module.custom.vo.CompanyReqVO; +import cn.iocoder.yudao.module.company.entity.DlCompany; +import cn.iocoder.yudao.module.company.vo.CompanyReqVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/DlCompanyService.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/DlCompanyService.java similarity index 80% rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/DlCompanyService.java rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/DlCompanyService.java index 07c7f081..4a8d700a 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/DlCompanyService.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/DlCompanyService.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.custom.service; +package cn.iocoder.yudao.module.company.service; -import cn.iocoder.yudao.module.custom.entity.DlCompany; -import cn.iocoder.yudao.module.custom.vo.CompanyReqVO; +import cn.iocoder.yudao.module.company.entity.DlCompany; +import cn.iocoder.yudao.module.company.vo.CompanyReqVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/DlCompanyServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/impl/DlCompanyServiceImpl.java similarity index 78% rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/DlCompanyServiceImpl.java rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/impl/DlCompanyServiceImpl.java index 8e920daa..7c9efc0f 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/DlCompanyServiceImpl.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/service/impl/DlCompanyServiceImpl.java @@ -1,14 +1,14 @@ -package cn.iocoder.yudao.module.custom.service.impl; +package cn.iocoder.yudao.module.company.service.impl; -import cn.iocoder.yudao.module.custom.entity.DlCompany; +import cn.iocoder.yudao.module.company.entity.DlCompany; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.iocoder.yudao.module.custom.vo.CompanyReqVO; +import cn.iocoder.yudao.module.company.vo.CompanyReqVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import cn.iocoder.yudao.module.custom.mapper.DlCompanyMapper; -import cn.iocoder.yudao.module.custom.service.DlCompanyService; +import cn.iocoder.yudao.module.company.mapper.DlCompanyMapper; +import cn.iocoder.yudao.module.company.service.DlCompanyService; /** * 企业信息表（每个租户的下属企业信息）;(dl_company)表服务实现类 * @author : http://www.chiner.pro diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CompanyReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/vo/CompanyReqVO.java similarity index 59% rename from dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CompanyReqVO.java rename to dl-module-base/src/main/java/cn/iocoder/yudao/module/company/vo/CompanyReqVO.java index 00026393..ea61abc1 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CompanyReqVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/company/vo/CompanyReqVO.java @@ -1,6 +1,6 @@ -package cn.iocoder.yudao.module.custom.vo; +package cn.iocoder.yudao.module.company.vo; -import cn.iocoder.yudao.module.custom.entity.DlCompany; +import cn.iocoder.yudao.module.company.entity.DlCompany; import lombok.Data; /** * 企业查询vo diff --git a/dl-module-base/src/main/resources/mapper/custom/DlCompanyMapper.xml b/dl-module-base/src/main/resources/mapper/custom/DlCompanyMapper.xml index 077be9a0..093dc2bf 100644 --- a/dl-module-base/src/main/resources/mapper/custom/DlCompanyMapper.xml +++ b/dl-module-base/src/main/resources/mapper/custom/DlCompanyMapper.xml @@ -2,7 +2,7 @@ - select * from base_company \ No newline at end of file diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml index 282f1b78..beac859e 100644 --- a/yudao-server/pom.xml +++ b/yudao-server/pom.xml @@ -31,7 +31,7 @@ yudao-module-infra-biz ${revision} - + cn.iocoder.boot dl-module-base