From fcf9455064dc0db084e6d95adada74fa85aae7aa Mon Sep 17 00:00:00 2001 From: Vinjor Date: Wed, 31 Jul 2024 18:52:51 +0800 Subject: [PATCH] 1 --- .../controller/DlCompanyController.java | 65 +++++++++++++++++++ .../custom/controller/TestController.java | 4 -- .../module/custom/dao/TestMapper.java | 9 --- .../module/custom/entity/DlCompany.java | 52 +++++++++++++++ .../module/custom/entity/TestEntity.java | 4 -- .../module/custom/mapper/DlCompanyMapper.java | 21 ++++++ .../custom/service/DlCompanyService.java | 26 ++++++++ .../module/custom/service/TestService.java | 7 -- .../service/impl/DlCompanyServiceImpl.java | 39 +++++++++++ .../custom/service/impl/TestServiceImpl.java | 11 ---- .../module/custom/vo/CompanyReqVO.java | 12 ++++ .../main/resources/mapper/DlCompanyMapper.xml | 8 +++ .../src/main/resources/mapper/TestMapper.xml | 6 -- 13 files changed, 223 insertions(+), 41 deletions(-) create mode 100644 dl-module-base/src/main/java/com/dianliang/module/custom/controller/DlCompanyController.java delete mode 100644 dl-module-base/src/main/java/com/dianliang/module/custom/controller/TestController.java delete mode 100644 dl-module-base/src/main/java/com/dianliang/module/custom/dao/TestMapper.java create mode 100644 dl-module-base/src/main/java/com/dianliang/module/custom/entity/DlCompany.java delete mode 100644 dl-module-base/src/main/java/com/dianliang/module/custom/entity/TestEntity.java create mode 100644 dl-module-base/src/main/java/com/dianliang/module/custom/mapper/DlCompanyMapper.java create mode 100644 dl-module-base/src/main/java/com/dianliang/module/custom/service/DlCompanyService.java delete mode 100644 dl-module-base/src/main/java/com/dianliang/module/custom/service/TestService.java create mode 100644 dl-module-base/src/main/java/com/dianliang/module/custom/service/impl/DlCompanyServiceImpl.java delete mode 100644 dl-module-base/src/main/java/com/dianliang/module/custom/service/impl/TestServiceImpl.java create mode 100644 dl-module-base/src/main/java/com/dianliang/module/custom/vo/CompanyReqVO.java create mode 100644 dl-module-base/src/main/resources/mapper/DlCompanyMapper.xml delete mode 100644 dl-module-base/src/main/resources/mapper/TestMapper.xml diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/controller/DlCompanyController.java b/dl-module-base/src/main/java/com/dianliang/module/custom/controller/DlCompanyController.java new file mode 100644 index 00000000..54a03ab5 --- /dev/null +++ b/dl-module-base/src/main/java/com/dianliang/module/custom/controller/DlCompanyController.java @@ -0,0 +1,65 @@ +package com.dianliang.module.custom.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.dianliang.module.custom.vo.CompanyReqVO; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import com.dianliang.module.custom.entity.DlCompany; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import com.dianliang.module.custom.service.DlCompanyService; + +import javax.validation.Valid; + +/** + * 企业信息表（每个租户的下属企业信息）;(dl_company)表控制层 + * @author : http://www.chiner.pro + * @date : 2024-7-31 + */ +@RestController +@RequestMapping("/base/company") +@Tag(name = "管理后台 - BASE 企业管理") +@Validated +public class DlCompanyController{ + @Autowired + private DlCompanyService dlCompanyService; + + @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) { + Page page = new Page<>(pageNo, pageSize); + return success(dlCompanyService.queryListPage(pageReqVO,page)); + } +} \ No newline at end of file diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/controller/TestController.java b/dl-module-base/src/main/java/com/dianliang/module/custom/controller/TestController.java deleted file mode 100644 index 8460cc51..00000000 --- a/dl-module-base/src/main/java/com/dianliang/module/custom/controller/TestController.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.dianliang.module.custom.controller; - -public class TestController { -} diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/dao/TestMapper.java b/dl-module-base/src/main/java/com/dianliang/module/custom/dao/TestMapper.java deleted file mode 100644 index 64f47506..00000000 --- a/dl-module-base/src/main/java/com/dianliang/module/custom/dao/TestMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.dianliang.module.custom.dao; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dianliang.module.custom.entity.TestEntity; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface TestMapper extends BaseMapper { -} diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/entity/DlCompany.java b/dl-module-base/src/main/java/com/dianliang/module/custom/entity/DlCompany.java new file mode 100644 index 00000000..93ecb030 --- /dev/null +++ b/dl-module-base/src/main/java/com/dianliang/module/custom/entity/DlCompany.java @@ -0,0 +1,52 @@ +package com.dianliang.module.custom.entity; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +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; + + /** + * 企业信息表（每个租户的下属企业信息）; + * @author : http://www.chiner.pro + * @date : 2024-7-31 + */ +@TableName("dl_company") +@Data +@EqualsAndHashCode(callSuper = true) +public class DlCompany extends BaseDO { + /** 主键标识 */ + @TableId + private String id ; + /** 企业名称 */ + private String corpName ; + /** 统一社会信用代码 */ + private String orgCard ; + /** 注册资本（单位：万元） */ + private Integer registFund ; + /** 注册日期 */ + private Date registDate ; + /** 详细地址 */ + private String address ; + /** 法人姓名 */ + private String legalName ; + /** 法人身份证号 */ + private String legalCard ; + /** 联系人 */ + private String contactName ; + /** 联系方式 */ + private String mobilePhone ; + /** 企业简介 */ + private String corpContent ; + /** 经营范围 */ + private String business ; + /** 管理员登录账号 */ + private String loginAccount ; + /** 关联的菜单编号(实际就是这个企业的用户登录后有哪些菜单权限) */ + private String menuIds ; + /** 租户号 */ + private String tenantId ; +} \ No newline at end of file diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/entity/TestEntity.java b/dl-module-base/src/main/java/com/dianliang/module/custom/entity/TestEntity.java deleted file mode 100644 index 79808ec5..00000000 --- a/dl-module-base/src/main/java/com/dianliang/module/custom/entity/TestEntity.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.dianliang.module.custom.entity; - -public class TestEntity { -} diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/mapper/DlCompanyMapper.java b/dl-module-base/src/main/java/com/dianliang/module/custom/mapper/DlCompanyMapper.java new file mode 100644 index 00000000..59fd87c1 --- /dev/null +++ b/dl-module-base/src/main/java/com/dianliang/module/custom/mapper/DlCompanyMapper.java @@ -0,0 +1,21 @@ +package com.dianliang.module.custom.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.dianliang.module.custom.vo.CompanyReqVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.dianliang.module.custom.entity.DlCompany; + + /** + * 企业信息表（每个租户的下属企业信息）;(dl_company)表数据库访问层 + * @author : http://www.chiner.pro + * @date : 2024-7-31 + */ +@Mapper +public interface DlCompanyMapper extends BaseMapper{ + IPage selectListPage(@Param("map") CompanyReqVO companyReqVO, Page page); +} \ No newline at end of file diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/service/DlCompanyService.java b/dl-module-base/src/main/java/com/dianliang/module/custom/service/DlCompanyService.java new file mode 100644 index 00000000..b1fb0783 --- /dev/null +++ b/dl-module-base/src/main/java/com/dianliang/module/custom/service/DlCompanyService.java @@ -0,0 +1,26 @@ +package com.dianliang.module.custom.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.dianliang.module.custom.entity.DlCompany; +import java.util.*; +import javax.validation.*; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import com.dianliang.module.custom.vo.CompanyReqVO; + +/** + * 企业信息表（每个租户的下属企业信息）;(dl_company)表服务接口 + * @author : http://www.chiner.pro + * @date : 2024-7-31 + */ +public interface DlCompanyService extends IService { + /** + * 获得企业信息表（每个租户的下属企业信息）分页 + * + * @param pageReqVO 分页查询 + * @return 企业信息表（每个租户的下属企业信息）分页 + */ + IPage queryListPage(CompanyReqVO pageReqVO, Page page); +} \ No newline at end of file diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/service/TestService.java b/dl-module-base/src/main/java/com/dianliang/module/custom/service/TestService.java deleted file mode 100644 index ef452f0d..00000000 --- a/dl-module-base/src/main/java/com/dianliang/module/custom/service/TestService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.dianliang.module.custom.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.dianliang.module.custom.entity.TestEntity; - -public interface TestService extends IService { -} diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/service/impl/DlCompanyServiceImpl.java b/dl-module-base/src/main/java/com/dianliang/module/custom/service/impl/DlCompanyServiceImpl.java new file mode 100644 index 00000000..46885eca --- /dev/null +++ b/dl-module-base/src/main/java/com/dianliang/module/custom/service/impl/DlCompanyServiceImpl.java @@ -0,0 +1,39 @@ +package com.dianliang.module.custom.service.impl; + +import cn.hutool.core.util.StrUtil; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dianliang.module.custom.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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; +import com.dianliang.module.custom.entity.DlCompany; +import com.dianliang.module.custom.mapper.DlCompanyMapper; +import com.dianliang.module.custom.service.DlCompanyService; + /** + * 企业信息表（每个租户的下属企业信息）;(dl_company)表服务实现类 + * @author : http://www.chiner.pro + * @date : 2024-7-31 + */ +@Service +public class DlCompanyServiceImpl extends ServiceImpl implements DlCompanyService{ + @Autowired + private DlCompanyMapper dlCompanyMapper; + + + /** + * 获得企业信息表（每个租户的下属企业信息）分页 + * + * @param pageReqVO 分页查询 + * @param page + * @return 企业信息表（每个租户的下属企业信息）分页 + */ + @Override + public IPage queryListPage(CompanyReqVO pageReqVO, Page page) { + IPage pageList = dlCompanyMapper.selectListPage(pageReqVO,page); + return pageList; + } + } \ No newline at end of file diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/service/impl/TestServiceImpl.java b/dl-module-base/src/main/java/com/dianliang/module/custom/service/impl/TestServiceImpl.java deleted file mode 100644 index 24708923..00000000 --- a/dl-module-base/src/main/java/com/dianliang/module/custom/service/impl/TestServiceImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.dianliang.module.custom.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.dianliang.module.custom.dao.TestMapper; -import com.dianliang.module.custom.entity.TestEntity; -import com.dianliang.module.custom.service.TestService; -import org.springframework.stereotype.Service; - -@Service -public class TestServiceImpl extends ServiceImpl implements TestService { -} diff --git a/dl-module-base/src/main/java/com/dianliang/module/custom/vo/CompanyReqVO.java b/dl-module-base/src/main/java/com/dianliang/module/custom/vo/CompanyReqVO.java new file mode 100644 index 00000000..2d1e8e2f --- /dev/null +++ b/dl-module-base/src/main/java/com/dianliang/module/custom/vo/CompanyReqVO.java @@ -0,0 +1,12 @@ +package com.dianliang.module.custom.vo; + +import com.dianliang.module.custom.entity.DlCompany; +import lombok.Data; +/** + * 企业查询vo + * @author vinjor-M + * @date 17:37 2024/7/31 +**/ +@Data +public class CompanyReqVO extends DlCompany { +} diff --git a/dl-module-base/src/main/resources/mapper/DlCompanyMapper.xml b/dl-module-base/src/main/resources/mapper/DlCompanyMapper.xml new file mode 100644 index 00000000..4a6f3004 --- /dev/null +++ b/dl-module-base/src/main/resources/mapper/DlCompanyMapper.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/dl-module-base/src/main/resources/mapper/TestMapper.xml b/dl-module-base/src/main/resources/mapper/TestMapper.xml deleted file mode 100644 index d708aaae..00000000 --- a/dl-module-base/src/main/resources/mapper/TestMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file