diff --git a/muyu-common/muyu-common-saas/pom.xml b/muyu-common/muyu-common-saas/pom.xml deleted file mode 100644 index 0f5f375..0000000 --- a/muyu-common/muyu-common-saas/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - com.muyu - muyu-common - 3.6.3 - - - muyu-common-saas - - SaaS公共依赖 - - - 17 - 17 - UTF-8 - - - - - com.muyu - muyu-common-datasource - - - com.muyu - muyu-common-security - - - 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 deleted file mode 100644 index de6dd1a..0000000 --- a/muyu-common/muyu-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.muyu.common.saas.interceptor.WebMvcSaaSConfig diff --git a/muyu-common/pom.xml b/muyu-common/pom.xml index b995e91..5b58e93 100644 --- a/muyu-common/pom.xml +++ b/muyu-common/pom.xml @@ -18,7 +18,6 @@ muyu-common-datascope muyu-common-datasource muyu-common-system - muyu-common-saas muyu-common diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/ManyDataSource.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/ManyDataSource.java similarity index 88% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/ManyDataSource.java rename to muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/ManyDataSource.java index 00da02d..70194e8 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/ManyDataSource.java +++ b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/ManyDataSource.java @@ -1,14 +1,16 @@ -package com.muyu.common.many.datasource; +package com.muyu.many.datasource.config; import com.alibaba.druid.pool.DruidDataSource; import com.muyu.common.core.utils.SpringUtils; -import com.muyu.common.many.datasource.domain.model.DataSourceInfo; -import com.muyu.common.many.datasource.factory.DruidDataSourceFactory; -import com.muyu.common.saas.domain.model.EnterPriseInfo; -import com.muyu.common.many.datasource.role.DynamicDataSource; +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 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; diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/constents/DatasourceContent.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/contents/DatasourceContent.java similarity index 89% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/constents/DatasourceContent.java rename to muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/contents/DatasourceContent.java index 7fee930..b18fcb0 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/constents/DatasourceContent.java +++ b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/contents/DatasourceContent.java @@ -1,4 +1,4 @@ -package com.muyu.common.many.datasource.constents; +package com.muyu.many.datasource.config.contents; /** * @author DongZl diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/constents/SaaSConstant.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/contents/SaaSConstant.java similarity index 77% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/constents/SaaSConstant.java rename to muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/contents/SaaSConstant.java index 5ba70fd..fbea0ee 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/constents/SaaSConstant.java +++ b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/contents/SaaSConstant.java @@ -1,4 +1,4 @@ -package com.muyu.common.saas.constents; +package com.muyu.many.datasource.config.contents; /** * SaaS常量 SaaSConstant diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/domain/model/DataSourceInfo.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/domain/model/DataSourceInfo.java similarity index 87% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/domain/model/DataSourceInfo.java rename to muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/domain/model/DataSourceInfo.java index 2ae3966..523be04 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/domain/model/DataSourceInfo.java +++ b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/domain/model/DataSourceInfo.java @@ -1,4 +1,4 @@ -package com.muyu.common.many.datasource.domain.model; +package com.muyu.many.datasource.config.domain.model; import com.muyu.common.core.utils.StringUtils; @@ -7,7 +7,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import static com.muyu.common.many.datasource.constents.DatasourceContent.*; +import static com.muyu.many.datasource.config.contents.DatasourceContent.*; /** diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/domain/model/EnterPriseInfo.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/domain/model/EnterPriseInfo.java similarity index 87% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/domain/model/EnterPriseInfo.java rename to muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/domain/model/EnterPriseInfo.java index bd13f76..1919db4 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/domain/model/EnterPriseInfo.java +++ b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/domain/model/EnterPriseInfo.java @@ -1,4 +1,4 @@ -package com.muyu.common.saas.domain.model; +package com.muyu.many.datasource.config.domain.model; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/exception/SaaSException.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/exception/SaaSException.java similarity index 89% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/exception/SaaSException.java rename to muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/exception/SaaSException.java index 31ea60c..d7d2a07 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/exception/SaaSException.java +++ b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/exception/SaaSException.java @@ -1,4 +1,4 @@ -package com.muyu.common.saas.exception; +package com.muyu.many.datasource.config.exception; import com.muyu.common.core.exception.ServiceException; diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/factory/DruidDataSourceFactory.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/factory/DruidDataSourceFactory.java similarity index 91% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/factory/DruidDataSourceFactory.java rename to muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/factory/DruidDataSourceFactory.java index 6eb038e..1f5c9eb 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/factory/DruidDataSourceFactory.java +++ b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/factory/DruidDataSourceFactory.java @@ -1,7 +1,7 @@ -package com.muyu.common.many.datasource.factory; +package com.muyu.many.datasource.config.factory; import com.alibaba.druid.pool.DruidDataSource; -import com.muyu.common.many.datasource.domain.model.DataSourceInfo; +import com.muyu.many.datasource.config.domain.model.DataSourceInfo; import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Component; diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/holder/DynamicDataSourceHolder.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/holder/DynamicDataSourceHolder.java similarity index 95% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/holder/DynamicDataSourceHolder.java rename to muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/holder/DynamicDataSourceHolder.java index 2bf882d..9d435a8 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/holder/DynamicDataSourceHolder.java +++ b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/holder/DynamicDataSourceHolder.java @@ -1,4 +1,4 @@ -package com.muyu.common.many.datasource.holder; +package com.muyu.many.datasource.config.holder; import lombok.extern.slf4j.Slf4j; import org.springframework.util.Assert; diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/interceptor/SaaSInterceptor.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/interceptor/SaaSInterceptor.java similarity index 82% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/interceptor/SaaSInterceptor.java rename to muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/interceptor/SaaSInterceptor.java index 20c3a97..a56f156 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/interceptor/SaaSInterceptor.java +++ b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/interceptor/SaaSInterceptor.java @@ -1,11 +1,11 @@ -package com.muyu.common.saas.interceptor; +package com.muyu.many.datasource.config.interceptor; import com.muyu.common.core.utils.ServletUtils; import com.muyu.common.core.utils.SpringUtils; -import com.muyu.common.saas.constents.SaaSConstant; -import com.muyu.common.saas.exception.SaaSException; -import com.muyu.common.many.datasource.holder.DynamicDataSourceHolder; -import com.muyu.common.many.datasource.role.DynamicDataSource; +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 org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.AsyncHandlerInterceptor; diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/interceptor/WebMvcSaaSConfig.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/interceptor/WebMvcSaaSConfig.java similarity index 93% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/interceptor/WebMvcSaaSConfig.java rename to muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/interceptor/WebMvcSaaSConfig.java index 6642d8f..4d83a7e 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/saas/interceptor/WebMvcSaaSConfig.java +++ b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/interceptor/WebMvcSaaSConfig.java @@ -1,4 +1,4 @@ -package com.muyu.common.saas.interceptor; +package com.muyu.many.datasource.config.interceptor; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/role/DynamicDataSource.java b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/role/DynamicDataSource.java similarity index 93% rename from muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/role/DynamicDataSource.java rename to muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/role/DynamicDataSource.java index 4a22168..c38cd60 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/common/many/datasource/role/DynamicDataSource.java +++ b/muyu-modules/muyu-many-datasource/src/main/java/com/muyu/many/datasource/config/role/DynamicDataSource.java @@ -1,7 +1,7 @@ -package com.muyu.common.many.datasource.role; +package com.muyu.many.datasource.config.role; import com.alibaba.druid.pool.DruidDataSource; -import com.muyu.common.many.datasource.holder.DynamicDataSourceHolder; +import com.muyu.many.datasource.config.holder.DynamicDataSourceHolder; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; 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 fcda1ec..94c7e8e 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 @@ -7,6 +7,7 @@ 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 new file mode 100644 index 0000000..437355e --- /dev/null +++ b/muyu-modules/muyu-many-datasource/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.many.datasource.config.interceptor.WebMvcSaaSConfig diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java index 6a11f5b..7e5e8b3 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java @@ -18,10 +18,10 @@ import com.muyu.net.working.domain.req.EnterpriseEditReq; import com.muyu.common.core.web.domain.BaseEntity; /** - * 企业信息对象 enterprise + * 车辆运营平台对象 enterprise * * @author muyu - * @date 2024-05-27 + * @date 2024-06-05 */ @Data @SuperBuilder @@ -29,7 +29,7 @@ import com.muyu.common.core.web.domain.BaseEntity; @AllArgsConstructor @TableName("enterprise") @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "Enterprise", description = "企业信息") +@ApiModel(value = "Enterprise", description = "车辆运营平台") public class Enterprise extends BaseEntity { private static final long serialVersionUID = 1L; @@ -83,7 +83,7 @@ public class Enterprise extends BaseEntity { /** 企业当前状态 */ @Excel(name = "企业当前状态") @ApiModelProperty(name = "企业当前状态", value = "企业当前状态") - private String status; + private String enterpriseStatus; /** 企业入驻平台时期 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -130,7 +130,7 @@ public class Enterprise extends BaseEntity { .address(enterpriseQueryReq.getAddress()) .contactPhone(enterpriseQueryReq.getContactPhone()) .email(enterpriseQueryReq.getEmail()) - .status(enterpriseQueryReq.getStatus()) + .enterpriseStatus(enterpriseQueryReq.getEnterpriseStatus()) .registrationDate(enterpriseQueryReq.getRegistrationDate()) .certificationId(enterpriseQueryReq.getCertificationId()) .authenticationDate(enterpriseQueryReq.getAuthenticationDate()) @@ -153,16 +153,13 @@ public class Enterprise extends BaseEntity { .address(enterpriseSaveReq.getAddress()) .contactPhone(enterpriseSaveReq.getContactPhone()) .email(enterpriseSaveReq.getEmail()) - .status(enterpriseSaveReq.getStatus()) + .enterpriseStatus(enterpriseSaveReq.getEnterpriseStatus()) .registrationDate(enterpriseSaveReq.getRegistrationDate()) .certificationId(enterpriseSaveReq.getCertificationId()) .authenticationDate(enterpriseSaveReq.getAuthenticationDate()) .serviceLevel(enterpriseSaveReq.getServiceLevel()) .openServerId(enterpriseSaveReq.getOpenServerId()) .addServerId(enterpriseSaveReq.getAddServerId()) - .createBy(enterpriseSaveReq.getCreateBy()) - .createTime(new Date()) - .remark(enterpriseSaveReq.getRemark()) .build(); } @@ -180,16 +177,13 @@ public class Enterprise extends BaseEntity { .address(enterpriseEditReq.getAddress()) .contactPhone(enterpriseEditReq.getContactPhone()) .email(enterpriseEditReq.getEmail()) - .status(enterpriseEditReq.getStatus()) + .enterpriseStatus(enterpriseEditReq.getEnterpriseStatus()) .registrationDate(enterpriseEditReq.getRegistrationDate()) .certificationId(enterpriseEditReq.getCertificationId()) .authenticationDate(enterpriseEditReq.getAuthenticationDate()) .serviceLevel(enterpriseEditReq.getServiceLevel()) .openServerId(enterpriseEditReq.getOpenServerId()) .addServerId(enterpriseEditReq.getAddServerId()) - .updateBy(enterpriseEditReq.getUpdateBy()) - .updateTime(new Date()) - .remark(enterpriseEditReq.getRemark()) .build(); } diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java index 7284615..ede1a6e 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java @@ -11,16 +11,16 @@ import io.swagger.annotations.*; import com.muyu.common.core.web.domain.BaseEntity; /** - * 企业信息对象 enterprise + * 车辆运营平台对象 enterprise * * @author muyu - * @date 2024-05-27 + * @date 2024-06-05 */ @Data @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value = "EnterpriseEditReq", description = "企业信息") +@ApiModel(value = "EnterpriseEditReq", description = "车辆运营平台") public class EnterpriseEditReq extends BaseEntity { private static final long serialVersionUID = 1L; @@ -60,7 +60,7 @@ public class EnterpriseEditReq extends BaseEntity { /** 企业当前状态 */ @ApiModelProperty(name = "企业当前状态", value = "企业当前状态") - private String status; + private String enterpriseStatus; /** 企业入驻平台时期 */ @JsonFormat(pattern = "yyyy-MM-dd") diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseQueryReq.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseQueryReq.java index 2b893a3..2988aef 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseQueryReq.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseQueryReq.java @@ -11,16 +11,16 @@ import io.swagger.annotations.*; import com.muyu.common.core.web.domain.BaseEntity; /** - * 企业信息对象 enterprise + * 车辆运营平台对象 enterprise * * @author muyu - * @date 2024-05-27 + * @date 2024-06-05 */ @Data @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value = "EnterpriseQueryReq", description = "企业信息") +@ApiModel(value = "EnterpriseQueryReq", description = "车辆运营平台") public class EnterpriseQueryReq extends BaseEntity { private static final long serialVersionUID = 1L; @@ -60,7 +60,7 @@ public class EnterpriseQueryReq extends BaseEntity { /** 企业当前状态 */ @ApiModelProperty(name = "企业当前状态", value = "企业当前状态") - private String status; + private String enterpriseStatus; /** 企业入驻平台时期 */ @JsonFormat(pattern = "yyyy-MM-dd") diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseSaveReq.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseSaveReq.java index 03c34b6..dcd4ab8 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseSaveReq.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseSaveReq.java @@ -11,16 +11,16 @@ import io.swagger.annotations.*; import com.muyu.common.core.web.domain.BaseEntity; /** - * 企业信息对象 enterprise + * 车辆运营平台对象 enterprise * * @author muyu - * @date 2024-05-27 + * @date 2024-06-05 */ @Data @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value = "EnterpriseSaveReq", description = "企业信息") +@ApiModel(value = "EnterpriseSaveReq", description = "车辆运营平台") public class EnterpriseSaveReq extends BaseEntity { private static final long serialVersionUID = 1L; @@ -74,7 +74,7 @@ public class EnterpriseSaveReq extends BaseEntity { /** 企业当前状态 */ @ApiModelProperty(name = "企业当前状态", value = "企业当前状态") - private String status; + private String enterpriseStatus; /** 企业入驻平台时期 */ @JsonFormat(pattern = "yyyy-MM-dd") 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 0618b4d..a390eda 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 @@ -27,12 +27,12 @@ import com.muyu.net.working.service.EnterpriseService; import com.muyu.common.core.web.page.TableDataInfo; /** - * 企业信息Controller + * 车辆运营平台Controller * * @author muyu - * @date 2024-05-27 + * @date 2024-06-05 */ -@Api(tags = "企业信息") +@Api(tags = "车辆运营平台") @RestController @RequestMapping("/car") public class EnterpriseController extends BaseController { @@ -40,9 +40,9 @@ public class EnterpriseController extends BaseController { private EnterpriseService enterpriseService; /** - * 查询企业信息列表 + * 查询车辆运营平台列表 */ - @ApiOperation("获取企业信息列表") + @ApiOperation("获取车辆运营平台列表") @RequiresPermissions("netWorking:car:list") @GetMapping("/list") public Result> list(EnterpriseQueryReq enterpriseQueryReq) { @@ -52,22 +52,22 @@ public class EnterpriseController extends BaseController { } /** - * 导出企业信息列表 + * 导出车辆运营平台列表 */ - @ApiOperation("导出企业信息列表") + @ApiOperation("导出车辆运营平台列表") @RequiresPermissions("netWorking:car:export") - @Log(title = "企业信息", businessType = BusinessType.EXPORT) + @Log(title = "车辆运营平台", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, Enterprise enterprise) { List list = enterpriseService.list(enterprise); ExcelUtil util = new ExcelUtil(Enterprise.class); - util.exportExcel(response, list, "企业信息数据"); + util.exportExcel(response, list, "车辆运营平台数据"); } /** - * 获取企业信息详细信息 + * 获取车辆运营平台详细信息 */ - @ApiOperation("获取企业信息详细信息") + @ApiOperation("获取车辆运营平台详细信息") @RequiresPermissions("netWorking:car:query") @GetMapping(value = "/{id}") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class) @@ -76,34 +76,34 @@ public class EnterpriseController extends BaseController { } /** - * 新增企业信息 + * 新增车辆运营平台 */ @RequiresPermissions("netWorking:car:add") - @Log(title = "企业信息", businessType = BusinessType.INSERT) + @Log(title = "车辆运营平台", businessType = BusinessType.INSERT) @PostMapping - @ApiOperation("新增企业信息") + @ApiOperation("新增车辆运营平台") public Result add(@RequestBody EnterpriseSaveReq enterpriseSaveReq) { return toAjax(enterpriseService.save(Enterprise.saveBuild(enterpriseSaveReq))); } /** - * 修改企业信息 + * 修改车辆运营平台 */ @RequiresPermissions("netWorking:car:edit") - @Log(title = "企业信息", businessType = BusinessType.UPDATE) + @Log(title = "车辆运营平台", businessType = BusinessType.UPDATE) @PutMapping("/{id}") - @ApiOperation("修改企业信息") + @ApiOperation("修改车辆运营平台") public Result edit(@PathVariable String id, @RequestBody EnterpriseEditReq enterpriseEditReq) { return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq))); } /** - * 删除企业信息 + * 删除车辆运营平台 */ @RequiresPermissions("netWorking:car:remove") - @Log(title = "企业信息", businessType = BusinessType.DELETE) + @Log(title = "车辆运营平台", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - @ApiOperation("删除企业信息") + @ApiOperation("删除车辆运营平台") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") public Result remove(@PathVariable List ids) { return toAjax(enterpriseService.removeBatchByIds(ids)); diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java index 0a82543..020b381 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java @@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.net.working.domain.Enterprise; /** - * 企业信息Mapper接口 + * 车辆运营平台Mapper接口 * * @author muyu - * @date 2024-05-27 + * @date 2024-06-05 */ public interface EnterpriseMapper extends BaseMapper { diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java index 5bb5b4a..3360cdc 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java @@ -5,17 +5,17 @@ import com.muyu.net.working.domain.Enterprise; import com.baomidou.mybatisplus.extension.service.IService; /** - * 企业信息Service接口 + * 车辆运营平台Service接口 * * @author muyu - * @date 2024-05-27 + * @date 2024-06-05 */ public interface EnterpriseService extends IService { /** - * 查询企业信息列表 + * 查询车辆运营平台列表 * - * @param enterprise 企业信息 - * @return 企业信息集合 + * @param enterprise 车辆运营平台 + * @return 车辆运营平台集合 */ public List list(Enterprise enterprise); diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java index 5ca6b7d..3f1e451 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java @@ -12,20 +12,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; /** - * 企业信息Service业务层处理 + * 车辆运营平台Service业务层处理 * * @author muyu - * @date 2024-05-27 + * @date 2024-06-05 */ @Slf4j @Service public class EnterpriseServiceImpl extends ServiceImpl implements EnterpriseService { /** - * 查询企业信息列表 + * 查询车辆运营平台列表 * - * @param enterprise 企业信息 - * @return 企业信息 + * @param enterprise 车辆运营平台 + * @return 车辆运营平台 */ @Override public List list(Enterprise enterprise) { @@ -64,8 +64,8 @@ public class EnterpriseServiceImpl extends ServiceImpl - + @@ -29,6 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, ebterprise_name, legal_person, business_lincense_number, estabiness_date, business_scope, address, contact_phone, email, status, registration_date, certification_id, authentication_date, service_level, open_server_id, add_server_id, create_by, create_time, update_by, update_time, remark from enterprise + select id, ebterprise_name, legal_person, business_lincense_number, estabiness_date, business_scope, address, contact_phone, email, enterprise_status, registration_date, certification_id, authentication_date, service_level, open_server_id, add_server_id, create_by, create_time, update_by, update_time, remark from enterprise