diff --git a/cpxt-admin/src/main/resources/application-druid.yml b/cpxt-admin/src/main/resources/application-druid.yml index d41ec1f..9474cbd 100644 --- a/cpxt-admin/src/main/resources/application-druid.yml +++ b/cpxt-admin/src/main/resources/application-druid.yml @@ -8,7 +8,7 @@ spring: master: url: jdbc:mysql://localhost:3306/cpxtdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: root + password: 1234 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/cpxt-admin/src/main/resources/application.yml b/cpxt-admin/src/main/resources/application.yml index bf262b4..7f66464 100644 --- a/cpxt-admin/src/main/resources/application.yml +++ b/cpxt-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8080 + port: 8888 servlet: # 应用的访问路径 context-path: / @@ -97,8 +97,8 @@ token: # 令牌有效期（默认30分钟） expireTime: 30 -# MyBatis配置 -mybatis: +# MyBatis Plus配置 +mybatis-plus: # 搜索指定包别名 typeAliasesPackage: com.cpxt.**.domain # 配置mapper的扫描，找到所有的mapper.xml映射文件 diff --git a/cpxt-common/pom.xml b/cpxt-common/pom.xml index 62eac83..95090ca 100644 --- a/cpxt-common/pom.xml +++ b/cpxt-common/pom.xml @@ -119,6 +119,18 @@ javax.servlet-api + + + com.baomidou + mybatis-plus-boot-starter + 3.5.1 + + + + org.projectlombok + lombok + + \ No newline at end of file diff --git a/cpxt-common/src/main/java/com/cpxt/common/core/domain/BaseEntity.java b/cpxt-common/src/main/java/com/cpxt/common/core/domain/BaseEntity.java index 8de24ef..50bd0c9 100644 --- a/cpxt-common/src/main/java/com/cpxt/common/core/domain/BaseEntity.java +++ b/cpxt-common/src/main/java/com/cpxt/common/core/domain/BaseEntity.java @@ -28,9 +28,6 @@ public class BaseEntity implements Serializable @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; - /** 更新者 */ - private String updateBy; - /** 更新时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; @@ -38,6 +35,9 @@ public class BaseEntity implements Serializable /** 备注 */ private String remark; + /** 更新者 */ + private String updateBy; + /** 请求参数 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map params; diff --git a/cpxt-framework/src/main/java/com/cpxt/framework/config/MyBatisConfig.java b/cpxt-framework/src/main/java/com/cpxt/framework/config/MyBatisConfig.java deleted file mode 100644 index 3e40f7d..0000000 --- a/cpxt-framework/src/main/java/com/cpxt/framework/config/MyBatisConfig.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.cpxt.framework.config; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import javax.sql.DataSource; -import org.apache.ibatis.io.VFS; -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; -import org.springframework.core.io.DefaultResourceLoader; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.core.type.classreading.CachingMetadataReaderFactory; -import org.springframework.core.type.classreading.MetadataReader; -import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.util.ClassUtils; -import com.cpxt.common.utils.StringUtils; - -/** - * Mybatis支持*匹配扫描包 - * - * @author ruoyi - */ -@Configuration -public class MyBatisConfig -{ - @Autowired - private Environment env; - - static final String DEFAULT_RESOURCE_PATTERN = "**/*.class"; - - public static String setTypeAliasesPackage(String typeAliasesPackage) - { - ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver(); - MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver); - List allResult = new ArrayList(); - try - { - for (String aliasesPackage : typeAliasesPackage.split(",")) - { - List result = new ArrayList(); - aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX - + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN; - Resource[] resources = resolver.getResources(aliasesPackage); - if (resources != null && resources.length > 0) - { - MetadataReader metadataReader = null; - for (Resource resource : resources) - { - if (resource.isReadable()) - { - metadataReader = metadataReaderFactory.getMetadataReader(resource); - try - { - result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName()); - } - catch (ClassNotFoundException e) - { - e.printStackTrace(); - } - } - } - } - if (result.size() > 0) - { - HashSet hashResult = new HashSet(result); - allResult.addAll(hashResult); - } - } - if (allResult.size() > 0) - { - typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0])); - } - else - { - throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包"); - } - } - catch (IOException e) - { - e.printStackTrace(); - } - return typeAliasesPackage; - } - - public Resource[] resolveMapperLocations(String[] mapperLocations) - { - ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver(); - List resources = new ArrayList(); - if (mapperLocations != null) - { - for (String mapperLocation : mapperLocations) - { - try - { - Resource[] mappers = resourceResolver.getResources(mapperLocation); - resources.addAll(Arrays.asList(mappers)); - } - catch (IOException e) - { - // ignore - } - } - } - return resources.toArray(new Resource[resources.size()]); - } - - @Bean - public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception - { - String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); - String mapperLocations = env.getProperty("mybatis.mapperLocations"); - String configLocation = env.getProperty("mybatis.configLocation"); - typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); - VFS.addImplClass(SpringBootVFS.class); - - final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); - sessionFactory.setDataSource(dataSource); - sessionFactory.setTypeAliasesPackage(typeAliasesPackage); - sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ","))); - sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation)); - return sessionFactory.getObject(); - } -} \ No newline at end of file diff --git a/cpxt-framework/src/main/java/com/cpxt/framework/config/MybatisPlusConfig.java b/cpxt-framework/src/main/java/com/cpxt/framework/config/MybatisPlusConfig.java new file mode 100644 index 0000000..6943710 --- /dev/null +++ b/cpxt-framework/src/main/java/com/cpxt/framework/config/MybatisPlusConfig.java @@ -0,0 +1,62 @@ +package com.cpxt.framework.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * Mybatis Plus 配置 + * + * @author ruoyi + */ +@EnableTransactionManagement(proxyTargetClass = true) +@Configuration +public class MybatisPlusConfig +{ + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() + { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + // 分页插件 + interceptor.addInnerInterceptor(paginationInnerInterceptor()); + // 乐观锁插件 + interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor()); + // 阻断插件 + interceptor.addInnerInterceptor(blockAttackInnerInterceptor()); + return interceptor; + } + + /** + * 分页插件，自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html + */ + public PaginationInnerInterceptor paginationInnerInterceptor() + { + PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); + // 设置数据库类型为mysql + paginationInnerInterceptor.setDbType(DbType.MYSQL); + // 设置最大单页限制数量，默认 500 条，-1 不受限制 + paginationInnerInterceptor.setMaxLimit(-1L); + return paginationInnerInterceptor; + } + + /** + * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html + */ + public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() + { + return new OptimisticLockerInnerInterceptor(); + } + + /** + * 如果是对全表的删除或更新操作，就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html + */ + public BlockAttackInnerInterceptor blockAttackInnerInterceptor() + { + return new BlockAttackInnerInterceptor(); + } +} \ No newline at end of file diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCar.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCar.java index dcdaeff..2819b2b 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCar.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCar.java @@ -1,17 +1,20 @@ package com.cpxt.biz.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import com.cpxt.common.annotation.Excel; import com.cpxt.common.core.domain.BaseEntity; +import java.util.Date; + /** * 车辆对象 biz_car * * @author YIN * @date 2024-12-16 */ -public class BizCar extends BaseEntity +@Data +public class BizCar { private static final long serialVersionUID = 1L; @@ -46,93 +49,14 @@ public class BizCar extends BaseEntity @Excel(name = "状态") private Integer status; - public void setId(Long id) - { - this.id = id; - } + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public Long getId() - { - return id; - } - public void setModelId(Long modelId) - { - this.modelId = modelId; - } + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - public Long getModelId() - { - return modelId; - } - public void setModelName(String modelName) - { - this.modelName = modelName; - } - - public String getModelName() - { - return modelName; - } - public void setCarType(String carType) - { - this.carType = carType; - } - - public String getCarType() - { - return carType; - } - public void setCarNo(String carNo) - { - this.carNo = carNo; - } - - public String getCarNo() - { - return carNo; - } - public void setVin(String vin) - { - this.vin = vin; - } - - public String getVin() - { - return vin; - } - public void setSerialNo(String serialNo) - { - this.serialNo = serialNo; - } - - public String getSerialNo() - { - return serialNo; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("modelId", getModelId()) - .append("modelName", getModelName()) - .append("carType", getCarType()) - .append("carNo", getCarNo()) - .append("vin", getVin()) - .append("serialNo", getSerialNo()) - .append("status", getStatus()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } + /** 备注 */ + private String remark; } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCarModel.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCarModel.java index 7d73a73..3647e5b 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCarModel.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCarModel.java @@ -1,10 +1,10 @@ package com.cpxt.biz.domain; import java.math.BigDecimal; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import com.cpxt.common.annotation.Excel; -import com.cpxt.common.core.domain.BaseEntity; /** * 车型对象 biz_car_model @@ -12,7 +12,8 @@ import com.cpxt.common.core.domain.BaseEntity; * @author YIN * @date 2024-12-16 */ -public class BizCarModel extends BaseEntity +@Data +public class BizCarModel { private static final long serialVersionUID = 1L; @@ -51,103 +52,14 @@ public class BizCarModel extends BaseEntity @Excel(name = "状态") private Integer status; - public void setId(Long id) - { - this.id = id; - } + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public Long getId() - { - return id; - } - public void setName(String name) - { - this.name = name; - } + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - public String getName() - { - return name; - } - public void setBrand(String brand) - { - this.brand = brand; - } - - public String getBrand() - { - return brand; - } - public void setWeight(BigDecimal weight) - { - this.weight = weight; - } - - public BigDecimal getWeight() - { - return weight; - } - public void setVolume(BigDecimal volume) - { - this.volume = volume; - } - - public BigDecimal getVolume() - { - return volume; - } - public void setLength(BigDecimal length) - { - this.length = length; - } - - public BigDecimal getLength() - { - return length; - } - public void setWidth(BigDecimal width) - { - this.width = width; - } - - public BigDecimal getWidth() - { - return width; - } - public void setHeight(BigDecimal height) - { - this.height = height; - } - - public BigDecimal getHeight() - { - return height; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("brand", getBrand()) - .append("weight", getWeight()) - .append("volume", getVolume()) - .append("length", getLength()) - .append("width", getWidth()) - .append("height", getHeight()) - .append("status", getStatus()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } + /** 备注 */ + private String remark; } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomer.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomer.java index b2b92e1..bfb54bb 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomer.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomer.java @@ -1,17 +1,22 @@ package com.cpxt.biz.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.cpxt.common.annotation.Excel; import com.cpxt.common.core.domain.BaseEntity; +import java.util.Date; + /** * 客户对象 biz_customer * * @author YIN * @date 2024-12-16 */ -public class BizCustomer extends BaseEntity +@Data +public class BizCustomer { private static final long serialVersionUID = 1L; @@ -42,83 +47,14 @@ public class BizCustomer extends BaseEntity @Excel(name = "状态") private Integer status; - public void setId(Long id) - { - this.id = id; - } + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public Long getId() - { - return id; - } - public void setName(String name) - { - this.name = name; - } + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - public String getName() - { - return name; - } - public void setFullName(String fullName) - { - this.fullName = fullName; - } - - public String getFullName() - { - return fullName; - } - public void setLinkman(String linkman) - { - this.linkman = linkman; - } - - public String getLinkman() - { - return linkman; - } - public void setLinkphone(String linkphone) - { - this.linkphone = linkphone; - } - - public String getLinkphone() - { - return linkphone; - } - public void setLevel(String level) - { - this.level = level; - } - - public String getLevel() - { - return level; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("fullName", getFullName()) - .append("linkman", getLinkman()) - .append("linkphone", getLinkphone()) - .append("level", getLevel()) - .append("status", getStatus()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } + /** 备注 */ + private String remark; } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerRoute.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerRoute.java index 4ec05d5..199d1a7 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerRoute.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerRoute.java @@ -1,17 +1,20 @@ package com.cpxt.biz.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.cpxt.common.annotation.Excel; import com.cpxt.common.core.domain.BaseEntity; +import java.util.Date; + /** * 路线对象 biz_customer_route * * @author YIN * @date 2024-12-16 */ -public class BizCustomerRoute extends BaseEntity +public class BizCustomerRoute { private static final long serialVersionUID = 1L; @@ -34,63 +37,14 @@ public class BizCustomerRoute extends BaseEntity @Excel(name = "状态") private Integer status; - public void setId(Long id) - { - this.id = id; - } + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public Long getId() - { - return id; - } - public void setCustomerId(Long customerId) - { - this.customerId = customerId; - } + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - public Long getCustomerId() - { - return customerId; - } - public void setCustomerName(String customerName) - { - this.customerName = customerName; - } - - public String getCustomerName() - { - return customerName; - } - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("customerId", getCustomerId()) - .append("customerName", getCustomerName()) - .append("name", getName()) - .append("status", getStatus()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } + /** 备注 */ + private String remark; } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerRouteShop.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerRouteShop.java index 5d92990..2e2ace0 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerRouteShop.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerRouteShop.java @@ -1,9 +1,7 @@ package com.cpxt.biz.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import lombok.Data; import com.cpxt.common.annotation.Excel; -import com.cpxt.common.core.domain.BaseEntity; /** * 路线店铺关联对象 biz_customer_route_shop @@ -11,7 +9,8 @@ import com.cpxt.common.core.domain.BaseEntity; * @author YIN * @date 2024-12-16 */ -public class BizCustomerRouteShop extends BaseEntity +@Data +public class BizCustomerRouteShop { private static final long serialVersionUID = 1L; @@ -30,50 +29,4 @@ public class BizCustomerRouteShop extends BaseEntity @Excel(name = "排序") private Integer sort; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setRouteId(Long routeId) - { - this.routeId = routeId; - } - - public Long getRouteId() - { - return routeId; - } - public void setShopId(Long shopId) - { - this.shopId = shopId; - } - - public Long getShopId() - { - return shopId; - } - public void setSort(Integer sort) - { - this.sort = sort; - } - - public Integer getSort() - { - return sort; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("routeId", getRouteId()) - .append("shopId", getShopId()) - .append("sort", getSort()) - .toString(); - } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerShop.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerShop.java index f8f500e..dd71c18 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerShop.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerShop.java @@ -1,6 +1,10 @@ package com.cpxt.biz.domain; import java.math.BigDecimal; +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.cpxt.common.annotation.Excel; @@ -12,7 +16,8 @@ import com.cpxt.common.core.domain.BaseEntity; * @author YIN * @date 2024-12-16 */ -public class BizCustomerShop extends BaseEntity +@Data +public class BizCustomerShop { private static final long serialVersionUID = 1L; @@ -55,113 +60,14 @@ public class BizCustomerShop extends BaseEntity @Excel(name = "状态") private Integer status; - public void setId(Long id) - { - this.id = id; - } + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public Long getId() - { - return id; - } - public void setCustomerId(Long customerId) - { - this.customerId = customerId; - } + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - public Long getCustomerId() - { - return customerId; - } - public void setCustomerName(String customerName) - { - this.customerName = customerName; - } - - public String getCustomerName() - { - return customerName; - } - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - public void setLinkman(String linkman) - { - this.linkman = linkman; - } - - public String getLinkman() - { - return linkman; - } - public void setLinkphone(String linkphone) - { - this.linkphone = linkphone; - } - - public String getLinkphone() - { - return linkphone; - } - public void setAddress(String address) - { - this.address = address; - } - - public String getAddress() - { - return address; - } - public void setLng(BigDecimal lng) - { - this.lng = lng; - } - - public BigDecimal getLng() - { - return lng; - } - public void setLat(BigDecimal lat) - { - this.lat = lat; - } - - public BigDecimal getLat() - { - return lat; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("customerId", getCustomerId()) - .append("customerName", getCustomerName()) - .append("name", getName()) - .append("linkman", getLinkman()) - .append("linkphone", getLinkphone()) - .append("address", getAddress()) - .append("lng", getLng()) - .append("lat", getLat()) - .append("status", getStatus()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } + /** 备注 */ + private String remark; } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerUser.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerUser.java index 5154134..118ca37 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerUser.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerUser.java @@ -1,17 +1,22 @@ package com.cpxt.biz.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.cpxt.common.annotation.Excel; import com.cpxt.common.core.domain.BaseEntity; +import java.util.Date; + /** * 用户对象 biz_customer_user * * @author YIN * @date 2024-12-16 */ -public class BizCustomerUser extends BaseEntity +@Data +public class BizCustomerUser { private static final long serialVersionUID = 1L; @@ -34,63 +39,14 @@ public class BizCustomerUser extends BaseEntity @Excel(name = "状态") private Integer status; - public void setId(Long id) - { - this.id = id; - } + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public Long getId() - { - return id; - } - public void setCustomerId(Long customerId) - { - this.customerId = customerId; - } + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - public Long getCustomerId() - { - return customerId; - } - public void setCustomerName(String customerName) - { - this.customerName = customerName; - } - - public String getCustomerName() - { - return customerName; - } - public void setUsername(String username) - { - this.username = username; - } - - public String getUsername() - { - return username; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("customerId", getCustomerId()) - .append("customerName", getCustomerName()) - .append("username", getUsername()) - .append("status", getStatus()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } + /** 备注 */ + private String remark; } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerWarehouse.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerWarehouse.java index 6e6dfff..16d10c0 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerWarehouse.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizCustomerWarehouse.java @@ -1,6 +1,10 @@ package com.cpxt.biz.domain; import java.math.BigDecimal; +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.cpxt.common.annotation.Excel; @@ -12,6 +16,7 @@ import com.cpxt.common.core.domain.BaseEntity; * @author YIN * @date 2024-12-16 */ +@Data public class BizCustomerWarehouse extends BaseEntity { private static final long serialVersionUID = 1L; @@ -55,113 +60,14 @@ public class BizCustomerWarehouse extends BaseEntity @Excel(name = "状态") private Integer status; - public void setId(Long id) - { - this.id = id; - } + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public Long getId() - { - return id; - } - public void setCustomerId(Long customerId) - { - this.customerId = customerId; - } + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - public Long getCustomerId() - { - return customerId; - } - public void setCustomerName(String customerName) - { - this.customerName = customerName; - } - - public String getCustomerName() - { - return customerName; - } - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - public void setLinkman(String linkman) - { - this.linkman = linkman; - } - - public String getLinkman() - { - return linkman; - } - public void setLinkphone(String linkphone) - { - this.linkphone = linkphone; - } - - public String getLinkphone() - { - return linkphone; - } - public void setAddress(String address) - { - this.address = address; - } - - public String getAddress() - { - return address; - } - public void setLng(BigDecimal lng) - { - this.lng = lng; - } - - public BigDecimal getLng() - { - return lng; - } - public void setLat(BigDecimal lat) - { - this.lat = lat; - } - - public BigDecimal getLat() - { - return lat; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("customerId", getCustomerId()) - .append("customerName", getCustomerName()) - .append("name", getName()) - .append("linkman", getLinkman()) - .append("linkphone", getLinkphone()) - .append("address", getAddress()) - .append("lng", getLng()) - .append("lat", getLat()) - .append("status", getStatus()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } + /** 备注 */ + private String remark; } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizDriver.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizDriver.java index c6a82b0..9f7568b 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizDriver.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizDriver.java @@ -1,17 +1,22 @@ package com.cpxt.biz.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.cpxt.common.annotation.Excel; import com.cpxt.common.core.domain.BaseEntity; +import java.util.Date; + /** * 司机对象 biz_driver * * @author YIN * @date 2024-12-16 */ -public class BizDriver extends BaseEntity +@Data +public class BizDriver { private static final long serialVersionUID = 1L; @@ -66,143 +71,14 @@ public class BizDriver extends BaseEntity @Excel(name = "状态") private Integer status; - public void setId(Long id) - { - this.id = id; - } + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public Long getId() - { - return id; - } - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - public Long getDeptId() - { - return deptId; - } - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - public void setIdcard(String idcard) - { - this.idcard = idcard; - } - - public String getIdcard() - { - return idcard; - } - public void setGender(String gender) - { - this.gender = gender; - } - - public String getGender() - { - return gender; - } - public void setPhone(String phone) - { - this.phone = phone; - } - - public String getPhone() - { - return phone; - } - public void setPhoto(String photo) - { - this.photo = photo; - } - - public String getPhoto() - { - return photo; - } - public void setIdcardPhotoFace(String idcardPhotoFace) - { - this.idcardPhotoFace = idcardPhotoFace; - } - - public String getIdcardPhotoFace() - { - return idcardPhotoFace; - } - public void setIdcardPhotoNe(String idcardPhotoNe) - { - this.idcardPhotoNe = idcardPhotoNe; - } - - public String getIdcardPhotoNe() - { - return idcardPhotoNe; - } - public void setDefaultCarId(Long defaultCarId) - { - this.defaultCarId = defaultCarId; - } - - public Long getDefaultCarId() - { - return defaultCarId; - } - public void setDefaultCarNo(String defaultCarNo) - { - this.defaultCarNo = defaultCarNo; - } - - public String getDefaultCarNo() - { - return defaultCarNo; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("deptId", getDeptId()) - .append("userId", getUserId()) - .append("name", getName()) - .append("idcard", getIdcard()) - .append("gender", getGender()) - .append("phone", getPhone()) - .append("photo", getPhoto()) - .append("idcardPhotoFace", getIdcardPhotoFace()) - .append("idcardPhotoNe", getIdcardPhotoNe()) - .append("defaultCarId", getDefaultCarId()) - .append("defaultCarNo", getDefaultCarNo()) - .append("status", getStatus()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } + /** 备注 */ + private String remark; } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java index b307ffd..ca97fc7 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrder.java @@ -3,6 +3,7 @@ package com.cpxt.biz.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.cpxt.common.annotation.Excel; @@ -14,7 +15,8 @@ import com.cpxt.common.core.domain.BaseEntity; * @author YIN * @date 2024-12-16 */ -public class BizOrder extends BaseEntity +@Data +public class BizOrder { private static final long serialVersionUID = 1L; @@ -253,593 +255,14 @@ public class BizOrder extends BaseEntity @Excel(name = "到达纬度") private BigDecimal arriveLat; - public void setId(Long id) - { - this.id = id; - } + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public Long getId() - { - return id; - } - public void setOrderSn(String orderSn) - { - this.orderSn = orderSn; - } + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - public String getOrderSn() - { - return orderSn; - } - public void setOrderStatus(String orderStatus) - { - this.orderStatus = orderStatus; - } - - public String getOrderStatus() - { - return orderStatus; - } - public void setOrderType(String orderType) - { - this.orderType = orderType; - } - - public String getOrderType() - { - return orderType; - } - public void setCustomerId(Long customerId) - { - this.customerId = customerId; - } - - public Long getCustomerId() - { - return customerId; - } - public void setCustomerName(String customerName) - { - this.customerName = customerName; - } - - public String getCustomerName() - { - return customerName; - } - public void setRouteId(Long routeId) - { - this.routeId = routeId; - } - - public Long getRouteId() - { - return routeId; - } - public void setRouteName(String routeName) - { - this.routeName = routeName; - } - - public String getRouteName() - { - return routeName; - } - public void setWarehouseId(Long warehouseId) - { - this.warehouseId = warehouseId; - } - - public Long getWarehouseId() - { - return warehouseId; - } - public void setWarehouseName(String warehouseName) - { - this.warehouseName = warehouseName; - } - - public String getWarehouseName() - { - return warehouseName; - } - public void setShopId(Long shopId) - { - this.shopId = shopId; - } - - public Long getShopId() - { - return shopId; - } - public void setShopName(String shopName) - { - this.shopName = shopName; - } - - public String getShopName() - { - return shopName; - } - public void setCarId(Long carId) - { - this.carId = carId; - } - - public Long getCarId() - { - return carId; - } - public void setCarNo(String carNo) - { - this.carNo = carNo; - } - - public String getCarNo() - { - return carNo; - } - public void setDriverId(Long driverId) - { - this.driverId = driverId; - } - - public Long getDriverId() - { - return driverId; - } - public void setDriverName(String driverName) - { - this.driverName = driverName; - } - - public String getDriverName() - { - return driverName; - } - public void setCopilotId(Long copilotId) - { - this.copilotId = copilotId; - } - - public Long getCopilotId() - { - return copilotId; - } - public void setCopilotName(String copilotName) - { - this.copilotName = copilotName; - } - - public String getCopilotName() - { - return copilotName; - } - public void setSenderName(String senderName) - { - this.senderName = senderName; - } - - public String getSenderName() - { - return senderName; - } - public void setSenderLinkman(String senderLinkman) - { - this.senderLinkman = senderLinkman; - } - - public String getSenderLinkman() - { - return senderLinkman; - } - public void setSenderPhone(String senderPhone) - { - this.senderPhone = senderPhone; - } - - public String getSenderPhone() - { - return senderPhone; - } - public void setSenderAddress(String senderAddress) - { - this.senderAddress = senderAddress; - } - - public String getSenderAddress() - { - return senderAddress; - } - public void setSenderLng(BigDecimal senderLng) - { - this.senderLng = senderLng; - } - - public BigDecimal getSenderLng() - { - return senderLng; - } - public void setSenderLat(BigDecimal senderLat) - { - this.senderLat = senderLat; - } - - public BigDecimal getSenderLat() - { - return senderLat; - } - public void setSenderCompany(String senderCompany) - { - this.senderCompany = senderCompany; - } - - public String getSenderCompany() - { - return senderCompany; - } - public void setReceiverName(String receiverName) - { - this.receiverName = receiverName; - } - - public String getReceiverName() - { - return receiverName; - } - public void setReceiverLinkman(String receiverLinkman) - { - this.receiverLinkman = receiverLinkman; - } - - public String getReceiverLinkman() - { - return receiverLinkman; - } - public void setReceiverPhone(String receiverPhone) - { - this.receiverPhone = receiverPhone; - } - - public String getReceiverPhone() - { - return receiverPhone; - } - public void setReceiverAddress(String receiverAddress) - { - this.receiverAddress = receiverAddress; - } - - public String getReceiverAddress() - { - return receiverAddress; - } - public void setReceiverLng(BigDecimal receiverLng) - { - this.receiverLng = receiverLng; - } - - public BigDecimal getReceiverLng() - { - return receiverLng; - } - public void setReceiverLat(BigDecimal receiverLat) - { - this.receiverLat = receiverLat; - } - - public BigDecimal getReceiverLat() - { - return receiverLat; - } - public void setReceiverCompany(String receiverCompany) - { - this.receiverCompany = receiverCompany; - } - - public String getReceiverCompany() - { - return receiverCompany; - } - public void setGoodsType(String goodsType) - { - this.goodsType = goodsType; - } - - public String getGoodsType() - { - return goodsType; - } - public void setGoodsName(String goodsName) - { - this.goodsName = goodsName; - } - - public String getGoodsName() - { - return goodsName; - } - public void setWeight(BigDecimal weight) - { - this.weight = weight; - } - - public BigDecimal getWeight() - { - return weight; - } - public void setVolume(BigDecimal volume) - { - this.volume = volume; - } - - public BigDecimal getVolume() - { - return volume; - } - public void setLength(BigDecimal length) - { - this.length = length; - } - - public BigDecimal getLength() - { - return length; - } - public void setWidth(BigDecimal width) - { - this.width = width; - } - - public BigDecimal getWidth() - { - return width; - } - public void setHeight(BigDecimal height) - { - this.height = height; - } - - public BigDecimal getHeight() - { - return height; - } - public void setTotalQuantity(Integer totalQuantity) - { - this.totalQuantity = totalQuantity; - } - - public Integer getTotalQuantity() - { - return totalQuantity; - } - public void setInsured(Integer insured) - { - this.insured = insured; - } - - public Integer getInsured() - { - return insured; - } - public void setInsuredMoney(BigDecimal insuredMoney) - { - this.insuredMoney = insuredMoney; - } - - public BigDecimal getInsuredMoney() - { - return insuredMoney; - } - public void setInsuredFee(BigDecimal insuredFee) - { - this.insuredFee = insuredFee; - } - - public BigDecimal getInsuredFee() - { - return insuredFee; - } - public void setOrderFee(BigDecimal orderFee) - { - this.orderFee = orderFee; - } - - public BigDecimal getOrderFee() - { - return orderFee; - } - public void setIsCancel(Integer isCancel) - { - this.isCancel = isCancel; - } - - public Integer getIsCancel() - { - return isCancel; - } - public void setCancelReason(String cancelReason) - { - this.cancelReason = cancelReason; - } - - public String getCancelReason() - { - return cancelReason; - } - public void setCancelTime(Date cancelTime) - { - this.cancelTime = cancelTime; - } - - public Date getCancelTime() - { - return cancelTime; - } - public void setPayType(String payType) - { - this.payType = payType; - } - - public String getPayType() - { - return payType; - } - public void setPayMode(String payMode) - { - this.payMode = payMode; - } - - public String getPayMode() - { - return payMode; - } - public void setPayId(String payId) - { - this.payId = payId; - } - - public String getPayId() - { - return payId; - } - public void setPayStatus(Integer payStatus) - { - this.payStatus = payStatus; - } - - public Integer getPayStatus() - { - return payStatus; - } - public void setPayTime(Date payTime) - { - this.payTime = payTime; - } - - public Date getPayTime() - { - return payTime; - } - public void setStatus(Integer status) - { - this.status = status; - } - - public Integer getStatus() - { - return status; - } - public void setStartTime(Date startTime) - { - this.startTime = startTime; - } - - public Date getStartTime() - { - return startTime; - } - public void setArriveTime(Date arriveTime) - { - this.arriveTime = arriveTime; - } - - public Date getArriveTime() - { - return arriveTime; - } - public void setArriveRemark(String arriveRemark) - { - this.arriveRemark = arriveRemark; - } - - public String getArriveRemark() - { - return arriveRemark; - } - public void setArriveLng(BigDecimal arriveLng) - { - this.arriveLng = arriveLng; - } - - public BigDecimal getArriveLng() - { - return arriveLng; - } - public void setArriveLat(BigDecimal arriveLat) - { - this.arriveLat = arriveLat; - } - - public BigDecimal getArriveLat() - { - return arriveLat; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("orderSn", getOrderSn()) - .append("orderStatus", getOrderStatus()) - .append("orderType", getOrderType()) - .append("customerId", getCustomerId()) - .append("customerName", getCustomerName()) - .append("routeId", getRouteId()) - .append("routeName", getRouteName()) - .append("warehouseId", getWarehouseId()) - .append("warehouseName", getWarehouseName()) - .append("shopId", getShopId()) - .append("shopName", getShopName()) - .append("carId", getCarId()) - .append("carNo", getCarNo()) - .append("driverId", getDriverId()) - .append("driverName", getDriverName()) - .append("copilotId", getCopilotId()) - .append("copilotName", getCopilotName()) - .append("senderName", getSenderName()) - .append("senderLinkman", getSenderLinkman()) - .append("senderPhone", getSenderPhone()) - .append("senderAddress", getSenderAddress()) - .append("senderLng", getSenderLng()) - .append("senderLat", getSenderLat()) - .append("senderCompany", getSenderCompany()) - .append("receiverName", getReceiverName()) - .append("receiverLinkman", getReceiverLinkman()) - .append("receiverPhone", getReceiverPhone()) - .append("receiverAddress", getReceiverAddress()) - .append("receiverLng", getReceiverLng()) - .append("receiverLat", getReceiverLat()) - .append("receiverCompany", getReceiverCompany()) - .append("goodsType", getGoodsType()) - .append("goodsName", getGoodsName()) - .append("weight", getWeight()) - .append("volume", getVolume()) - .append("length", getLength()) - .append("width", getWidth()) - .append("height", getHeight()) - .append("totalQuantity", getTotalQuantity()) - .append("insured", getInsured()) - .append("insuredMoney", getInsuredMoney()) - .append("insuredFee", getInsuredFee()) - .append("orderFee", getOrderFee()) - .append("isCancel", getIsCancel()) - .append("cancelReason", getCancelReason()) - .append("cancelTime", getCancelTime()) - .append("payType", getPayType()) - .append("payMode", getPayMode()) - .append("payId", getPayId()) - .append("payStatus", getPayStatus()) - .append("payTime", getPayTime()) - .append("status", getStatus()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .append("startTime", getStartTime()) - .append("arriveTime", getArriveTime()) - .append("arriveRemark", getArriveRemark()) - .append("arriveLng", getArriveLng()) - .append("arriveLat", getArriveLat()) - .toString(); - } + /** 备注 */ + private String remark; } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrderSub.java b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrderSub.java index 0365089..fa598a1 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrderSub.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/domain/BizOrderSub.java @@ -1,6 +1,8 @@ package com.cpxt.biz.domain; import java.math.BigDecimal; + +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.cpxt.common.annotation.Excel; @@ -12,7 +14,8 @@ import com.cpxt.common.core.domain.BaseEntity; * @author YIN * @date 2024-12-16 */ -public class BizOrderSub extends BaseEntity +@Data +public class BizOrderSub { private static final long serialVersionUID = 1L; @@ -47,90 +50,4 @@ public class BizOrderSub extends BaseEntity @Excel(name = "高", readConverterExp = "米=") private BigDecimal height; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setOrderSn(String orderSn) - { - this.orderSn = orderSn; - } - - public String getOrderSn() - { - return orderSn; - } - public void setSubOrderSn(String subOrderSn) - { - this.subOrderSn = subOrderSn; - } - - public String getSubOrderSn() - { - return subOrderSn; - } - public void setWeight(BigDecimal weight) - { - this.weight = weight; - } - - public BigDecimal getWeight() - { - return weight; - } - public void setVolume(BigDecimal volume) - { - this.volume = volume; - } - - public BigDecimal getVolume() - { - return volume; - } - public void setLength(BigDecimal length) - { - this.length = length; - } - - public BigDecimal getLength() - { - return length; - } - public void setWidth(BigDecimal width) - { - this.width = width; - } - - public BigDecimal getWidth() - { - return width; - } - public void setHeight(BigDecimal height) - { - this.height = height; - } - - public BigDecimal getHeight() - { - return height; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("orderSn", getOrderSn()) - .append("subOrderSn", getSubOrderSn()) - .append("weight", getWeight()) - .append("volume", getVolume()) - .append("length", getLength()) - .append("width", getWidth()) - .append("height", getHeight()) - .toString(); - } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCarMapper.java b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCarMapper.java index adf5e0d..ba29da8 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCarMapper.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCarMapper.java @@ -1,7 +1,8 @@ package com.cpxt.biz.mapper; -import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cpxt.biz.domain.BizCar; +import org.apache.ibatis.annotations.Mapper; /** * 车辆Mapper接口 @@ -9,53 +10,6 @@ import com.cpxt.biz.domain.BizCar; * @author YIN * @date 2024-12-16 */ -public interface BizCarMapper -{ - /** - * 查询车辆 - * - * @param id 车辆主键 - * @return 车辆 - */ - public BizCar selectBizCarById(Long id); - - /** - * 查询车辆列表 - * - * @param bizCar 车辆 - * @return 车辆集合 - */ - public List selectBizCarList(BizCar bizCar); - - /** - * 新增车辆 - * - * @param bizCar 车辆 - * @return 结果 - */ - public int insertBizCar(BizCar bizCar); - - /** - * 修改车辆 - * - * @param bizCar 车辆 - * @return 结果 - */ - public int updateBizCar(BizCar bizCar); - - /** - * 删除车辆 - * - * @param id 车辆主键 - * @return 结果 - */ - public int deleteBizCarById(Long id); - - /** - * 批量删除车辆 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBizCarByIds(Long[] ids); -} +@Mapper +public interface BizCarMapper extends BaseMapper +{ } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCarModelMapper.java b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCarModelMapper.java index edf6ce9..9f1c02e 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCarModelMapper.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCarModelMapper.java @@ -1,7 +1,8 @@ package com.cpxt.biz.mapper; -import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cpxt.biz.domain.BizCarModel; +import org.apache.ibatis.annotations.Mapper; /** * 车型Mapper接口 @@ -9,53 +10,6 @@ import com.cpxt.biz.domain.BizCarModel; * @author YIN * @date 2024-12-16 */ -public interface BizCarModelMapper -{ - /** - * 查询车型 - * - * @param id 车型主键 - * @return 车型 - */ - public BizCarModel selectBizCarModelById(Long id); - - /** - * 查询车型列表 - * - * @param bizCarModel 车型 - * @return 车型集合 - */ - public List selectBizCarModelList(BizCarModel bizCarModel); - - /** - * 新增车型 - * - * @param bizCarModel 车型 - * @return 结果 - */ - public int insertBizCarModel(BizCarModel bizCarModel); - - /** - * 修改车型 - * - * @param bizCarModel 车型 - * @return 结果 - */ - public int updateBizCarModel(BizCarModel bizCarModel); - - /** - * 删除车型 - * - * @param id 车型主键 - * @return 结果 - */ - public int deleteBizCarModelById(Long id); - - /** - * 批量删除车型 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBizCarModelByIds(Long[] ids); -} +@Mapper +public interface BizCarModelMapper extends BaseMapper +{ } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerMapper.java b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerMapper.java index 27cb62b..fe3472d 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerMapper.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerMapper.java @@ -1,7 +1,10 @@ package com.cpxt.biz.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cpxt.biz.domain.BizCustomer; +import org.apache.ibatis.annotations.Mapper; /** * 客户Mapper接口 @@ -9,53 +12,6 @@ import com.cpxt.biz.domain.BizCustomer; * @author YIN * @date 2024-12-16 */ -public interface BizCustomerMapper -{ - /** - * 查询客户 - * - * @param id 客户主键 - * @return 客户 - */ - public BizCustomer selectBizCustomerById(Long id); - - /** - * 查询客户列表 - * - * @param bizCustomer 客户 - * @return 客户集合 - */ - public List selectBizCustomerList(BizCustomer bizCustomer); - - /** - * 新增客户 - * - * @param bizCustomer 客户 - * @return 结果 - */ - public int insertBizCustomer(BizCustomer bizCustomer); - - /** - * 修改客户 - * - * @param bizCustomer 客户 - * @return 结果 - */ - public int updateBizCustomer(BizCustomer bizCustomer); - - /** - * 删除客户 - * - * @param id 客户主键 - * @return 结果 - */ - public int deleteBizCustomerById(Long id); - - /** - * 批量删除客户 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBizCustomerByIds(Long[] ids); -} +@Mapper +public interface BizCustomerMapper extends BaseMapper +{ } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerRouteMapper.java b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerRouteMapper.java index d4180c7..dbea4e1 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerRouteMapper.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerRouteMapper.java @@ -1,7 +1,10 @@ package com.cpxt.biz.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cpxt.biz.domain.BizCustomerRoute; +import org.apache.ibatis.annotations.Mapper; /** * 路线Mapper接口 @@ -9,53 +12,7 @@ import com.cpxt.biz.domain.BizCustomerRoute; * @author YIN * @date 2024-12-16 */ -public interface BizCustomerRouteMapper +@Mapper +public interface BizCustomerRouteMapper extends BaseMapper { - /** - * 查询路线 - * - * @param id 路线主键 - * @return 路线 - */ - public BizCustomerRoute selectBizCustomerRouteById(Long id); - - /** - * 查询路线列表 - * - * @param bizCustomerRoute 路线 - * @return 路线集合 - */ - public List selectBizCustomerRouteList(BizCustomerRoute bizCustomerRoute); - - /** - * 新增路线 - * - * @param bizCustomerRoute 路线 - * @return 结果 - */ - public int insertBizCustomerRoute(BizCustomerRoute bizCustomerRoute); - - /** - * 修改路线 - * - * @param bizCustomerRoute 路线 - * @return 结果 - */ - public int updateBizCustomerRoute(BizCustomerRoute bizCustomerRoute); - - /** - * 删除路线 - * - * @param id 路线主键 - * @return 结果 - */ - public int deleteBizCustomerRouteById(Long id); - - /** - * 批量删除路线 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBizCustomerRouteByIds(Long[] ids); } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerRouteShopMapper.java b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerRouteShopMapper.java index 5ea3735..fae5583 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerRouteShopMapper.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerRouteShopMapper.java @@ -1,7 +1,11 @@ package com.cpxt.biz.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cpxt.biz.domain.BizCustomerRoute; import com.cpxt.biz.domain.BizCustomerRouteShop; +import org.apache.ibatis.annotations.Mapper; /** * 路线店铺关联Mapper接口 @@ -9,53 +13,6 @@ import com.cpxt.biz.domain.BizCustomerRouteShop; * @author YIN * @date 2024-12-16 */ -public interface BizCustomerRouteShopMapper -{ - /** - * 查询路线店铺关联 - * - * @param id 路线店铺关联主键 - * @return 路线店铺关联 - */ - public BizCustomerRouteShop selectBizCustomerRouteShopById(Long id); - - /** - * 查询路线店铺关联列表 - * - * @param bizCustomerRouteShop 路线店铺关联 - * @return 路线店铺关联集合 - */ - public List selectBizCustomerRouteShopList(BizCustomerRouteShop bizCustomerRouteShop); - - /** - * 新增路线店铺关联 - * - * @param bizCustomerRouteShop 路线店铺关联 - * @return 结果 - */ - public int insertBizCustomerRouteShop(BizCustomerRouteShop bizCustomerRouteShop); - - /** - * 修改路线店铺关联 - * - * @param bizCustomerRouteShop 路线店铺关联 - * @return 结果 - */ - public int updateBizCustomerRouteShop(BizCustomerRouteShop bizCustomerRouteShop); - - /** - * 删除路线店铺关联 - * - * @param id 路线店铺关联主键 - * @return 结果 - */ - public int deleteBizCustomerRouteShopById(Long id); - - /** - * 批量删除路线店铺关联 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBizCustomerRouteShopByIds(Long[] ids); -} +@Mapper +public interface BizCustomerRouteShopMapper extends BaseMapper +{ } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerShopMapper.java b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerShopMapper.java index bee6947..fcefdf9 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerShopMapper.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerShopMapper.java @@ -1,7 +1,10 @@ package com.cpxt.biz.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cpxt.biz.domain.BizCustomerShop; +import org.apache.ibatis.annotations.Mapper; /** * 门店Mapper接口 @@ -9,53 +12,6 @@ import com.cpxt.biz.domain.BizCustomerShop; * @author YIN * @date 2024-12-16 */ -public interface BizCustomerShopMapper -{ - /** - * 查询门店 - * - * @param id 门店主键 - * @return 门店 - */ - public BizCustomerShop selectBizCustomerShopById(Long id); - - /** - * 查询门店列表 - * - * @param bizCustomerShop 门店 - * @return 门店集合 - */ - public List selectBizCustomerShopList(BizCustomerShop bizCustomerShop); - - /** - * 新增门店 - * - * @param bizCustomerShop 门店 - * @return 结果 - */ - public int insertBizCustomerShop(BizCustomerShop bizCustomerShop); - - /** - * 修改门店 - * - * @param bizCustomerShop 门店 - * @return 结果 - */ - public int updateBizCustomerShop(BizCustomerShop bizCustomerShop); - - /** - * 删除门店 - * - * @param id 门店主键 - * @return 结果 - */ - public int deleteBizCustomerShopById(Long id); - - /** - * 批量删除门店 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBizCustomerShopByIds(Long[] ids); -} +@Mapper +public interface BizCustomerShopMapper extends BaseMapper +{ } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerUserMapper.java b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerUserMapper.java index ab3aa96..2838b12 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerUserMapper.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerUserMapper.java @@ -1,7 +1,11 @@ package com.cpxt.biz.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cpxt.biz.domain.BizCustomerUser; +import lombok.Data; +import org.apache.ibatis.annotations.Mapper; /** * 用户Mapper接口 @@ -9,53 +13,6 @@ import com.cpxt.biz.domain.BizCustomerUser; * @author YIN * @date 2024-12-16 */ -public interface BizCustomerUserMapper -{ - /** - * 查询用户 - * - * @param id 用户主键 - * @return 用户 - */ - public BizCustomerUser selectBizCustomerUserById(Long id); - - /** - * 查询用户列表 - * - * @param bizCustomerUser 用户 - * @return 用户集合 - */ - public List selectBizCustomerUserList(BizCustomerUser bizCustomerUser); - - /** - * 新增用户 - * - * @param bizCustomerUser 用户 - * @return 结果 - */ - public int insertBizCustomerUser(BizCustomerUser bizCustomerUser); - - /** - * 修改用户 - * - * @param bizCustomerUser 用户 - * @return 结果 - */ - public int updateBizCustomerUser(BizCustomerUser bizCustomerUser); - - /** - * 删除用户 - * - * @param id 用户主键 - * @return 结果 - */ - public int deleteBizCustomerUserById(Long id); - - /** - * 批量删除用户 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBizCustomerUserByIds(Long[] ids); -} +@Mapper +public interface BizCustomerUserMapper extends BaseMapper +{ } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerWarehouseMapper.java b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerWarehouseMapper.java index 87c52c4..2c9957f 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerWarehouseMapper.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizCustomerWarehouseMapper.java @@ -1,7 +1,10 @@ package com.cpxt.biz.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cpxt.biz.domain.BizCustomerWarehouse; +import org.apache.ibatis.annotations.Mapper; /** * 仓库Mapper接口 @@ -9,53 +12,6 @@ import com.cpxt.biz.domain.BizCustomerWarehouse; * @author YIN * @date 2024-12-16 */ -public interface BizCustomerWarehouseMapper -{ - /** - * 查询仓库 - * - * @param id 仓库主键 - * @return 仓库 - */ - public BizCustomerWarehouse selectBizCustomerWarehouseById(Long id); - - /** - * 查询仓库列表 - * - * @param bizCustomerWarehouse 仓库 - * @return 仓库集合 - */ - public List selectBizCustomerWarehouseList(BizCustomerWarehouse bizCustomerWarehouse); - - /** - * 新增仓库 - * - * @param bizCustomerWarehouse 仓库 - * @return 结果 - */ - public int insertBizCustomerWarehouse(BizCustomerWarehouse bizCustomerWarehouse); - - /** - * 修改仓库 - * - * @param bizCustomerWarehouse 仓库 - * @return 结果 - */ - public int updateBizCustomerWarehouse(BizCustomerWarehouse bizCustomerWarehouse); - - /** - * 删除仓库 - * - * @param id 仓库主键 - * @return 结果 - */ - public int deleteBizCustomerWarehouseById(Long id); - - /** - * 批量删除仓库 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBizCustomerWarehouseByIds(Long[] ids); -} +@Mapper +public interface BizCustomerWarehouseMapper extends BaseMapper +{ } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizDriverMapper.java b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizDriverMapper.java index 342a945..dd54535 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizDriverMapper.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizDriverMapper.java @@ -1,7 +1,10 @@ package com.cpxt.biz.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cpxt.biz.domain.BizDriver; +import org.apache.ibatis.annotations.Mapper; /** * 司机Mapper接口 @@ -9,53 +12,6 @@ import com.cpxt.biz.domain.BizDriver; * @author YIN * @date 2024-12-16 */ -public interface BizDriverMapper -{ - /** - * 查询司机 - * - * @param id 司机主键 - * @return 司机 - */ - public BizDriver selectBizDriverById(Long id); - - /** - * 查询司机列表 - * - * @param bizDriver 司机 - * @return 司机集合 - */ - public List selectBizDriverList(BizDriver bizDriver); - - /** - * 新增司机 - * - * @param bizDriver 司机 - * @return 结果 - */ - public int insertBizDriver(BizDriver bizDriver); - - /** - * 修改司机 - * - * @param bizDriver 司机 - * @return 结果 - */ - public int updateBizDriver(BizDriver bizDriver); - - /** - * 删除司机 - * - * @param id 司机主键 - * @return 结果 - */ - public int deleteBizDriverById(Long id); - - /** - * 批量删除司机 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBizDriverByIds(Long[] ids); -} +@Mapper +public interface BizDriverMapper extends BaseMapper +{ } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizOrderMapper.java b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizOrderMapper.java index 79fa598..c33d49c 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizOrderMapper.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizOrderMapper.java @@ -1,7 +1,10 @@ package com.cpxt.biz.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cpxt.biz.domain.BizOrder; +import org.apache.ibatis.annotations.Mapper; /** * 订单Mapper接口 @@ -9,53 +12,6 @@ import com.cpxt.biz.domain.BizOrder; * @author YIN * @date 2024-12-16 */ -public interface BizOrderMapper -{ - /** - * 查询订单 - * - * @param id 订单主键 - * @return 订单 - */ - public BizOrder selectBizOrderById(Long id); - - /** - * 查询订单列表 - * - * @param bizOrder 订单 - * @return 订单集合 - */ - public List selectBizOrderList(BizOrder bizOrder); - - /** - * 新增订单 - * - * @param bizOrder 订单 - * @return 结果 - */ - public int insertBizOrder(BizOrder bizOrder); - - /** - * 修改订单 - * - * @param bizOrder 订单 - * @return 结果 - */ - public int updateBizOrder(BizOrder bizOrder); - - /** - * 删除订单 - * - * @param id 订单主键 - * @return 结果 - */ - public int deleteBizOrderById(Long id); - - /** - * 批量删除订单 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBizOrderByIds(Long[] ids); -} +@Mapper +public interface BizOrderMapper extends BaseMapper +{ } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizOrderSubMapper.java b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizOrderSubMapper.java index 7d0ca7f..d83393e 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizOrderSubMapper.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/mapper/BizOrderSubMapper.java @@ -1,7 +1,10 @@ package com.cpxt.biz.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cpxt.biz.domain.BizOrderSub; +import org.apache.ibatis.annotations.Mapper; /** * 订单子单Mapper接口 @@ -9,53 +12,6 @@ import com.cpxt.biz.domain.BizOrderSub; * @author YIN * @date 2024-12-16 */ -public interface BizOrderSubMapper -{ - /** - * 查询订单子单 - * - * @param id 订单子单主键 - * @return 订单子单 - */ - public BizOrderSub selectBizOrderSubById(Long id); - - /** - * 查询订单子单列表 - * - * @param bizOrderSub 订单子单 - * @return 订单子单集合 - */ - public List selectBizOrderSubList(BizOrderSub bizOrderSub); - - /** - * 新增订单子单 - * - * @param bizOrderSub 订单子单 - * @return 结果 - */ - public int insertBizOrderSub(BizOrderSub bizOrderSub); - - /** - * 修改订单子单 - * - * @param bizOrderSub 订单子单 - * @return 结果 - */ - public int updateBizOrderSub(BizOrderSub bizOrderSub); - - /** - * 删除订单子单 - * - * @param id 订单子单主键 - * @return 结果 - */ - public int deleteBizOrderSubById(Long id); - - /** - * 批量删除订单子单 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBizOrderSubByIds(Long[] ids); -} +@Mapper +public interface BizOrderSubMapper extends BaseMapper +{ } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarModelServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarModelServiceImpl.java index 951c75d..742a0ec 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarModelServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarModelServiceImpl.java @@ -1,6 +1,9 @@ package com.cpxt.biz.service.impl; +import java.util.Arrays; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,7 +32,7 @@ public class BizCarModelServiceImpl implements IBizCarModelService @Override public BizCarModel selectBizCarModelById(Long id) { - return bizCarModelMapper.selectBizCarModelById(id); + return bizCarModelMapper.selectById(id); } /** @@ -41,7 +44,9 @@ public class BizCarModelServiceImpl implements IBizCarModelService @Override public List selectBizCarModelList(BizCarModel bizCarModel) { - return bizCarModelMapper.selectBizCarModelList(bizCarModel); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + return bizCarModelMapper.selectList(queryWrapper); } /** @@ -53,8 +58,7 @@ public class BizCarModelServiceImpl implements IBizCarModelService @Override public int insertBizCarModel(BizCarModel bizCarModel) { - bizCarModel.setCreateTime(DateUtils.getNowDate()); - return bizCarModelMapper.insertBizCarModel(bizCarModel); + return bizCarModelMapper.insert(bizCarModel); } /** @@ -66,8 +70,7 @@ public class BizCarModelServiceImpl implements IBizCarModelService @Override public int updateBizCarModel(BizCarModel bizCarModel) { - bizCarModel.setUpdateTime(DateUtils.getNowDate()); - return bizCarModelMapper.updateBizCarModel(bizCarModel); + return bizCarModelMapper.updateById(bizCarModel); } /** @@ -79,7 +82,7 @@ public class BizCarModelServiceImpl implements IBizCarModelService @Override public int deleteBizCarModelByIds(Long[] ids) { - return bizCarModelMapper.deleteBizCarModelByIds(ids); + return bizCarModelMapper.deleteBatchIds(Arrays.asList(ids)); } /** @@ -91,6 +94,6 @@ public class BizCarModelServiceImpl implements IBizCarModelService @Override public int deleteBizCarModelById(Long id) { - return bizCarModelMapper.deleteBizCarModelById(id); + return bizCarModelMapper.deleteById(id); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarServiceImpl.java index 5cdb76d..c84cc59 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCarServiceImpl.java @@ -1,6 +1,9 @@ package com.cpxt.biz.service.impl; +import java.util.Arrays; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,7 +32,7 @@ public class BizCarServiceImpl implements IBizCarService @Override public BizCar selectBizCarById(Long id) { - return bizCarMapper.selectBizCarById(id); + return bizCarMapper.selectById(id); } /** @@ -41,7 +44,9 @@ public class BizCarServiceImpl implements IBizCarService @Override public List selectBizCarList(BizCar bizCar) { - return bizCarMapper.selectBizCarList(bizCar); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + return bizCarMapper.selectList(queryWrapper); } /** @@ -53,8 +58,7 @@ public class BizCarServiceImpl implements IBizCarService @Override public int insertBizCar(BizCar bizCar) { - bizCar.setCreateTime(DateUtils.getNowDate()); - return bizCarMapper.insertBizCar(bizCar); + return bizCarMapper.insert(bizCar); } /** @@ -66,8 +70,7 @@ public class BizCarServiceImpl implements IBizCarService @Override public int updateBizCar(BizCar bizCar) { - bizCar.setUpdateTime(DateUtils.getNowDate()); - return bizCarMapper.updateBizCar(bizCar); + return bizCarMapper.updateById(bizCar); } /** @@ -79,7 +82,7 @@ public class BizCarServiceImpl implements IBizCarService @Override public int deleteBizCarByIds(Long[] ids) { - return bizCarMapper.deleteBizCarByIds(ids); + return bizCarMapper.deleteBatchIds(Arrays.asList(ids)); } /** @@ -91,6 +94,6 @@ public class BizCarServiceImpl implements IBizCarService @Override public int deleteBizCarById(Long id) { - return bizCarMapper.deleteBizCarById(id); + return bizCarMapper.deleteById(id); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerRouteServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerRouteServiceImpl.java index 263d7ea..c46b484 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerRouteServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerRouteServiceImpl.java @@ -1,6 +1,9 @@ package com.cpxt.biz.service.impl; +import java.util.Arrays; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,7 +32,7 @@ public class BizCustomerRouteServiceImpl implements IBizCustomerRouteService @Override public BizCustomerRoute selectBizCustomerRouteById(Long id) { - return bizCustomerRouteMapper.selectBizCustomerRouteById(id); + return bizCustomerRouteMapper.selectById(id); } /** @@ -41,7 +44,9 @@ public class BizCustomerRouteServiceImpl implements IBizCustomerRouteService @Override public List selectBizCustomerRouteList(BizCustomerRoute bizCustomerRoute) { - return bizCustomerRouteMapper.selectBizCustomerRouteList(bizCustomerRoute); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + return bizCustomerRouteMapper.selectList(queryWrapper); } /** @@ -53,8 +58,7 @@ public class BizCustomerRouteServiceImpl implements IBizCustomerRouteService @Override public int insertBizCustomerRoute(BizCustomerRoute bizCustomerRoute) { - bizCustomerRoute.setCreateTime(DateUtils.getNowDate()); - return bizCustomerRouteMapper.insertBizCustomerRoute(bizCustomerRoute); + return bizCustomerRouteMapper.insert(bizCustomerRoute); } /** @@ -66,8 +70,7 @@ public class BizCustomerRouteServiceImpl implements IBizCustomerRouteService @Override public int updateBizCustomerRoute(BizCustomerRoute bizCustomerRoute) { - bizCustomerRoute.setUpdateTime(DateUtils.getNowDate()); - return bizCustomerRouteMapper.updateBizCustomerRoute(bizCustomerRoute); + return bizCustomerRouteMapper.updateById(bizCustomerRoute); } /** @@ -79,7 +82,7 @@ public class BizCustomerRouteServiceImpl implements IBizCustomerRouteService @Override public int deleteBizCustomerRouteByIds(Long[] ids) { - return bizCustomerRouteMapper.deleteBizCustomerRouteByIds(ids); + return bizCustomerRouteMapper.deleteBatchIds(Arrays.asList(ids)); } /** @@ -91,6 +94,6 @@ public class BizCustomerRouteServiceImpl implements IBizCustomerRouteService @Override public int deleteBizCustomerRouteById(Long id) { - return bizCustomerRouteMapper.deleteBizCustomerRouteById(id); + return bizCustomerRouteMapper.deleteById(id); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerRouteShopServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerRouteShopServiceImpl.java index ea686a0..06f4a92 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerRouteShopServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerRouteShopServiceImpl.java @@ -1,6 +1,10 @@ package com.cpxt.biz.service.impl; +import java.lang.invoke.LambdaConversionException; +import java.util.Arrays; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.cpxt.biz.mapper.BizCustomerRouteShopMapper; @@ -28,7 +32,7 @@ public class BizCustomerRouteShopServiceImpl implements IBizCustomerRouteShopSer @Override public BizCustomerRouteShop selectBizCustomerRouteShopById(Long id) { - return bizCustomerRouteShopMapper.selectBizCustomerRouteShopById(id); + return bizCustomerRouteShopMapper.selectById(id); } /** @@ -40,7 +44,8 @@ public class BizCustomerRouteShopServiceImpl implements IBizCustomerRouteShopSer @Override public List selectBizCustomerRouteShopList(BizCustomerRouteShop bizCustomerRouteShop) { - return bizCustomerRouteShopMapper.selectBizCustomerRouteShopList(bizCustomerRouteShop); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + return bizCustomerRouteShopMapper.selectList(queryWrapper); } /** @@ -52,7 +57,7 @@ public class BizCustomerRouteShopServiceImpl implements IBizCustomerRouteShopSer @Override public int insertBizCustomerRouteShop(BizCustomerRouteShop bizCustomerRouteShop) { - return bizCustomerRouteShopMapper.insertBizCustomerRouteShop(bizCustomerRouteShop); + return bizCustomerRouteShopMapper.insert(bizCustomerRouteShop); } /** @@ -64,7 +69,7 @@ public class BizCustomerRouteShopServiceImpl implements IBizCustomerRouteShopSer @Override public int updateBizCustomerRouteShop(BizCustomerRouteShop bizCustomerRouteShop) { - return bizCustomerRouteShopMapper.updateBizCustomerRouteShop(bizCustomerRouteShop); + return bizCustomerRouteShopMapper.updateById(bizCustomerRouteShop); } /** @@ -76,7 +81,7 @@ public class BizCustomerRouteShopServiceImpl implements IBizCustomerRouteShopSer @Override public int deleteBizCustomerRouteShopByIds(Long[] ids) { - return bizCustomerRouteShopMapper.deleteBizCustomerRouteShopByIds(ids); + return bizCustomerRouteShopMapper.deleteBatchIds(Arrays.asList(ids)); } /** @@ -88,6 +93,6 @@ public class BizCustomerRouteShopServiceImpl implements IBizCustomerRouteShopSer @Override public int deleteBizCustomerRouteShopById(Long id) { - return bizCustomerRouteShopMapper.deleteBizCustomerRouteShopById(id); + return bizCustomerRouteShopMapper.deleteById(id); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerServiceImpl.java index 64eeb5c..ef22d95 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerServiceImpl.java @@ -1,6 +1,9 @@ package com.cpxt.biz.service.impl; +import java.util.Arrays; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,7 +32,7 @@ public class BizCustomerServiceImpl implements IBizCustomerService @Override public BizCustomer selectBizCustomerById(Long id) { - return bizCustomerMapper.selectBizCustomerById(id); + return bizCustomerMapper.selectById(id); } /** @@ -41,7 +44,9 @@ public class BizCustomerServiceImpl implements IBizCustomerService @Override public List selectBizCustomerList(BizCustomer bizCustomer) { - return bizCustomerMapper.selectBizCustomerList(bizCustomer); + LambdaQueryWrapper queryWrapper= new LambdaQueryWrapper<>(); + + return bizCustomerMapper.selectList(queryWrapper); } /** @@ -53,8 +58,7 @@ public class BizCustomerServiceImpl implements IBizCustomerService @Override public int insertBizCustomer(BizCustomer bizCustomer) { - bizCustomer.setCreateTime(DateUtils.getNowDate()); - return bizCustomerMapper.insertBizCustomer(bizCustomer); + return bizCustomerMapper.insert(bizCustomer); } /** @@ -66,8 +70,7 @@ public class BizCustomerServiceImpl implements IBizCustomerService @Override public int updateBizCustomer(BizCustomer bizCustomer) { - bizCustomer.setUpdateTime(DateUtils.getNowDate()); - return bizCustomerMapper.updateBizCustomer(bizCustomer); + return bizCustomerMapper.updateById(bizCustomer); } /** @@ -79,7 +82,7 @@ public class BizCustomerServiceImpl implements IBizCustomerService @Override public int deleteBizCustomerByIds(Long[] ids) { - return bizCustomerMapper.deleteBizCustomerByIds(ids); + return bizCustomerMapper.deleteBatchIds(Arrays.asList(ids)); } /** @@ -91,6 +94,6 @@ public class BizCustomerServiceImpl implements IBizCustomerService @Override public int deleteBizCustomerById(Long id) { - return bizCustomerMapper.deleteBizCustomerById(id); + return bizCustomerMapper.deleteById(id); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerShopServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerShopServiceImpl.java index 3be3570..ff3e182 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerShopServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerShopServiceImpl.java @@ -1,6 +1,9 @@ package com.cpxt.biz.service.impl; +import java.util.Arrays; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,7 +32,7 @@ public class BizCustomerShopServiceImpl implements IBizCustomerShopService @Override public BizCustomerShop selectBizCustomerShopById(Long id) { - return bizCustomerShopMapper.selectBizCustomerShopById(id); + return bizCustomerShopMapper.selectById(id); } /** @@ -41,7 +44,8 @@ public class BizCustomerShopServiceImpl implements IBizCustomerShopService @Override public List selectBizCustomerShopList(BizCustomerShop bizCustomerShop) { - return bizCustomerShopMapper.selectBizCustomerShopList(bizCustomerShop); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + return bizCustomerShopMapper.selectList(queryWrapper); } /** @@ -53,8 +57,7 @@ public class BizCustomerShopServiceImpl implements IBizCustomerShopService @Override public int insertBizCustomerShop(BizCustomerShop bizCustomerShop) { - bizCustomerShop.setCreateTime(DateUtils.getNowDate()); - return bizCustomerShopMapper.insertBizCustomerShop(bizCustomerShop); + return bizCustomerShopMapper.insert(bizCustomerShop); } /** @@ -66,8 +69,7 @@ public class BizCustomerShopServiceImpl implements IBizCustomerShopService @Override public int updateBizCustomerShop(BizCustomerShop bizCustomerShop) { - bizCustomerShop.setUpdateTime(DateUtils.getNowDate()); - return bizCustomerShopMapper.updateBizCustomerShop(bizCustomerShop); + return bizCustomerShopMapper.updateById(bizCustomerShop); } /** @@ -79,7 +81,7 @@ public class BizCustomerShopServiceImpl implements IBizCustomerShopService @Override public int deleteBizCustomerShopByIds(Long[] ids) { - return bizCustomerShopMapper.deleteBizCustomerShopByIds(ids); + return bizCustomerShopMapper.deleteBatchIds(Arrays.asList(ids)); } /** @@ -91,6 +93,6 @@ public class BizCustomerShopServiceImpl implements IBizCustomerShopService @Override public int deleteBizCustomerShopById(Long id) { - return bizCustomerShopMapper.deleteBizCustomerShopById(id); + return bizCustomerShopMapper.deleteById(id); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerUserServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerUserServiceImpl.java index 9cb551a..69037ef 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerUserServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerUserServiceImpl.java @@ -1,7 +1,9 @@ package com.cpxt.biz.service.impl; +import java.util.Arrays; import java.util.List; -import com.cpxt.common.utils.DateUtils; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.cpxt.biz.mapper.BizCustomerUserMapper; @@ -29,7 +31,7 @@ public class BizCustomerUserServiceImpl implements IBizCustomerUserService @Override public BizCustomerUser selectBizCustomerUserById(Long id) { - return bizCustomerUserMapper.selectBizCustomerUserById(id); + return bizCustomerUserMapper.selectById(id); } /** @@ -41,7 +43,8 @@ public class BizCustomerUserServiceImpl implements IBizCustomerUserService @Override public List selectBizCustomerUserList(BizCustomerUser bizCustomerUser) { - return bizCustomerUserMapper.selectBizCustomerUserList(bizCustomerUser); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + return bizCustomerUserMapper.selectList(queryWrapper); } /** @@ -53,8 +56,7 @@ public class BizCustomerUserServiceImpl implements IBizCustomerUserService @Override public int insertBizCustomerUser(BizCustomerUser bizCustomerUser) { - bizCustomerUser.setCreateTime(DateUtils.getNowDate()); - return bizCustomerUserMapper.insertBizCustomerUser(bizCustomerUser); + return bizCustomerUserMapper.insert(bizCustomerUser); } /** @@ -66,8 +68,7 @@ public class BizCustomerUserServiceImpl implements IBizCustomerUserService @Override public int updateBizCustomerUser(BizCustomerUser bizCustomerUser) { - bizCustomerUser.setUpdateTime(DateUtils.getNowDate()); - return bizCustomerUserMapper.updateBizCustomerUser(bizCustomerUser); + return bizCustomerUserMapper.updateById(bizCustomerUser); } /** @@ -79,7 +80,7 @@ public class BizCustomerUserServiceImpl implements IBizCustomerUserService @Override public int deleteBizCustomerUserByIds(Long[] ids) { - return bizCustomerUserMapper.deleteBizCustomerUserByIds(ids); + return bizCustomerUserMapper.deleteBatchIds(Arrays.asList(ids)); } /** @@ -91,6 +92,6 @@ public class BizCustomerUserServiceImpl implements IBizCustomerUserService @Override public int deleteBizCustomerUserById(Long id) { - return bizCustomerUserMapper.deleteBizCustomerUserById(id); + return bizCustomerUserMapper.deleteById(id); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerWarehouseServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerWarehouseServiceImpl.java index fa4739b..db4f048 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerWarehouseServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizCustomerWarehouseServiceImpl.java @@ -1,6 +1,9 @@ package com.cpxt.biz.service.impl; +import java.util.Arrays; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,7 +32,7 @@ public class BizCustomerWarehouseServiceImpl implements IBizCustomerWarehouseSer @Override public BizCustomerWarehouse selectBizCustomerWarehouseById(Long id) { - return bizCustomerWarehouseMapper.selectBizCustomerWarehouseById(id); + return bizCustomerWarehouseMapper.selectById(id); } /** @@ -41,7 +44,9 @@ public class BizCustomerWarehouseServiceImpl implements IBizCustomerWarehouseSer @Override public List selectBizCustomerWarehouseList(BizCustomerWarehouse bizCustomerWarehouse) { - return bizCustomerWarehouseMapper.selectBizCustomerWarehouseList(bizCustomerWarehouse); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + return bizCustomerWarehouseMapper.selectList(queryWrapper); } /** @@ -53,8 +58,7 @@ public class BizCustomerWarehouseServiceImpl implements IBizCustomerWarehouseSer @Override public int insertBizCustomerWarehouse(BizCustomerWarehouse bizCustomerWarehouse) { - bizCustomerWarehouse.setCreateTime(DateUtils.getNowDate()); - return bizCustomerWarehouseMapper.insertBizCustomerWarehouse(bizCustomerWarehouse); + return bizCustomerWarehouseMapper.insert(bizCustomerWarehouse); } /** @@ -66,8 +70,7 @@ public class BizCustomerWarehouseServiceImpl implements IBizCustomerWarehouseSer @Override public int updateBizCustomerWarehouse(BizCustomerWarehouse bizCustomerWarehouse) { - bizCustomerWarehouse.setUpdateTime(DateUtils.getNowDate()); - return bizCustomerWarehouseMapper.updateBizCustomerWarehouse(bizCustomerWarehouse); + return bizCustomerWarehouseMapper.updateById(bizCustomerWarehouse); } /** @@ -79,7 +82,7 @@ public class BizCustomerWarehouseServiceImpl implements IBizCustomerWarehouseSer @Override public int deleteBizCustomerWarehouseByIds(Long[] ids) { - return bizCustomerWarehouseMapper.deleteBizCustomerWarehouseByIds(ids); + return bizCustomerWarehouseMapper.deleteBatchIds(Arrays.asList(ids)); } /** @@ -91,6 +94,6 @@ public class BizCustomerWarehouseServiceImpl implements IBizCustomerWarehouseSer @Override public int deleteBizCustomerWarehouseById(Long id) { - return bizCustomerWarehouseMapper.deleteBizCustomerWarehouseById(id); + return bizCustomerWarehouseMapper.deleteById(id); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizDriverServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizDriverServiceImpl.java index 02a09da..2d17f62 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizDriverServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizDriverServiceImpl.java @@ -1,6 +1,9 @@ package com.cpxt.biz.service.impl; +import java.util.Arrays; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cpxt.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,7 +32,7 @@ public class BizDriverServiceImpl implements IBizDriverService @Override public BizDriver selectBizDriverById(Long id) { - return bizDriverMapper.selectBizDriverById(id); + return bizDriverMapper.selectById(id); } /** @@ -41,7 +44,9 @@ public class BizDriverServiceImpl implements IBizDriverService @Override public List selectBizDriverList(BizDriver bizDriver) { - return bizDriverMapper.selectBizDriverList(bizDriver); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + return bizDriverMapper.selectList(queryWrapper); } /** @@ -53,8 +58,7 @@ public class BizDriverServiceImpl implements IBizDriverService @Override public int insertBizDriver(BizDriver bizDriver) { - bizDriver.setCreateTime(DateUtils.getNowDate()); - return bizDriverMapper.insertBizDriver(bizDriver); + return bizDriverMapper.insert(bizDriver); } /** @@ -66,8 +70,7 @@ public class BizDriverServiceImpl implements IBizDriverService @Override public int updateBizDriver(BizDriver bizDriver) { - bizDriver.setUpdateTime(DateUtils.getNowDate()); - return bizDriverMapper.updateBizDriver(bizDriver); + return bizDriverMapper.updateById(bizDriver); } /** @@ -79,7 +82,7 @@ public class BizDriverServiceImpl implements IBizDriverService @Override public int deleteBizDriverByIds(Long[] ids) { - return bizDriverMapper.deleteBizDriverByIds(ids); + return bizDriverMapper.deleteBatchIds(Arrays.asList(ids)); } /** @@ -91,6 +94,6 @@ public class BizDriverServiceImpl implements IBizDriverService @Override public int deleteBizDriverById(Long id) { - return bizDriverMapper.deleteBizDriverById(id); + return bizDriverMapper.deleteById(id); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java index e62f927..bf19668 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderServiceImpl.java @@ -1,6 +1,9 @@ package com.cpxt.biz.service.impl; +import java.util.Arrays; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.cpxt.biz.mapper.BizOrderMapper; @@ -28,7 +31,7 @@ public class BizOrderServiceImpl implements IBizOrderService @Override public BizOrder selectBizOrderById(Long id) { - return bizOrderMapper.selectBizOrderById(id); + return bizOrderMapper.selectById(id); } /** @@ -40,7 +43,9 @@ public class BizOrderServiceImpl implements IBizOrderService @Override public List selectBizOrderList(BizOrder bizOrder) { - return bizOrderMapper.selectBizOrderList(bizOrder); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + return bizOrderMapper.selectList(queryWrapper); } /** @@ -52,7 +57,7 @@ public class BizOrderServiceImpl implements IBizOrderService @Override public int insertBizOrder(BizOrder bizOrder) { - return bizOrderMapper.insertBizOrder(bizOrder); + return bizOrderMapper.insert(bizOrder); } /** @@ -64,7 +69,7 @@ public class BizOrderServiceImpl implements IBizOrderService @Override public int updateBizOrder(BizOrder bizOrder) { - return bizOrderMapper.updateBizOrder(bizOrder); + return bizOrderMapper.updateById(bizOrder); } /** @@ -76,7 +81,7 @@ public class BizOrderServiceImpl implements IBizOrderService @Override public int deleteBizOrderByIds(Long[] ids) { - return bizOrderMapper.deleteBizOrderByIds(ids); + return bizOrderMapper.deleteBatchIds(Arrays.asList(ids)); } /** @@ -88,6 +93,6 @@ public class BizOrderServiceImpl implements IBizOrderService @Override public int deleteBizOrderById(Long id) { - return bizOrderMapper.deleteBizOrderById(id); + return bizOrderMapper.deleteById(id); } } diff --git a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderSubServiceImpl.java b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderSubServiceImpl.java index a3777ee..c7f72f2 100644 --- a/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderSubServiceImpl.java +++ b/cpxt-system/src/main/java/com/cpxt/biz/service/impl/BizOrderSubServiceImpl.java @@ -1,6 +1,10 @@ package com.cpxt.biz.service.impl; +import java.awt.*; +import java.util.Arrays; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.cpxt.biz.mapper.BizOrderSubMapper; @@ -28,7 +32,7 @@ public class BizOrderSubServiceImpl implements IBizOrderSubService @Override public BizOrderSub selectBizOrderSubById(Long id) { - return bizOrderSubMapper.selectBizOrderSubById(id); + return bizOrderSubMapper.selectById(id); } /** @@ -40,7 +44,9 @@ public class BizOrderSubServiceImpl implements IBizOrderSubService @Override public List selectBizOrderSubList(BizOrderSub bizOrderSub) { - return bizOrderSubMapper.selectBizOrderSubList(bizOrderSub); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + return bizOrderSubMapper.selectList(queryWrapper); } /** @@ -52,7 +58,7 @@ public class BizOrderSubServiceImpl implements IBizOrderSubService @Override public int insertBizOrderSub(BizOrderSub bizOrderSub) { - return bizOrderSubMapper.insertBizOrderSub(bizOrderSub); + return bizOrderSubMapper.insert(bizOrderSub); } /** @@ -64,7 +70,7 @@ public class BizOrderSubServiceImpl implements IBizOrderSubService @Override public int updateBizOrderSub(BizOrderSub bizOrderSub) { - return bizOrderSubMapper.updateBizOrderSub(bizOrderSub); + return bizOrderSubMapper.updateById(bizOrderSub); } /** @@ -76,7 +82,7 @@ public class BizOrderSubServiceImpl implements IBizOrderSubService @Override public int deleteBizOrderSubByIds(Long[] ids) { - return bizOrderSubMapper.deleteBizOrderSubByIds(ids); + return bizOrderSubMapper.deleteBatchIds(Arrays.asList(ids)); } /** @@ -88,6 +94,6 @@ public class BizOrderSubServiceImpl implements IBizOrderSubService @Override public int deleteBizOrderSubById(Long id) { - return bizOrderSubMapper.deleteBizOrderSubById(id); + return bizOrderSubMapper.deleteById(id); } } diff --git a/cpxt-system/src/main/resources/mapper/biz/BizCarMapper.xml b/cpxt-system/src/main/resources/mapper/biz/BizCarMapper.xml deleted file mode 100644 index bcaf0d4..0000000 --- a/cpxt-system/src/main/resources/mapper/biz/BizCarMapper.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - select id, model_id, model_name, car_type, car_no, vin, serial_no, status, create_time, update_time, remark from biz_car - - - - - - - - insert into biz_car - - model_id, - model_name, - car_type, - car_no, - vin, - serial_no, - status, - create_time, - update_time, - remark, - - - #{modelId}, - #{modelName}, - #{carType}, - #{carNo}, - #{vin}, - #{serialNo}, - #{status}, - #{createTime}, - #{updateTime}, - #{remark}, - - - - - update biz_car - - model_id = #{modelId}, - model_name = #{modelName}, - car_type = #{carType}, - car_no = #{carNo}, - vin = #{vin}, - serial_no = #{serialNo}, - status = #{status}, - create_time = #{createTime}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from biz_car where id = #{id} - - - - delete from biz_car where id in - - #{id} - - - \ No newline at end of file diff --git a/cpxt-system/src/main/resources/mapper/biz/BizCarModelMapper.xml b/cpxt-system/src/main/resources/mapper/biz/BizCarModelMapper.xml deleted file mode 100644 index 7343c15..0000000 --- a/cpxt-system/src/main/resources/mapper/biz/BizCarModelMapper.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - select id, name, brand, weight, volume, length, width, height, status, create_time, update_time, remark from biz_car_model - - - - - - - - insert into biz_car_model - - name, - brand, - weight, - volume, - length, - width, - height, - status, - create_time, - update_time, - remark, - - - #{name}, - #{brand}, - #{weight}, - #{volume}, - #{length}, - #{width}, - #{height}, - #{status}, - #{createTime}, - #{updateTime}, - #{remark}, - - - - - update biz_car_model - - name = #{name}, - brand = #{brand}, - weight = #{weight}, - volume = #{volume}, - length = #{length}, - width = #{width}, - height = #{height}, - status = #{status}, - create_time = #{createTime}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from biz_car_model where id = #{id} - - - - delete from biz_car_model where id in - - #{id} - - - \ No newline at end of file diff --git a/cpxt-system/src/main/resources/mapper/biz/BizCustomerMapper.xml b/cpxt-system/src/main/resources/mapper/biz/BizCustomerMapper.xml deleted file mode 100644 index ac2c934..0000000 --- a/cpxt-system/src/main/resources/mapper/biz/BizCustomerMapper.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - select id, name, full_name, linkman, linkphone, level, status, create_time, update_time, remark from biz_customer - - - - - - - - insert into biz_customer - - name, - full_name, - linkman, - linkphone, - level, - status, - create_time, - update_time, - remark, - - - #{name}, - #{fullName}, - #{linkman}, - #{linkphone}, - #{level}, - #{status}, - #{createTime}, - #{updateTime}, - #{remark}, - - - - - update biz_customer - - name = #{name}, - full_name = #{fullName}, - linkman = #{linkman}, - linkphone = #{linkphone}, - level = #{level}, - status = #{status}, - create_time = #{createTime}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from biz_customer where id = #{id} - - - - delete from biz_customer where id in - - #{id} - - - \ No newline at end of file diff --git a/cpxt-system/src/main/resources/mapper/biz/BizCustomerRouteMapper.xml b/cpxt-system/src/main/resources/mapper/biz/BizCustomerRouteMapper.xml deleted file mode 100644 index 4109535..0000000 --- a/cpxt-system/src/main/resources/mapper/biz/BizCustomerRouteMapper.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - select id, customer_id, customer_name, name, status, create_time, update_time, remark from biz_customer_route - - - - - - - - insert into biz_customer_route - - customer_id, - customer_name, - name, - status, - create_time, - update_time, - remark, - - - #{customerId}, - #{customerName}, - #{name}, - #{status}, - #{createTime}, - #{updateTime}, - #{remark}, - - - - - update biz_customer_route - - customer_id = #{customerId}, - customer_name = #{customerName}, - name = #{name}, - status = #{status}, - create_time = #{createTime}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from biz_customer_route where id = #{id} - - - - delete from biz_customer_route where id in - - #{id} - - - \ No newline at end of file diff --git a/cpxt-system/src/main/resources/mapper/biz/BizCustomerRouteShopMapper.xml b/cpxt-system/src/main/resources/mapper/biz/BizCustomerRouteShopMapper.xml deleted file mode 100644 index b848a90..0000000 --- a/cpxt-system/src/main/resources/mapper/biz/BizCustomerRouteShopMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - select id, route_id, shop_id, sort from biz_customer_route_shop - - - - - - - - insert into biz_customer_route_shop - - route_id, - shop_id, - sort, - - - #{routeId}, - #{shopId}, - #{sort}, - - - - - update biz_customer_route_shop - - route_id = #{routeId}, - shop_id = #{shopId}, - sort = #{sort}, - - where id = #{id} - - - - delete from biz_customer_route_shop where id = #{id} - - - - delete from biz_customer_route_shop where id in - - #{id} - - - \ No newline at end of file diff --git a/cpxt-system/src/main/resources/mapper/biz/BizCustomerShopMapper.xml b/cpxt-system/src/main/resources/mapper/biz/BizCustomerShopMapper.xml deleted file mode 100644 index fbb3ca9..0000000 --- a/cpxt-system/src/main/resources/mapper/biz/BizCustomerShopMapper.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - select id, customer_id, customer_name, name, linkman, linkphone, address, lng, lat, status, create_time, update_time, remark from biz_customer_shop - - - - - - - - insert into biz_customer_shop - - customer_id, - customer_name, - name, - linkman, - linkphone, - address, - lng, - lat, - status, - create_time, - update_time, - remark, - - - #{customerId}, - #{customerName}, - #{name}, - #{linkman}, - #{linkphone}, - #{address}, - #{lng}, - #{lat}, - #{status}, - #{createTime}, - #{updateTime}, - #{remark}, - - - - - update biz_customer_shop - - customer_id = #{customerId}, - customer_name = #{customerName}, - name = #{name}, - linkman = #{linkman}, - linkphone = #{linkphone}, - address = #{address}, - lng = #{lng}, - lat = #{lat}, - status = #{status}, - create_time = #{createTime}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from biz_customer_shop where id = #{id} - - - - delete from biz_customer_shop where id in - - #{id} - - - \ No newline at end of file diff --git a/cpxt-system/src/main/resources/mapper/biz/BizCustomerUserMapper.xml b/cpxt-system/src/main/resources/mapper/biz/BizCustomerUserMapper.xml deleted file mode 100644 index ec7d21d..0000000 --- a/cpxt-system/src/main/resources/mapper/biz/BizCustomerUserMapper.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - select id, customer_id, customer_name, username, status, create_time, update_time, remark from biz_customer_user - - - - - - - - insert into biz_customer_user - - customer_id, - customer_name, - username, - status, - create_time, - update_time, - remark, - - - #{customerId}, - #{customerName}, - #{username}, - #{status}, - #{createTime}, - #{updateTime}, - #{remark}, - - - - - update biz_customer_user - - customer_id = #{customerId}, - customer_name = #{customerName}, - username = #{username}, - status = #{status}, - create_time = #{createTime}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from biz_customer_user where id = #{id} - - - - delete from biz_customer_user where id in - - #{id} - - - \ No newline at end of file diff --git a/cpxt-system/src/main/resources/mapper/biz/BizCustomerWarehouseMapper.xml b/cpxt-system/src/main/resources/mapper/biz/BizCustomerWarehouseMapper.xml deleted file mode 100644 index 11e0fb2..0000000 --- a/cpxt-system/src/main/resources/mapper/biz/BizCustomerWarehouseMapper.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - select id, customer_id, customer_name, name, linkman, linkphone, address, lng, lat, status, create_time, update_time, remark from biz_customer_warehouse - - - - - - - - insert into biz_customer_warehouse - - customer_id, - customer_name, - name, - linkman, - linkphone, - address, - lng, - lat, - status, - create_time, - update_time, - remark, - - - #{customerId}, - #{customerName}, - #{name}, - #{linkman}, - #{linkphone}, - #{address}, - #{lng}, - #{lat}, - #{status}, - #{createTime}, - #{updateTime}, - #{remark}, - - - - - update biz_customer_warehouse - - customer_id = #{customerId}, - customer_name = #{customerName}, - name = #{name}, - linkman = #{linkman}, - linkphone = #{linkphone}, - address = #{address}, - lng = #{lng}, - lat = #{lat}, - status = #{status}, - create_time = #{createTime}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from biz_customer_warehouse where id = #{id} - - - - delete from biz_customer_warehouse where id in - - #{id} - - - \ No newline at end of file diff --git a/cpxt-system/src/main/resources/mapper/biz/BizDriverMapper.xml b/cpxt-system/src/main/resources/mapper/biz/BizDriverMapper.xml deleted file mode 100644 index 3dfd022..0000000 --- a/cpxt-system/src/main/resources/mapper/biz/BizDriverMapper.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - select id, dept_id, user_id, name, idcard, gender, phone, photo, idcard_photo_face, idcard_photo_ne, default_car_id, default_car_no, status, create_time, update_time, remark from biz_driver - - - - - - - - insert into biz_driver - - dept_id, - user_id, - name, - idcard, - gender, - phone, - photo, - idcard_photo_face, - idcard_photo_ne, - default_car_id, - default_car_no, - status, - create_time, - update_time, - remark, - - - #{deptId}, - #{userId}, - #{name}, - #{idcard}, - #{gender}, - #{phone}, - #{photo}, - #{idcardPhotoFace}, - #{idcardPhotoNe}, - #{defaultCarId}, - #{defaultCarNo}, - #{status}, - #{createTime}, - #{updateTime}, - #{remark}, - - - - - update biz_driver - - dept_id = #{deptId}, - user_id = #{userId}, - name = #{name}, - idcard = #{idcard}, - gender = #{gender}, - phone = #{phone}, - photo = #{photo}, - idcard_photo_face = #{idcardPhotoFace}, - idcard_photo_ne = #{idcardPhotoNe}, - default_car_id = #{defaultCarId}, - default_car_no = #{defaultCarNo}, - status = #{status}, - create_time = #{createTime}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - delete from biz_driver where id = #{id} - - - - delete from biz_driver where id in - - #{id} - - - \ No newline at end of file diff --git a/cpxt-system/src/main/resources/mapper/biz/BizOrderMapper.xml b/cpxt-system/src/main/resources/mapper/biz/BizOrderMapper.xml deleted file mode 100644 index b2bbf98..0000000 --- a/cpxt-system/src/main/resources/mapper/biz/BizOrderMapper.xml +++ /dev/null @@ -1,348 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, order_sn, order_status, order_type, customer_id, customer_name, route_id, route_name, warehouse_id, warehouse_name, shop_id, shop_name, car_id, car_no, driver_id, driver_name, copilot_id, copilot_name, sender_name, sender_linkman, sender_phone, sender_address, sender_lng, sender_lat, sender_company, receiver_name, receiver_linkman, receiver_phone, receiver_address, receiver_lng, receiver_lat, receiver_company, goods_type, goods_name, weight, volume, length, width, height, total_quantity, insured, insured_money, insured_fee, order_fee, is_cancel, cancel_reason, cancel_time, pay_type, pay_mode, pay_id, pay_status, pay_time, status, create_time, update_time, remark, start_time, arrive_time, arrive_remark, arrive_lng, arrive_lat from biz_order - - - - - - - - insert into biz_order - - order_sn, - order_status, - order_type, - customer_id, - customer_name, - route_id, - route_name, - warehouse_id, - warehouse_name, - shop_id, - shop_name, - car_id, - car_no, - driver_id, - driver_name, - copilot_id, - copilot_name, - sender_name, - sender_linkman, - sender_phone, - sender_address, - sender_lng, - sender_lat, - sender_company, - receiver_name, - receiver_linkman, - receiver_phone, - receiver_address, - receiver_lng, - receiver_lat, - receiver_company, - goods_type, - goods_name, - weight, - volume, - length, - width, - height, - total_quantity, - insured, - insured_money, - insured_fee, - order_fee, - is_cancel, - cancel_reason, - cancel_time, - pay_type, - pay_mode, - pay_id, - pay_status, - pay_time, - status, - create_time, - update_time, - remark, - start_time, - arrive_time, - arrive_remark, - arrive_lng, - arrive_lat, - - - #{orderSn}, - #{orderStatus}, - #{orderType}, - #{customerId}, - #{customerName}, - #{routeId}, - #{routeName}, - #{warehouseId}, - #{warehouseName}, - #{shopId}, - #{shopName}, - #{carId}, - #{carNo}, - #{driverId}, - #{driverName}, - #{copilotId}, - #{copilotName}, - #{senderName}, - #{senderLinkman}, - #{senderPhone}, - #{senderAddress}, - #{senderLng}, - #{senderLat}, - #{senderCompany}, - #{receiverName}, - #{receiverLinkman}, - #{receiverPhone}, - #{receiverAddress}, - #{receiverLng}, - #{receiverLat}, - #{receiverCompany}, - #{goodsType}, - #{goodsName}, - #{weight}, - #{volume}, - #{length}, - #{width}, - #{height}, - #{totalQuantity}, - #{insured}, - #{insuredMoney}, - #{insuredFee}, - #{orderFee}, - #{isCancel}, - #{cancelReason}, - #{cancelTime}, - #{payType}, - #{payMode}, - #{payId}, - #{payStatus}, - #{payTime}, - #{status}, - #{createTime}, - #{updateTime}, - #{remark}, - #{startTime}, - #{arriveTime}, - #{arriveRemark}, - #{arriveLng}, - #{arriveLat}, - - - - - update biz_order - - order_sn = #{orderSn}, - order_status = #{orderStatus}, - order_type = #{orderType}, - customer_id = #{customerId}, - customer_name = #{customerName}, - route_id = #{routeId}, - route_name = #{routeName}, - warehouse_id = #{warehouseId}, - warehouse_name = #{warehouseName}, - shop_id = #{shopId}, - shop_name = #{shopName}, - car_id = #{carId}, - car_no = #{carNo}, - driver_id = #{driverId}, - driver_name = #{driverName}, - copilot_id = #{copilotId}, - copilot_name = #{copilotName}, - sender_name = #{senderName}, - sender_linkman = #{senderLinkman}, - sender_phone = #{senderPhone}, - sender_address = #{senderAddress}, - sender_lng = #{senderLng}, - sender_lat = #{senderLat}, - sender_company = #{senderCompany}, - receiver_name = #{receiverName}, - receiver_linkman = #{receiverLinkman}, - receiver_phone = #{receiverPhone}, - receiver_address = #{receiverAddress}, - receiver_lng = #{receiverLng}, - receiver_lat = #{receiverLat}, - receiver_company = #{receiverCompany}, - goods_type = #{goodsType}, - goods_name = #{goodsName}, - weight = #{weight}, - volume = #{volume}, - length = #{length}, - width = #{width}, - height = #{height}, - total_quantity = #{totalQuantity}, - insured = #{insured}, - insured_money = #{insuredMoney}, - insured_fee = #{insuredFee}, - order_fee = #{orderFee}, - is_cancel = #{isCancel}, - cancel_reason = #{cancelReason}, - cancel_time = #{cancelTime}, - pay_type = #{payType}, - pay_mode = #{payMode}, - pay_id = #{payId}, - pay_status = #{payStatus}, - pay_time = #{payTime}, - status = #{status}, - create_time = #{createTime}, - update_time = #{updateTime}, - remark = #{remark}, - start_time = #{startTime}, - arrive_time = #{arriveTime}, - arrive_remark = #{arriveRemark}, - arrive_lng = #{arriveLng}, - arrive_lat = #{arriveLat}, - - where id = #{id} - - - - delete from biz_order where id = #{id} - - - - delete from biz_order where id in - - #{id} - - - \ No newline at end of file diff --git a/cpxt-system/src/main/resources/mapper/biz/BizOrderSubMapper.xml b/cpxt-system/src/main/resources/mapper/biz/BizOrderSubMapper.xml deleted file mode 100644 index ede0ce2..0000000 --- a/cpxt-system/src/main/resources/mapper/biz/BizOrderSubMapper.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - select id, order_sn, sub_order_sn, weight, volume, length, width, height from biz_order_sub - - - - - - - - insert into biz_order_sub - - order_sn, - sub_order_sn, - weight, - volume, - length, - width, - height, - - - #{orderSn}, - #{subOrderSn}, - #{weight}, - #{volume}, - #{length}, - #{width}, - #{height}, - - - - - update biz_order_sub - - order_sn = #{orderSn}, - sub_order_sn = #{subOrderSn}, - weight = #{weight}, - volume = #{volume}, - length = #{length}, - width = #{width}, - height = #{height}, - - where id = #{id} - - - - delete from biz_order_sub where id = #{id} - - - - delete from biz_order_sub where id in - - #{id} - - - \ No newline at end of file