From 18914f5b70816fa7e8852252255d4c27c5ac2cc5 Mon Sep 17 00:00:00 2001 From: baize <3533151373@qq.com> Date: Thu, 6 Jun 2024 22:26:41 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E6=8B=86=E5=88=86=E5=A4=9A=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=A8=A1=E5=9D=97=EF=BC=8C=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E7=B3=BB=E7=BB=9F=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-common/muyu-common-saas/pom.xml | 38 +++++++++++++++++++ .../saas}/contents/DatasourceContent.java | 2 +- .../com/muyu/saas}/contents/SaaSConstant.java | 2 +- .../muyu/saas/datasource}/ManyDataSource.java | 17 ++++----- .../saas}/domain/model/DataSourceInfo.java | 11 +++--- .../saas}/domain/model/EnterPriseInfo.java | 2 +- .../muyu/saas}/exception/SaaSException.java | 2 +- .../saas}/factory/DruidDataSourceFactory.java | 4 +- .../saas}/holder/DynamicDataSourceHolder.java | 2 +- .../saas}/interceptor/SaaSInterceptor.java | 10 ++--- .../saas}/interceptor/WebMvcSaaSConfig.java | 2 +- .../muyu/saas}/role/DynamicDataSource.java | 4 +- ...ot.autoconfigure.AutoConfiguration.imports | 4 ++ muyu-common/pom.xml | 1 + .../muyu-customer-business-server/pom.xml | 6 ++- .../MuYuCustomerBusinessApplication.java | 2 + .../controller/VehicleController.java | 10 +++++ .../controller/VehicleController.java | 2 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - .../muyu-net-working-remote/pom.xml | 14 +++++++ .../com/muyu/net/working/feign/DeptFeign.java | 29 ++++++++++++++ .../com/muyu/net/working/feign/UserFeign.java | 24 ++++++++++++ .../muyu-net-working-server/pom.xml | 6 ++- .../controller/EnterpriseController.java | 18 +++++++++ .../system/controller/SysDeptController.java | 1 + 25 files changed, 179 insertions(+), 35 deletions(-) create mode 100644 muyu-common/muyu-common-saas/pom.xml rename {muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config => muyu-common/muyu-common-saas/src/main/java/com/muyu/saas}/contents/DatasourceContent.java (89%) rename {muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config => muyu-common/muyu-common-saas/src/main/java/com/muyu/saas}/contents/SaaSConstant.java (77%) rename {muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config => muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource}/ManyDataSource.java (86%) rename {muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config => muyu-common/muyu-common-saas/src/main/java/com/muyu/saas}/domain/model/DataSourceInfo.java (72%) rename {muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config => muyu-common/muyu-common-saas/src/main/java/com/muyu/saas}/domain/model/EnterPriseInfo.java (87%) rename {muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config => muyu-common/muyu-common-saas/src/main/java/com/muyu/saas}/exception/SaaSException.java (89%) rename {muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config => muyu-common/muyu-common-saas/src/main/java/com/muyu/saas}/factory/DruidDataSourceFactory.java (91%) rename {muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config => muyu-common/muyu-common-saas/src/main/java/com/muyu/saas}/holder/DynamicDataSourceHolder.java (95%) rename {muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config => muyu-common/muyu-common-saas/src/main/java/com/muyu/saas}/interceptor/SaaSInterceptor.java (82%) rename {muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config => muyu-common/muyu-common-saas/src/main/java/com/muyu/saas}/interceptor/WebMvcSaaSConfig.java (93%) rename {muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config => muyu-common/muyu-common-saas/src/main/java/com/muyu/saas}/role/DynamicDataSource.java (92%) create mode 100644 muyu-common/muyu-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 muyu-modules/muyu-many-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/DeptFeign.java create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/UserFeign.java diff --git a/muyu-common/muyu-common-saas/pom.xml b/muyu-common/muyu-common-saas/pom.xml new file mode 100644 index 0000000..7f86bfa --- /dev/null +++ b/muyu-common/muyu-common-saas/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + com.muyu + muyu-common + 3.6.3 + + + muyu-common-saas + + + 17 + 17 + UTF-8 + + + SaaS多数据源模块 + + + + com.muyu + muyu-common-core + + + com.alibaba + druid + 1.2.20 + compile + + + org.springframework + spring-webmvc + + + diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/contents/DatasourceContent.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/contents/DatasourceContent.java similarity index 89% rename from muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/contents/DatasourceContent.java rename to muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/contents/DatasourceContent.java index b18fcb0..c794db9 100644 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/contents/DatasourceContent.java +++ b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/contents/DatasourceContent.java @@ -1,4 +1,4 @@ -package com.muyu.many.datasource.config.contents; +package com.muyu.saas.contents; /** * @author DongZl diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/contents/SaaSConstant.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/contents/SaaSConstant.java similarity index 77% rename from muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/contents/SaaSConstant.java rename to muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/contents/SaaSConstant.java index fbea0ee..e7ad2cf 100644 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/contents/SaaSConstant.java +++ b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/contents/SaaSConstant.java @@ -1,4 +1,4 @@ -package com.muyu.many.datasource.config.contents; +package com.muyu.saas.contents; /** * SaaS常量 SaaSConstant diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/ManyDataSource.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java similarity index 86% rename from muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/ManyDataSource.java rename to muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java index 70194e8..cb29b15 100644 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/ManyDataSource.java +++ b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java @@ -1,16 +1,15 @@ -package com.muyu.many.datasource.config; +package com.muyu.saas.datasource; import com.alibaba.druid.pool.DruidDataSource; import com.muyu.common.core.utils.SpringUtils; -import com.muyu.many.datasource.config.domain.model.DataSourceInfo; -import com.muyu.many.datasource.config.domain.model.EnterPriseInfo; -import com.muyu.many.datasource.config.factory.DruidDataSourceFactory; -import com.muyu.many.datasource.config.role.DynamicDataSource; + +import com.muyu.saas.domain.model.DataSourceInfo; +import com.muyu.saas.domain.model.EnterPriseInfo; +import com.muyu.saas.factory.DruidDataSourceFactory; +import com.muyu.saas.role.DynamicDataSource; import lombok.AllArgsConstructor; -import lombok.Data; import lombok.extern.log4j.Log4j2; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; @@ -40,9 +39,9 @@ public class ManyDataSource { DruidDataSourceFactory druidDataSourceFactory= SpringUtils.getBean(DruidDataSourceFactory.class); DynamicDataSource dynamicDataSource= SpringUtils.getBean(DynamicDataSource.class); EnterPriseInfo enterPriseInfo = EnterPriseInfo.builder() - .entCode("liu_0603") + .entCode("liu_0605") .ip("192.168.116.129") - .port(3308) + .port(3309) .build(); DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(enterPriseInfo.getEntCode(), enterPriseInfo.getIp(), enterPriseInfo.getPort()); diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/domain/model/DataSourceInfo.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/domain/model/DataSourceInfo.java similarity index 72% rename from muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/domain/model/DataSourceInfo.java rename to muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/domain/model/DataSourceInfo.java index 523be04..04b9f75 100644 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/domain/model/DataSourceInfo.java +++ b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/domain/model/DataSourceInfo.java @@ -1,14 +1,13 @@ -package com.muyu.many.datasource.config.domain.model; +package com.muyu.saas.domain.model; import com.muyu.common.core.utils.StringUtils; +import com.muyu.saas.contents.DatasourceContent; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import static com.muyu.many.datasource.config.contents.DatasourceContent.*; - /** * @author DongZl @@ -45,9 +44,9 @@ public class DataSourceInfo { public static DataSourceInfo hostAndPortBuild(String key,String host, Integer port){ return DataSourceInfo.builder() .key(key) - .url(StringUtils.format(DATASOURCE_URL, host, port,port)) - .password(PASSWORD) - .userName(USER_NAME) + .url(StringUtils.format(DatasourceContent.DATASOURCE_URL, host, port,port)) + .password(DatasourceContent.PASSWORD) + .userName(DatasourceContent.USER_NAME) .build(); } } diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/domain/model/EnterPriseInfo.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/domain/model/EnterPriseInfo.java similarity index 87% rename from muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/domain/model/EnterPriseInfo.java rename to muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/domain/model/EnterPriseInfo.java index 1919db4..ac20ed2 100644 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/domain/model/EnterPriseInfo.java +++ b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/domain/model/EnterPriseInfo.java @@ -1,4 +1,4 @@ -package com.muyu.many.datasource.config.domain.model; +package com.muyu.saas.domain.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/exception/SaaSException.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/exception/SaaSException.java similarity index 89% rename from muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/exception/SaaSException.java rename to muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/exception/SaaSException.java index d7d2a07..f2b33b2 100644 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/exception/SaaSException.java +++ b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/exception/SaaSException.java @@ -1,4 +1,4 @@ -package com.muyu.many.datasource.config.exception; +package com.muyu.saas.exception; import com.muyu.common.core.exception.ServiceException; diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/factory/DruidDataSourceFactory.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/factory/DruidDataSourceFactory.java similarity index 91% rename from muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/factory/DruidDataSourceFactory.java rename to muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/factory/DruidDataSourceFactory.java index 1f5c9eb..bcd8ed8 100644 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/factory/DruidDataSourceFactory.java +++ b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/factory/DruidDataSourceFactory.java @@ -1,7 +1,7 @@ -package com.muyu.many.datasource.config.factory; +package com.muyu.saas.factory; import com.alibaba.druid.pool.DruidDataSource; -import com.muyu.many.datasource.config.domain.model.DataSourceInfo; +import com.muyu.saas.domain.model.DataSourceInfo; import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Component; diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/holder/DynamicDataSourceHolder.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/holder/DynamicDataSourceHolder.java similarity index 95% rename from muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/holder/DynamicDataSourceHolder.java rename to muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/holder/DynamicDataSourceHolder.java index 9d435a8..4750419 100644 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/holder/DynamicDataSourceHolder.java +++ b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/holder/DynamicDataSourceHolder.java @@ -1,4 +1,4 @@ -package com.muyu.many.datasource.config.holder; +package com.muyu.saas.holder; import lombok.extern.slf4j.Slf4j; import org.springframework.util.Assert; diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/interceptor/SaaSInterceptor.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/interceptor/SaaSInterceptor.java similarity index 82% rename from muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/interceptor/SaaSInterceptor.java rename to muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/interceptor/SaaSInterceptor.java index a56f156..f071952 100644 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/interceptor/SaaSInterceptor.java +++ b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/interceptor/SaaSInterceptor.java @@ -1,11 +1,11 @@ -package com.muyu.many.datasource.config.interceptor; +package com.muyu.saas.interceptor; import com.muyu.common.core.utils.ServletUtils; import com.muyu.common.core.utils.SpringUtils; -import com.muyu.many.datasource.config.contents.SaaSConstant; -import com.muyu.many.datasource.config.exception.SaaSException; -import com.muyu.many.datasource.config.holder.DynamicDataSourceHolder; -import com.muyu.many.datasource.config.role.DynamicDataSource; +import com.muyu.saas.contents.SaaSConstant; +import com.muyu.saas.exception.SaaSException; +import com.muyu.saas.holder.DynamicDataSourceHolder; +import com.muyu.saas.role.DynamicDataSource; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.AsyncHandlerInterceptor; diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/interceptor/WebMvcSaaSConfig.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/interceptor/WebMvcSaaSConfig.java similarity index 93% rename from muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/interceptor/WebMvcSaaSConfig.java rename to muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/interceptor/WebMvcSaaSConfig.java index 4d83a7e..d28bdf7 100644 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/interceptor/WebMvcSaaSConfig.java +++ b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/interceptor/WebMvcSaaSConfig.java @@ -1,4 +1,4 @@ -package com.muyu.many.datasource.config.interceptor; +package com.muyu.saas.interceptor; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/role/DynamicDataSource.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/role/DynamicDataSource.java similarity index 92% rename from muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/role/DynamicDataSource.java rename to muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/role/DynamicDataSource.java index c38cd60..c7ecfe7 100644 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/role/DynamicDataSource.java +++ b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/role/DynamicDataSource.java @@ -1,7 +1,7 @@ -package com.muyu.many.datasource.config.role; +package com.muyu.saas.role; import com.alibaba.druid.pool.DruidDataSource; -import com.muyu.many.datasource.config.holder.DynamicDataSourceHolder; +import com.muyu.saas.holder.DynamicDataSourceHolder; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/muyu-common/muyu-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-common/muyu-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..f20490c --- /dev/null +++ b/muyu-common/muyu-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,4 @@ +com.muyu.saas.interceptor.WebMvcSaaSConfig +com.muyu.saas.factory.DruidDataSourceFactory +com.muyu.saas.datasource.ManyDataSource +com.muyu.saas.domain.model.EnterPriseInfo diff --git a/muyu-common/pom.xml b/muyu-common/pom.xml index 5b58e93..b995e91 100644 --- a/muyu-common/pom.xml +++ b/muyu-common/pom.xml @@ -18,6 +18,7 @@ muyu-common-datascope muyu-common-datasource muyu-common-system + muyu-common-saas muyu-common diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/pom.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-server/pom.xml index 77f1d83..f49f4d2 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/pom.xml +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/pom.xml @@ -84,7 +84,11 @@ com.muyu muyu-common-swagger - + + com.muyu + muyu-common-saas + 3.6.3 + diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/MuYuCustomerBusinessApplication.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/MuYuCustomerBusinessApplication.java index e949ff3..de544fc 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/MuYuCustomerBusinessApplication.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/MuYuCustomerBusinessApplication.java @@ -1,10 +1,12 @@ package com.muyu.customer.business; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; import com.muyu.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 车联网客户业务系统启动类 MuYuCustomerBusinessApplication diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java index 4e3e0fe..f78c568 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java @@ -3,6 +3,8 @@ package com.muyu.customer.business.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.muyu.customer.business.mapper.VehicleMapper; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -108,4 +110,12 @@ public class VehicleController extends BaseController { public Result remove(@PathVariable List ids) { return toAjax(vehicleService.removeBatchByIds(ids)); } + + @Autowired + private VehicleMapper vehicleMapper; + + @GetMapping("/list/all") + public Result> findAll () { + return Result.success(vehicleMapper.selectList(new QueryWrapper<>())); + } } diff --git a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/controller/VehicleController.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/controller/VehicleController.java index 94c7e8e..0d36b25 100644 --- a/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/controller/VehicleController.java +++ b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/controller/VehicleController.java @@ -2,12 +2,10 @@ package com.muyu.many.datasource.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.muyu.common.core.domain.Result; -import com.muyu.many.datasource.config.holder.DynamicDataSourceHolder; import com.muyu.many.datasource.domain.Vehicle; import com.muyu.many.datasource.mapper.VehicleMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/muyu-modules/muyu-many-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-many-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 437355e..0000000 --- a/muyu-modules/muyu-many-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.muyu.many.datasource.config.interceptor.WebMvcSaaSConfig diff --git a/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml b/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml index f2fa13a..9b84764 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml +++ b/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml @@ -16,5 +16,19 @@ 17 UTF-8 + + + org.springframework.cloud + spring-cloud-openfeign-core + + + com.muyu + muyu-common-security + + + com.muyu + muyu-common-core + + diff --git a/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/DeptFeign.java b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/DeptFeign.java new file mode 100644 index 0000000..1729048 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/DeptFeign.java @@ -0,0 +1,29 @@ +package com.muyu.net.working.feign; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.common.system.domain.SysDept; +import com.muyu.common.system.domain.SysUser; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 用户添加远程调用 UserFeign + * + * @author DeKangLiu + * Date 2024/6/6 09:06 + */ +@FeignClient("muyu-system/dept") +public interface DeptFeign { + + @RequiresPermissions("system:dept:add") + @PostMapping + public Result add (@Validated @RequestBody SysDept dept); + + @RequiresPermissions("system:dept:list") + @GetMapping("/list") + public Result list (SysDept dept); +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/UserFeign.java b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/UserFeign.java new file mode 100644 index 0000000..e8ef118 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-remote/src/main/java/com/muyu/net/working/feign/UserFeign.java @@ -0,0 +1,24 @@ +package com.muyu.net.working.feign; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.common.system.domain.SysDept; +import com.muyu.common.system.domain.SysUser; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 用户添加远程调用 UserFeign + * + * @author DeKangLiu + * Date 2024/6/6 09:06 + */ +@FeignClient("muyu-system/user") +public interface UserFeign { + @RequiresPermissions("system:user:add") + @PostMapping("") + public Result add (@Validated @RequestBody SysUser user); +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml b/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml index f461bd3..94ad871 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml @@ -18,7 +18,11 @@ - + + com.muyu + muyu-net-working-remote + 3.6.3 + com.muyu muyu-net-working-common diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java index a390eda..e415c36 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java @@ -3,6 +3,10 @@ package com.muyu.net.working.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.muyu.common.system.domain.SysDept; +import com.muyu.common.system.domain.SysUser; +import com.muyu.net.working.feign.DeptFeign; +import com.muyu.net.working.feign.UserFeign; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -38,6 +42,10 @@ import com.muyu.common.core.web.page.TableDataInfo; public class EnterpriseController extends BaseController { @Autowired private EnterpriseService enterpriseService; + @Autowired + private UserFeign userFeign; + @Autowired + private DeptFeign deptFeign; /** * 查询车辆运营平台列表 @@ -83,6 +91,16 @@ public class EnterpriseController extends BaseController { @PostMapping @ApiOperation("新增车辆运营平台") public Result add(@RequestBody EnterpriseSaveReq enterpriseSaveReq) { + + + SysDept sysDept = new SysDept(); + sysDept.setDeptName(enterpriseSaveReq.getEbterpriseName()); + Result list = deptFeign.list(sysDept); + if (list!=null){ + return Result.error("部门名称重复"); + } + Result add = deptFeign.add(sysDept); + return toAjax(enterpriseService.save(Enterprise.saveBuild(enterpriseSaveReq))); } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java index f1ed572..606cb24 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java @@ -50,6 +50,7 @@ public class SysDeptController extends BaseController { return success(depts); } + /** * 根据部门编号获取详细信息 */