feat(): 重构企业表信息
parent
b75b28fce1
commit
a5d1d43a03
|
@ -1,32 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>com.muyu</groupId>
|
|
||||||
<artifactId>muyu-common</artifactId>
|
|
||||||
<version>3.6.3</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>muyu-common-saas</artifactId>
|
|
||||||
<description>
|
|
||||||
SaaS公共依赖
|
|
||||||
</description>
|
|
||||||
<properties>
|
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
</properties>
|
|
||||||
<dependencies>
|
|
||||||
<!-- 多-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.muyu</groupId>
|
|
||||||
<artifactId>muyu-common-datasource</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.muyu</groupId>
|
|
||||||
<artifactId>muyu-common-security</artifactId>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</project>
|
|
|
@ -1 +0,0 @@
|
||||||
com.muyu.common.saas.interceptor.WebMvcSaaSConfig
|
|
|
@ -18,7 +18,6 @@
|
||||||
<module>muyu-common-datascope</module>
|
<module>muyu-common-datascope</module>
|
||||||
<module>muyu-common-datasource</module>
|
<module>muyu-common-datasource</module>
|
||||||
<module>muyu-common-system</module>
|
<module>muyu-common-system</module>
|
||||||
<module>muyu-common-saas</module>
|
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<artifactId>muyu-common</artifactId>
|
<artifactId>muyu-common</artifactId>
|
||||||
|
|
|
@ -1,14 +1,16 @@
|
||||||
package com.muyu.common.many.datasource;
|
package com.muyu.many.datasource.config;
|
||||||
|
|
||||||
import com.alibaba.druid.pool.DruidDataSource;
|
import com.alibaba.druid.pool.DruidDataSource;
|
||||||
import com.muyu.common.core.utils.SpringUtils;
|
import com.muyu.common.core.utils.SpringUtils;
|
||||||
import com.muyu.common.many.datasource.domain.model.DataSourceInfo;
|
import com.muyu.many.datasource.config.domain.model.DataSourceInfo;
|
||||||
import com.muyu.common.many.datasource.factory.DruidDataSourceFactory;
|
import com.muyu.many.datasource.config.domain.model.EnterPriseInfo;
|
||||||
import com.muyu.common.saas.domain.model.EnterPriseInfo;
|
import com.muyu.many.datasource.config.factory.DruidDataSourceFactory;
|
||||||
import com.muyu.common.many.datasource.role.DynamicDataSource;
|
import com.muyu.many.datasource.config.role.DynamicDataSource;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
import lombok.extern.log4j.Log4j2;
|
import lombok.extern.log4j.Log4j2;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.annotation.Primary;
|
import org.springframework.context.annotation.Primary;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.muyu.common.many.datasource.constents;
|
package com.muyu.many.datasource.config.contents;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author DongZl
|
* @author DongZl
|
|
@ -1,4 +1,4 @@
|
||||||
package com.muyu.common.saas.constents;
|
package com.muyu.many.datasource.config.contents;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SaaS常量 SaaSConstant
|
* SaaS常量 SaaSConstant
|
|
@ -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;
|
import com.muyu.common.core.utils.StringUtils;
|
||||||
|
@ -7,7 +7,7 @@ import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
import static com.muyu.common.many.datasource.constents.DatasourceContent.*;
|
import static com.muyu.many.datasource.config.contents.DatasourceContent.*;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
|
@ -1,4 +1,4 @@
|
||||||
package com.muyu.common.saas.domain.model;
|
package com.muyu.many.datasource.config.domain.model;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.muyu.common.saas.exception;
|
package com.muyu.many.datasource.config.exception;
|
||||||
|
|
||||||
import com.muyu.common.core.exception.ServiceException;
|
import com.muyu.common.core.exception.ServiceException;
|
||||||
|
|
|
@ -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.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 lombok.extern.log4j.Log4j2;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.muyu.common.many.datasource.holder;
|
package com.muyu.many.datasource.config.holder;
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
|
@ -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.ServletUtils;
|
||||||
import com.muyu.common.core.utils.SpringUtils;
|
import com.muyu.common.core.utils.SpringUtils;
|
||||||
import com.muyu.common.saas.constents.SaaSConstant;
|
import com.muyu.many.datasource.config.contents.SaaSConstant;
|
||||||
import com.muyu.common.saas.exception.SaaSException;
|
import com.muyu.many.datasource.config.exception.SaaSException;
|
||||||
import com.muyu.common.many.datasource.holder.DynamicDataSourceHolder;
|
import com.muyu.many.datasource.config.holder.DynamicDataSourceHolder;
|
||||||
import com.muyu.common.many.datasource.role.DynamicDataSource;
|
import com.muyu.many.datasource.config.role.DynamicDataSource;
|
||||||
import org.springframework.web.method.HandlerMethod;
|
import org.springframework.web.method.HandlerMethod;
|
||||||
import org.springframework.web.servlet.AsyncHandlerInterceptor;
|
import org.springframework.web.servlet.AsyncHandlerInterceptor;
|
||||||
|
|
|
@ -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.InterceptorRegistry;
|
||||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
|
@ -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.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.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
|
@ -7,6 +7,7 @@ import com.muyu.many.datasource.domain.Vehicle;
|
||||||
import com.muyu.many.datasource.mapper.VehicleMapper;
|
import com.muyu.many.datasource.mapper.VehicleMapper;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
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.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
com.muyu.many.datasource.config.interceptor.WebMvcSaaSConfig
|
|
@ -18,10 +18,10 @@ import com.muyu.net.working.domain.req.EnterpriseEditReq;
|
||||||
import com.muyu.common.core.web.domain.BaseEntity;
|
import com.muyu.common.core.web.domain.BaseEntity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 企业信息对象 enterprise
|
* 车辆运营平台对象 enterprise
|
||||||
*
|
*
|
||||||
* @author muyu
|
* @author muyu
|
||||||
* @date 2024-05-27
|
* @date 2024-06-05
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@SuperBuilder
|
@SuperBuilder
|
||||||
|
@ -29,7 +29,7 @@ import com.muyu.common.core.web.domain.BaseEntity;
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@TableName("enterprise")
|
@TableName("enterprise")
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@ApiModel(value = "Enterprise", description = "企业信息")
|
@ApiModel(value = "Enterprise", description = "车辆运营平台")
|
||||||
public class Enterprise extends BaseEntity {
|
public class Enterprise extends BaseEntity {
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
@ -83,7 +83,7 @@ public class Enterprise extends BaseEntity {
|
||||||
/** 企业当前状态 */
|
/** 企业当前状态 */
|
||||||
@Excel(name = "企业当前状态")
|
@Excel(name = "企业当前状态")
|
||||||
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
||||||
private String status;
|
private String enterpriseStatus;
|
||||||
|
|
||||||
/** 企业入驻平台时期 */
|
/** 企业入驻平台时期 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
@ -130,7 +130,7 @@ public class Enterprise extends BaseEntity {
|
||||||
.address(enterpriseQueryReq.getAddress())
|
.address(enterpriseQueryReq.getAddress())
|
||||||
.contactPhone(enterpriseQueryReq.getContactPhone())
|
.contactPhone(enterpriseQueryReq.getContactPhone())
|
||||||
.email(enterpriseQueryReq.getEmail())
|
.email(enterpriseQueryReq.getEmail())
|
||||||
.status(enterpriseQueryReq.getStatus())
|
.enterpriseStatus(enterpriseQueryReq.getEnterpriseStatus())
|
||||||
.registrationDate(enterpriseQueryReq.getRegistrationDate())
|
.registrationDate(enterpriseQueryReq.getRegistrationDate())
|
||||||
.certificationId(enterpriseQueryReq.getCertificationId())
|
.certificationId(enterpriseQueryReq.getCertificationId())
|
||||||
.authenticationDate(enterpriseQueryReq.getAuthenticationDate())
|
.authenticationDate(enterpriseQueryReq.getAuthenticationDate())
|
||||||
|
@ -153,16 +153,13 @@ public class Enterprise extends BaseEntity {
|
||||||
.address(enterpriseSaveReq.getAddress())
|
.address(enterpriseSaveReq.getAddress())
|
||||||
.contactPhone(enterpriseSaveReq.getContactPhone())
|
.contactPhone(enterpriseSaveReq.getContactPhone())
|
||||||
.email(enterpriseSaveReq.getEmail())
|
.email(enterpriseSaveReq.getEmail())
|
||||||
.status(enterpriseSaveReq.getStatus())
|
.enterpriseStatus(enterpriseSaveReq.getEnterpriseStatus())
|
||||||
.registrationDate(enterpriseSaveReq.getRegistrationDate())
|
.registrationDate(enterpriseSaveReq.getRegistrationDate())
|
||||||
.certificationId(enterpriseSaveReq.getCertificationId())
|
.certificationId(enterpriseSaveReq.getCertificationId())
|
||||||
.authenticationDate(enterpriseSaveReq.getAuthenticationDate())
|
.authenticationDate(enterpriseSaveReq.getAuthenticationDate())
|
||||||
.serviceLevel(enterpriseSaveReq.getServiceLevel())
|
.serviceLevel(enterpriseSaveReq.getServiceLevel())
|
||||||
.openServerId(enterpriseSaveReq.getOpenServerId())
|
.openServerId(enterpriseSaveReq.getOpenServerId())
|
||||||
.addServerId(enterpriseSaveReq.getAddServerId())
|
.addServerId(enterpriseSaveReq.getAddServerId())
|
||||||
.createBy(enterpriseSaveReq.getCreateBy())
|
|
||||||
.createTime(new Date())
|
|
||||||
.remark(enterpriseSaveReq.getRemark())
|
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -180,16 +177,13 @@ public class Enterprise extends BaseEntity {
|
||||||
.address(enterpriseEditReq.getAddress())
|
.address(enterpriseEditReq.getAddress())
|
||||||
.contactPhone(enterpriseEditReq.getContactPhone())
|
.contactPhone(enterpriseEditReq.getContactPhone())
|
||||||
.email(enterpriseEditReq.getEmail())
|
.email(enterpriseEditReq.getEmail())
|
||||||
.status(enterpriseEditReq.getStatus())
|
.enterpriseStatus(enterpriseEditReq.getEnterpriseStatus())
|
||||||
.registrationDate(enterpriseEditReq.getRegistrationDate())
|
.registrationDate(enterpriseEditReq.getRegistrationDate())
|
||||||
.certificationId(enterpriseEditReq.getCertificationId())
|
.certificationId(enterpriseEditReq.getCertificationId())
|
||||||
.authenticationDate(enterpriseEditReq.getAuthenticationDate())
|
.authenticationDate(enterpriseEditReq.getAuthenticationDate())
|
||||||
.serviceLevel(enterpriseEditReq.getServiceLevel())
|
.serviceLevel(enterpriseEditReq.getServiceLevel())
|
||||||
.openServerId(enterpriseEditReq.getOpenServerId())
|
.openServerId(enterpriseEditReq.getOpenServerId())
|
||||||
.addServerId(enterpriseEditReq.getAddServerId())
|
.addServerId(enterpriseEditReq.getAddServerId())
|
||||||
.updateBy(enterpriseEditReq.getUpdateBy())
|
|
||||||
.updateTime(new Date())
|
|
||||||
.remark(enterpriseEditReq.getRemark())
|
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,16 +11,16 @@ import io.swagger.annotations.*;
|
||||||
import com.muyu.common.core.web.domain.BaseEntity;
|
import com.muyu.common.core.web.domain.BaseEntity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 企业信息对象 enterprise
|
* 车辆运营平台对象 enterprise
|
||||||
*
|
*
|
||||||
* @author muyu
|
* @author muyu
|
||||||
* @date 2024-05-27
|
* @date 2024-06-05
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@SuperBuilder
|
@SuperBuilder
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@ApiModel(value = "EnterpriseEditReq", description = "企业信息")
|
@ApiModel(value = "EnterpriseEditReq", description = "车辆运营平台")
|
||||||
public class EnterpriseEditReq extends BaseEntity {
|
public class EnterpriseEditReq extends BaseEntity {
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
@ -60,7 +60,7 @@ public class EnterpriseEditReq extends BaseEntity {
|
||||||
|
|
||||||
/** 企业当前状态 */
|
/** 企业当前状态 */
|
||||||
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
||||||
private String status;
|
private String enterpriseStatus;
|
||||||
|
|
||||||
/** 企业入驻平台时期 */
|
/** 企业入驻平台时期 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
|
|
@ -11,16 +11,16 @@ import io.swagger.annotations.*;
|
||||||
import com.muyu.common.core.web.domain.BaseEntity;
|
import com.muyu.common.core.web.domain.BaseEntity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 企业信息对象 enterprise
|
* 车辆运营平台对象 enterprise
|
||||||
*
|
*
|
||||||
* @author muyu
|
* @author muyu
|
||||||
* @date 2024-05-27
|
* @date 2024-06-05
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@SuperBuilder
|
@SuperBuilder
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@ApiModel(value = "EnterpriseQueryReq", description = "企业信息")
|
@ApiModel(value = "EnterpriseQueryReq", description = "车辆运营平台")
|
||||||
public class EnterpriseQueryReq extends BaseEntity {
|
public class EnterpriseQueryReq extends BaseEntity {
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
@ -60,7 +60,7 @@ public class EnterpriseQueryReq extends BaseEntity {
|
||||||
|
|
||||||
/** 企业当前状态 */
|
/** 企业当前状态 */
|
||||||
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
||||||
private String status;
|
private String enterpriseStatus;
|
||||||
|
|
||||||
/** 企业入驻平台时期 */
|
/** 企业入驻平台时期 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
|
|
@ -11,16 +11,16 @@ import io.swagger.annotations.*;
|
||||||
import com.muyu.common.core.web.domain.BaseEntity;
|
import com.muyu.common.core.web.domain.BaseEntity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 企业信息对象 enterprise
|
* 车辆运营平台对象 enterprise
|
||||||
*
|
*
|
||||||
* @author muyu
|
* @author muyu
|
||||||
* @date 2024-05-27
|
* @date 2024-06-05
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@SuperBuilder
|
@SuperBuilder
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@ApiModel(value = "EnterpriseSaveReq", description = "企业信息")
|
@ApiModel(value = "EnterpriseSaveReq", description = "车辆运营平台")
|
||||||
public class EnterpriseSaveReq extends BaseEntity {
|
public class EnterpriseSaveReq extends BaseEntity {
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
@ -74,7 +74,7 @@ public class EnterpriseSaveReq extends BaseEntity {
|
||||||
/** 企业当前状态 */
|
/** 企业当前状态 */
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
||||||
private String status;
|
private String enterpriseStatus;
|
||||||
|
|
||||||
/** 企业入驻平台时期 */
|
/** 企业入驻平台时期 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
|
|
@ -27,12 +27,12 @@ import com.muyu.net.working.service.EnterpriseService;
|
||||||
import com.muyu.common.core.web.page.TableDataInfo;
|
import com.muyu.common.core.web.page.TableDataInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 企业信息Controller
|
* 车辆运营平台Controller
|
||||||
*
|
*
|
||||||
* @author muyu
|
* @author muyu
|
||||||
* @date 2024-05-27
|
* @date 2024-06-05
|
||||||
*/
|
*/
|
||||||
@Api(tags = "企业信息")
|
@Api(tags = "车辆运营平台")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/car")
|
@RequestMapping("/car")
|
||||||
public class EnterpriseController extends BaseController {
|
public class EnterpriseController extends BaseController {
|
||||||
|
@ -40,9 +40,9 @@ public class EnterpriseController extends BaseController {
|
||||||
private EnterpriseService enterpriseService;
|
private EnterpriseService enterpriseService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询企业信息列表
|
* 查询车辆运营平台列表
|
||||||
*/
|
*/
|
||||||
@ApiOperation("获取企业信息列表")
|
@ApiOperation("获取车辆运营平台列表")
|
||||||
@RequiresPermissions("netWorking:car:list")
|
@RequiresPermissions("netWorking:car:list")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public Result<TableDataInfo<Enterprise>> list(EnterpriseQueryReq enterpriseQueryReq) {
|
public Result<TableDataInfo<Enterprise>> list(EnterpriseQueryReq enterpriseQueryReq) {
|
||||||
|
@ -52,22 +52,22 @@ public class EnterpriseController extends BaseController {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 导出企业信息列表
|
* 导出车辆运营平台列表
|
||||||
*/
|
*/
|
||||||
@ApiOperation("导出企业信息列表")
|
@ApiOperation("导出车辆运营平台列表")
|
||||||
@RequiresPermissions("netWorking:car:export")
|
@RequiresPermissions("netWorking:car:export")
|
||||||
@Log(title = "企业信息", businessType = BusinessType.EXPORT)
|
@Log(title = "车辆运营平台", businessType = BusinessType.EXPORT)
|
||||||
@PostMapping("/export")
|
@PostMapping("/export")
|
||||||
public void export(HttpServletResponse response, Enterprise enterprise) {
|
public void export(HttpServletResponse response, Enterprise enterprise) {
|
||||||
List<Enterprise> list = enterpriseService.list(enterprise);
|
List<Enterprise> list = enterpriseService.list(enterprise);
|
||||||
ExcelUtil<Enterprise> util = new ExcelUtil<Enterprise>(Enterprise.class);
|
ExcelUtil<Enterprise> util = new ExcelUtil<Enterprise>(Enterprise.class);
|
||||||
util.exportExcel(response, list, "企业信息数据");
|
util.exportExcel(response, list, "车辆运营平台数据");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取企业信息详细信息
|
* 获取车辆运营平台详细信息
|
||||||
*/
|
*/
|
||||||
@ApiOperation("获取企业信息详细信息")
|
@ApiOperation("获取车辆运营平台详细信息")
|
||||||
@RequiresPermissions("netWorking:car:query")
|
@RequiresPermissions("netWorking:car:query")
|
||||||
@GetMapping(value = "/{id}")
|
@GetMapping(value = "/{id}")
|
||||||
@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class)
|
@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")
|
@RequiresPermissions("netWorking:car:add")
|
||||||
@Log(title = "企业信息", businessType = BusinessType.INSERT)
|
@Log(title = "车辆运营平台", businessType = BusinessType.INSERT)
|
||||||
@PostMapping
|
@PostMapping
|
||||||
@ApiOperation("新增企业信息")
|
@ApiOperation("新增车辆运营平台")
|
||||||
public Result<String> add(@RequestBody EnterpriseSaveReq enterpriseSaveReq) {
|
public Result<String> add(@RequestBody EnterpriseSaveReq enterpriseSaveReq) {
|
||||||
return toAjax(enterpriseService.save(Enterprise.saveBuild(enterpriseSaveReq)));
|
return toAjax(enterpriseService.save(Enterprise.saveBuild(enterpriseSaveReq)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改企业信息
|
* 修改车辆运营平台
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("netWorking:car:edit")
|
@RequiresPermissions("netWorking:car:edit")
|
||||||
@Log(title = "企业信息", businessType = BusinessType.UPDATE)
|
@Log(title = "车辆运营平台", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping("/{id}")
|
@PutMapping("/{id}")
|
||||||
@ApiOperation("修改企业信息")
|
@ApiOperation("修改车辆运营平台")
|
||||||
public Result<String> edit(@PathVariable String id, @RequestBody EnterpriseEditReq enterpriseEditReq) {
|
public Result<String> edit(@PathVariable String id, @RequestBody EnterpriseEditReq enterpriseEditReq) {
|
||||||
return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq)));
|
return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除企业信息
|
* 删除车辆运营平台
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("netWorking:car:remove")
|
@RequiresPermissions("netWorking:car:remove")
|
||||||
@Log(title = "企业信息", businessType = BusinessType.DELETE)
|
@Log(title = "车辆运营平台", businessType = BusinessType.DELETE)
|
||||||
@DeleteMapping("/{ids}")
|
@DeleteMapping("/{ids}")
|
||||||
@ApiOperation("删除企业信息")
|
@ApiOperation("删除车辆运营平台")
|
||||||
@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4")
|
@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4")
|
||||||
public Result<String> remove(@PathVariable List<String> ids) {
|
public Result<String> remove(@PathVariable List<String> ids) {
|
||||||
return toAjax(enterpriseService.removeBatchByIds(ids));
|
return toAjax(enterpriseService.removeBatchByIds(ids));
|
||||||
|
|
|
@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.muyu.net.working.domain.Enterprise;
|
import com.muyu.net.working.domain.Enterprise;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 企业信息Mapper接口
|
* 车辆运营平台Mapper接口
|
||||||
*
|
*
|
||||||
* @author muyu
|
* @author muyu
|
||||||
* @date 2024-05-27
|
* @date 2024-06-05
|
||||||
*/
|
*/
|
||||||
public interface EnterpriseMapper extends BaseMapper<Enterprise> {
|
public interface EnterpriseMapper extends BaseMapper<Enterprise> {
|
||||||
|
|
||||||
|
|
|
@ -5,17 +5,17 @@ import com.muyu.net.working.domain.Enterprise;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 企业信息Service接口
|
* 车辆运营平台Service接口
|
||||||
*
|
*
|
||||||
* @author muyu
|
* @author muyu
|
||||||
* @date 2024-05-27
|
* @date 2024-06-05
|
||||||
*/
|
*/
|
||||||
public interface EnterpriseService extends IService<Enterprise> {
|
public interface EnterpriseService extends IService<Enterprise> {
|
||||||
/**
|
/**
|
||||||
* 查询企业信息列表
|
* 查询车辆运营平台列表
|
||||||
*
|
*
|
||||||
* @param enterprise 企业信息
|
* @param enterprise 车辆运营平台
|
||||||
* @return 企业信息集合
|
* @return 车辆运营平台集合
|
||||||
*/
|
*/
|
||||||
public List<Enterprise> list(Enterprise enterprise);
|
public List<Enterprise> list(Enterprise enterprise);
|
||||||
|
|
||||||
|
|
|
@ -12,20 +12,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 企业信息Service业务层处理
|
* 车辆运营平台Service业务层处理
|
||||||
*
|
*
|
||||||
* @author muyu
|
* @author muyu
|
||||||
* @date 2024-05-27
|
* @date 2024-06-05
|
||||||
*/
|
*/
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterprise> implements EnterpriseService {
|
public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterprise> implements EnterpriseService {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询企业信息列表
|
* 查询车辆运营平台列表
|
||||||
*
|
*
|
||||||
* @param enterprise 企业信息
|
* @param enterprise 车辆运营平台
|
||||||
* @return 企业信息
|
* @return 车辆运营平台
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<Enterprise> list(Enterprise enterprise) {
|
public List<Enterprise> list(Enterprise enterprise) {
|
||||||
|
@ -64,8 +64,8 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
|
||||||
queryWrapper.eq(Enterprise::getEmail, enterprise.getEmail());
|
queryWrapper.eq(Enterprise::getEmail, enterprise.getEmail());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getStatus())){
|
if (ObjUtils.notNull(enterprise.getEnterpriseStatus())){
|
||||||
queryWrapper.eq(Enterprise::getStatus, enterprise.getStatus());
|
queryWrapper.eq(Enterprise::getEnterpriseStatus, enterprise.getEnterpriseStatus());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getRegistrationDate())){
|
if (ObjUtils.notNull(enterprise.getRegistrationDate())){
|
||||||
|
|
|
@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<result property="address" column="address" />
|
<result property="address" column="address" />
|
||||||
<result property="contactPhone" column="contact_phone" />
|
<result property="contactPhone" column="contact_phone" />
|
||||||
<result property="email" column="email" />
|
<result property="email" column="email" />
|
||||||
<result property="status" column="status" />
|
<result property="enterpriseStatus" column="enterprise_status" />
|
||||||
<result property="registrationDate" column="registration_date" />
|
<result property="registrationDate" column="registration_date" />
|
||||||
<result property="certificationId" column="certification_id" />
|
<result property="certificationId" column="certification_id" />
|
||||||
<result property="authenticationDate" column="authentication_date" />
|
<result property="authenticationDate" column="authentication_date" />
|
||||||
|
@ -29,6 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectEnterpriseVo">
|
<sql id="selectEnterpriseVo">
|
||||||
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
|
||||||
</sql>
|
</sql>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
Loading…
Reference in New Issue