diff --git a/resource-server/src/main/java/com/evotech/hd/resource/entity/Company.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/Company.java similarity index 97% rename from resource-server/src/main/java/com/evotech/hd/resource/entity/Company.java rename to base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/Company.java index bcc503b..9c5d4a2 100644 --- a/resource-server/src/main/java/com/evotech/hd/resource/entity/Company.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/Company.java @@ -1,4 +1,4 @@ -package com.evotech.hd.resource.entity; +package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -73,7 +73,7 @@ public class Company implements Serializable { @Schema(description = "状态：1-启用，0-禁用") private Integer status; - @Schema(description = "删除标识：1-已删除，0-未删除") + @Schema(description = "删除标识：1-已删除，0-未删除", hidden = true) private Integer delFlag; @Schema(description = "账户余额") diff --git a/base-commons/common-mybatis/src/main/java/com/evotech/hd/common/mybatis/config/MybatisPlusConfig.java b/base-commons/common-mybatis/src/main/java/com/evotech/hd/common/mybatis/config/MybatisPlusConfig.java new file mode 100644 index 0000000..a1aef05 --- /dev/null +++ b/base-commons/common-mybatis/src/main/java/com/evotech/hd/common/mybatis/config/MybatisPlusConfig.java @@ -0,0 +1,25 @@ +package com.evotech.hd.common.mybatis.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; + +@Configuration +public class MybatisPlusConfig { + + /** + * 添加分页插件 + */ + @Bean + MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + // 如果配置多个插件, 切记分页最后添加 + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType + return interceptor; + } + +} diff --git a/resource-server/src/main/java/com/evotech/hd/resource/controller/CompanyController.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/CompanyController.java similarity index 81% rename from resource-server/src/main/java/com/evotech/hd/resource/controller/CompanyController.java rename to cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/CompanyController.java index b01c7b7..ac9b9cd 100644 --- a/resource-server/src/main/java/com/evotech/hd/resource/controller/CompanyController.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/CompanyController.java @@ -1,6 +1,7 @@ -package com.evotech.hd.resource.controller; +package com.evotech.hd.cloud.controller.customer; import java.util.List; +import java.util.Map; import org.springdoc.core.annotations.ParameterObject; import org.springframework.web.bind.annotation.GetMapping; @@ -8,10 +9,10 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.evotech.hd.cloud.service.CompanyService; import com.evotech.hd.common.core.entity.BasePageRequest; import com.evotech.hd.common.core.entity.Result; -import com.evotech.hd.resource.entity.Company; -import com.evotech.hd.resource.service.CompanyService; +import com.evotech.hd.common.core.entity.cloud.Company; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; @@ -23,8 +24,8 @@ import jakarta.validation.constraints.NotNull; @Tag(name = "公司管理") @RestController -@RequestMapping("/system/company") -@ApiSupport(order = 84) +@RequestMapping("/company") +@ApiSupport(order = 33) public class CompanyController { @@ -59,5 +60,10 @@ public class CompanyController { public Result> list(@Valid @ParameterObject BasePageRequest bpr) { return companyService.list(bpr); } + + @GetMapping("/companyByCode") + public Result> companyByCode(String ccode) { + return companyService.companyByCode(ccode); + } } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/WechatUserController.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/WechatUserController.java similarity index 95% rename from cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/WechatUserController.java rename to cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/WechatUserController.java index b130f3a..c52cdea 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/WechatUserController.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/customer/WechatUserController.java @@ -1,4 +1,4 @@ -package com.evotech.hd.cloud.controller; +package com.evotech.hd.cloud.controller.customer; import java.util.List; @@ -21,7 +21,7 @@ import jakarta.annotation.Resource; @Tag(name = "微信用户") @RestController @RequestMapping("/wechat/user") -@ApiSupport(order = 11) +@ApiSupport(order = 32) public class WechatUserController { @Resource diff --git a/resource-server/src/main/java/com/evotech/hd/resource/dao/CompanyDao.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/CompanyDao.java similarity index 64% rename from resource-server/src/main/java/com/evotech/hd/resource/dao/CompanyDao.java rename to cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/CompanyDao.java index ccb3e73..eb76caa 100644 --- a/resource-server/src/main/java/com/evotech/hd/resource/dao/CompanyDao.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/dao/CompanyDao.java @@ -1,7 +1,7 @@ -package com.evotech.hd.resource.dao; +package com.evotech.hd.cloud.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.evotech.hd.resource.entity.Company; +import com.evotech.hd.common.core.entity.cloud.Company; /** * @author zrb diff --git a/resource-server/src/main/java/com/evotech/hd/resource/service/CompanyService.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/CompanyService.java similarity index 67% rename from resource-server/src/main/java/com/evotech/hd/resource/service/CompanyService.java rename to cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/CompanyService.java index 752f34f..23e87d9 100644 --- a/resource-server/src/main/java/com/evotech/hd/resource/service/CompanyService.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/CompanyService.java @@ -1,10 +1,11 @@ -package com.evotech.hd.resource.service; +package com.evotech.hd.cloud.service; import java.util.List; +import java.util.Map; import com.evotech.hd.common.core.entity.BasePageRequest; import com.evotech.hd.common.core.entity.Result; -import com.evotech.hd.resource.entity.Company; +import com.evotech.hd.common.core.entity.cloud.Company; public interface CompanyService { @@ -15,5 +16,7 @@ public interface CompanyService { public Result update(Company company); public Result> list(BasePageRequest bpr); + + public Result> companyByCode(String ccode); } diff --git a/resource-server/src/main/java/com/evotech/hd/resource/service/impl/CompanyServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/CompanyServiceImpl.java similarity index 71% rename from resource-server/src/main/java/com/evotech/hd/resource/service/impl/CompanyServiceImpl.java rename to cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/CompanyServiceImpl.java index d73f0ba..c74f2d5 100644 --- a/resource-server/src/main/java/com/evotech/hd/resource/service/impl/CompanyServiceImpl.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/CompanyServiceImpl.java @@ -1,19 +1,20 @@ -package com.evotech.hd.resource.service.impl; +package com.evotech.hd.cloud.service.impl; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.evotech.hd.cloud.dao.CompanyDao; +import com.evotech.hd.cloud.service.CompanyService; import com.evotech.hd.common.core.entity.BasePageRequest; import com.evotech.hd.common.core.entity.Result; +import com.evotech.hd.common.core.entity.cloud.Company; import com.evotech.hd.common.core.enums.CodeMsg; -import com.evotech.hd.resource.dao.CompanyDao; -import com.evotech.hd.resource.entity.Company; -import com.evotech.hd.resource.service.CompanyService; - import jakarta.annotation.Resource; @@ -65,4 +66,16 @@ public class CompanyServiceImpl implements CompanyService { return new Result>().success(page); } + @Override + public Result> companyByCode(String ccode) { + Company one = companyDao.selectOne(new QueryWrapper().eq("ccode", ccode)); + if (one == null) { + return new Result>().error(CodeMsg.DATABASE_RESULT_NULL); + } + Map m = new HashMap(); + m.put("ccode", one.getCcode()); + m.put("cname", one.getCname()); + return new Result>().success(m); + } + }