From 859b06ecadd79ca9931733bc078ca7879b5ca97c Mon Sep 17 00:00:00 2001 From: baize <3533151373@qq.com> Date: Mon, 27 May 2024 20:48:47 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E5=88=9B=E5=BB=BA=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=90=BA=E5=B8=A6=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/common/core/utils/ObjUtils.java | 65 ++++++ .../muyu/common/system/domain/SysUser.java | 10 + .../muyu-customer-business-client/pom.xml | 20 ++ .../muyu-customer-business-common/pom.xml | 30 +++ .../customer/business/domain/Vehicle.java | 197 ++++++++++++++++++ .../business/domain/req/VehicleEditReq.java | 91 ++++++++ .../business/domain/req/VehicleQueryReq.java | 91 ++++++++ .../business/domain/req/VehicleSaveReq.java | 111 ++++++++++ .../muyu-customer-business-remote/pom.xml | 20 ++ .../muyu-customer-business-server/pom.xml | 115 ++++++++++ .../MuYuCustomerBusinessApplication.java | 23 ++ .../controller/VehicleController.java | 111 ++++++++++ .../business/mapper/VehicleMapper.java | 15 ++ .../business/service/VehicleService.java | 22 ++ .../service/impl/VehicleServiceImpl.java | 101 +++++++++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 30 +++ .../src/main/resources/logback.xml | 74 +++++++ .../mapper/customerBusiness/VehicleMapper.xml | 34 +++ muyu-modules/muyu-customer-business/pom.xml | 29 +++ .../muyu-net-working-client/pom.xml | 20 ++ .../muyu-net-working-common/pom.xml | 26 +++ .../muyu/net/working/domain/Enterprise.java | 196 +++++++++++++++++ .../working/domain/req/EnterpriseEditReq.java | 91 ++++++++ .../domain/req/EnterpriseQueryReq.java | 91 ++++++++ .../working/domain/req/EnterpriseSaveReq.java | 111 ++++++++++ .../muyu-net-working-remote/pom.xml | 20 ++ .../muyu-net-working-server/pom.xml | 116 +++++++++++ .../working/MuYuNetWorkingApplication.java | 23 ++ .../controller/EnterpriseController.java | 111 ++++++++++ .../net/working/mapper/EnterpriseMapper.java | 15 ++ .../working/service/EnterpriseService.java | 22 ++ .../service/impl/EnterpriseServiceImpl.java | 101 +++++++++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 30 +++ .../src/main/resources/logback.xml | 74 +++++++ .../mapper/netWorking/EnterpriseMapper.xml | 34 +++ muyu-modules/muyu-net-working/pom.xml | 30 +++ .../resources/mapper/system/SysUserMapper.xml | 5 +- muyu-modules/pom.xml | 2 + 40 files changed, 2310 insertions(+), 1 deletion(-) create mode 100644 muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ObjUtils.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-client/pom.xml create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-common/pom.xml create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/Vehicle.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleEditReq.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleQueryReq.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleSaveReq.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-remote/pom.xml create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/pom.xml create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/MuYuCustomerBusinessApplication.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/VehicleMapper.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/VehicleService.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/VehicleServiceImpl.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/banner.txt create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/bootstrap.yml create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/logback.xml create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/VehicleMapper.xml create mode 100644 muyu-modules/muyu-customer-business/pom.xml create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-client/pom.xml create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-common/pom.xml create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseQueryReq.java create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseSaveReq.java create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/MuYuNetWorkingApplication.java create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/banner.txt create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/bootstrap.yml create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/logback.xml create mode 100644 muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/netWorking/EnterpriseMapper.xml create mode 100644 muyu-modules/muyu-net-working/pom.xml diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ObjUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ObjUtils.java new file mode 100644 index 0000000..35f459c --- /dev/null +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ObjUtils.java @@ -0,0 +1,65 @@ +package com.muyu.common.core.utils; + +import org.apache.commons.lang3.ObjectUtils; + +import java.math.BigDecimal; + +/** + * @author DongZl + * @description: 对象工具类 + * @Date 2023-10-9 下午 04:56 + */ +public class ObjUtils { + + /** + * 兼容 + * CharSequence: 如果长度为零，则认为为空。 + * Array: 如果长度为零，则认为为空。 + * Collection: 如果元素为零，则认为为空。 + * Map: 如果键值映射为零，则认为为空。 + * @param o 对象 + * @return 如果对象具有受支持的类型并且为空或null，则为true，否则为false + */ + public static boolean notNull(Object o){ + return ObjectUtils.isNotEmpty(o); + } + + /** + * 判断long类型不为0 + * @param val 值 + * @return 返回值不为0 + */ + public static boolean notNull(Long val){ + return ObjectUtils.isNotEmpty(val) && val != 0; + } + + /** + * 判断Integer类型不为0 + * @param val 值 + * @return 返回值不为0 + */ + public static boolean notNull(Integer val){ + return ObjectUtils.isNotEmpty(val) && val != 0; + } + /** + * 判断BigDecimal类型不为0 + * @param val 值 + * @return 返回值不为0 + */ + public static boolean notNull(BigDecimal val){ + return ObjectUtils.isNotEmpty(val) && val.doubleValue() == 0.00; + } + /** + * 判断BigDecimal类型不为0 + * @param val 值 + * @return 返回值不为0 + */ + public static boolean notChildNull(Object[] val){ + for (Object o : val) { + if (!notNull(o)){ + return false; + } + } + return true; + } +} diff --git a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java index 6be7436..8fe622e 100644 --- a/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java +++ b/muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java @@ -137,6 +137,16 @@ public class SysUser extends BaseEntity { */ private Long roleId; + /** + * 登录类型 + */ + private String type; + + /** + * 企业ID + */ + private Integer enterpriseId; + public SysUser (Long userId) { this.userId = userId; } diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-client/pom.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-client/pom.xml new file mode 100644 index 0000000..f3f2fe6 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-client/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.muyu + muyu-customer-business + 3.6.3 + + + muyu-customer-business-client + + + 17 + 17 + UTF-8 + + + diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/pom.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-common/pom.xml new file mode 100644 index 0000000..8e472d2 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.muyu + muyu-customer-business + 3.6.3 + + + muyu-customer-business-common + + + 17 + 17 + UTF-8 + + + + com.muyu + muyu-common-core + 3.6.3 + + + com.muyu + muyu-common-security + + + diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/Vehicle.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/Vehicle.java new file mode 100644 index 0000000..df46a7e --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/Vehicle.java @@ -0,0 +1,197 @@ +package com.muyu.customer.business.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.security.utils.SecurityUtils; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.annotation.Excel; +import com.muyu.customer.business.domain.req.VehicleQueryReq; +import com.muyu.customer.business.domain.req.VehicleSaveReq; +import com.muyu.customer.business.domain.req.VehicleEditReq; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 车辆录入对象 vehicle + * + * @author muyu + * @date 2024-05-27 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("vehicle") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "Vehicle", description = "车辆录入") +public class Vehicle extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 车辆id */ + @TableId(value = "id",type = IdType.AUTO) + @ApiModelProperty(name = "车辆id", value = "车辆id") + private Long id; + + /** 车辆vin */ + @Excel(name = "车辆vin") + @ApiModelProperty(name = "车辆vin", value = "车辆vin") + private String vin; + + /** 品牌 */ + @Excel(name = "品牌") + @ApiModelProperty(name = "品牌", value = "品牌") + private String brand; + + /** 型号 */ + @Excel(name = "型号") + @ApiModelProperty(name = "型号", value = "型号") + private String model; + + /** 生产日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(name = "生产日期", value = "生产日期") + private Date productionDate; + + /** 车身类型 */ + @Excel(name = "车身类型") + @ApiModelProperty(name = "车身类型", value = "车身类型") + private String bodyType; + + /** 车身颜色 */ + @Excel(name = "车身颜色") + @ApiModelProperty(name = "车身颜色", value = "车身颜色") + private String color; + + /** 发动机排量 */ + @Excel(name = "发动机排量") + @ApiModelProperty(name = "发动机排量", value = "发动机排量") + private BigDecimal engineCapacity; + + /** 燃油类型 */ + @Excel(name = "燃油类型") + @ApiModelProperty(name = "燃油类型", value = "燃油类型") + private String fuelType; + + /** 变速器类型 */ + @Excel(name = "变速器类型") + @ApiModelProperty(name = "变速器类型", value = "变速器类型") + private String transmission; + + /** 驱动方式 */ + @Excel(name = "驱动方式") + @ApiModelProperty(name = "驱动方式", value = "驱动方式") + private String driveType; + + /** 行驶里程 */ + @Excel(name = "行驶里程") + @ApiModelProperty(name = "行驶里程", value = "行驶里程") + private BigDecimal mileage; + + /** 注册日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "注册日期", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(name = "注册日期", value = "注册日期") + private Date registrationDate; + + /** 车牌号码 */ + @Excel(name = "车牌号码") + @ApiModelProperty(name = "车牌号码", value = "车牌号码") + private String licenseNumber; + + /** 持有者 */ + @Excel(name = "持有者") + @ApiModelProperty(name = "持有者", value = "持有者") + private String holder; + + /** 车辆类型 */ + @Excel(name = "车辆类型") + @ApiModelProperty(name = "车辆类型", value = "车辆类型") + private String vehicleType; + + /** + * 查询构造器 + */ + public static Vehicle queryBuild( VehicleQueryReq vehicleQueryReq){ + return Vehicle.builder() + .vin(vehicleQueryReq.getVin()) + .brand(vehicleQueryReq.getBrand()) + .model(vehicleQueryReq.getModel()) + .productionDate(vehicleQueryReq.getProductionDate()) + .bodyType(vehicleQueryReq.getBodyType()) + .color(vehicleQueryReq.getColor()) + .engineCapacity(vehicleQueryReq.getEngineCapacity()) + .fuelType(vehicleQueryReq.getFuelType()) + .transmission(vehicleQueryReq.getTransmission()) + .driveType(vehicleQueryReq.getDriveType()) + .mileage(vehicleQueryReq.getMileage()) + .registrationDate(vehicleQueryReq.getRegistrationDate()) + .licenseNumber(vehicleQueryReq.getLicenseNumber()) + .holder(vehicleQueryReq.getHolder()) + .vehicleType(vehicleQueryReq.getVehicleType()) + .build(); + } + + /** + * 添加构造器 + */ + public static Vehicle saveBuild(VehicleSaveReq vehicleSaveReq){ + return Vehicle.builder() + .vin(vehicleSaveReq.getVin()) + .brand(vehicleSaveReq.getBrand()) + .model(vehicleSaveReq.getModel()) + .productionDate(vehicleSaveReq.getProductionDate()) + .bodyType(vehicleSaveReq.getBodyType()) + .color(vehicleSaveReq.getColor()) + .engineCapacity(vehicleSaveReq.getEngineCapacity()) + .fuelType(vehicleSaveReq.getFuelType()) + .transmission(vehicleSaveReq.getTransmission()) + .driveType(vehicleSaveReq.getDriveType()) + .mileage(vehicleSaveReq.getMileage()) + .registrationDate(vehicleSaveReq.getRegistrationDate()) + .licenseNumber(vehicleSaveReq.getLicenseNumber()) + .holder(vehicleSaveReq.getHolder()) + .vehicleType(vehicleSaveReq.getVehicleType()) + .createTime(new Date()) + .createBy(SecurityUtils.getUsername()) + .remark(vehicleSaveReq.getRemark()) + .build(); + } + + /** + * 修改构造器 + */ + public static Vehicle editBuild(Long id, VehicleEditReq vehicleEditReq){ + return Vehicle.builder() + .id(id) + .vin(vehicleEditReq.getVin()) + .brand(vehicleEditReq.getBrand()) + .model(vehicleEditReq.getModel()) + .productionDate(vehicleEditReq.getProductionDate()) + .bodyType(vehicleEditReq.getBodyType()) + .color(vehicleEditReq.getColor()) + .engineCapacity(vehicleEditReq.getEngineCapacity()) + .fuelType(vehicleEditReq.getFuelType()) + .transmission(vehicleEditReq.getTransmission()) + .driveType(vehicleEditReq.getDriveType()) + .mileage(vehicleEditReq.getMileage()) + .registrationDate(vehicleEditReq.getRegistrationDate()) + .licenseNumber(vehicleEditReq.getLicenseNumber()) + .holder(vehicleEditReq.getHolder()) + .vehicleType(vehicleEditReq.getVehicleType()) + .updateTime(new Date()) + .updateBy(SecurityUtils.getUsername()) + .remark(vehicleEditReq.getRemark()) + .build(); + } + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleEditReq.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleEditReq.java new file mode 100644 index 0000000..8e2b936 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleEditReq.java @@ -0,0 +1,91 @@ +package com.muyu.customer.business.domain.req; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 车辆录入对象 vehicle + * + * @author muyu + * @date 2024-05-27 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "VehicleEditReq", description = "车辆录入") +public class VehicleEditReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 车辆vin */ + @ApiModelProperty(name = "车辆vin", value = "车辆vin") + private String vin; + + /** 品牌 */ + @ApiModelProperty(name = "品牌", value = "品牌") + private String brand; + + /** 型号 */ + @ApiModelProperty(name = "型号", value = "型号") + private String model; + + /** 生产日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(name = "生产日期", value = "生产日期") + private Date productionDate; + + /** 车身类型 */ + @ApiModelProperty(name = "车身类型", value = "车身类型") + private String bodyType; + + /** 车身颜色 */ + @ApiModelProperty(name = "车身颜色", value = "车身颜色") + private String color; + + /** 发动机排量 */ + @ApiModelProperty(name = "发动机排量", value = "发动机排量") + private BigDecimal engineCapacity; + + /** 燃油类型 */ + @ApiModelProperty(name = "燃油类型", value = "燃油类型") + private String fuelType; + + /** 变速器类型 */ + @ApiModelProperty(name = "变速器类型", value = "变速器类型") + private String transmission; + + /** 驱动方式 */ + @ApiModelProperty(name = "驱动方式", value = "驱动方式") + private String driveType; + + /** 行驶里程 */ + @ApiModelProperty(name = "行驶里程", value = "行驶里程") + private BigDecimal mileage; + + /** 注册日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(name = "注册日期", value = "注册日期") + private Date registrationDate; + + /** 车牌号码 */ + @ApiModelProperty(name = "车牌号码", value = "车牌号码") + private String licenseNumber; + + /** 持有者 */ + @ApiModelProperty(name = "持有者", value = "持有者") + private String holder; + + /** 车辆类型 */ + @ApiModelProperty(name = "车辆类型", value = "车辆类型") + private String vehicleType; + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleQueryReq.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleQueryReq.java new file mode 100644 index 0000000..0d7d90b --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleQueryReq.java @@ -0,0 +1,91 @@ +package com.muyu.customer.business.domain.req; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 车辆录入对象 vehicle + * + * @author muyu + * @date 2024-05-27 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "VehicleQueryReq", description = "车辆录入") +public class VehicleQueryReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 车辆vin */ + @ApiModelProperty(name = "车辆vin", value = "车辆vin") + private String vin; + + /** 品牌 */ + @ApiModelProperty(name = "品牌", value = "品牌") + private String brand; + + /** 型号 */ + @ApiModelProperty(name = "型号", value = "型号") + private String model; + + /** 生产日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(name = "生产日期", value = "生产日期") + private Date productionDate; + + /** 车身类型 */ + @ApiModelProperty(name = "车身类型", value = "车身类型") + private String bodyType; + + /** 车身颜色 */ + @ApiModelProperty(name = "车身颜色", value = "车身颜色") + private String color; + + /** 发动机排量 */ + @ApiModelProperty(name = "发动机排量", value = "发动机排量") + private BigDecimal engineCapacity; + + /** 燃油类型 */ + @ApiModelProperty(name = "燃油类型", value = "燃油类型") + private String fuelType; + + /** 变速器类型 */ + @ApiModelProperty(name = "变速器类型", value = "变速器类型") + private String transmission; + + /** 驱动方式 */ + @ApiModelProperty(name = "驱动方式", value = "驱动方式") + private String driveType; + + /** 行驶里程 */ + @ApiModelProperty(name = "行驶里程", value = "行驶里程") + private BigDecimal mileage; + + /** 注册日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(name = "注册日期", value = "注册日期") + private Date registrationDate; + + /** 车牌号码 */ + @ApiModelProperty(name = "车牌号码", value = "车牌号码") + private String licenseNumber; + + /** 持有者 */ + @ApiModelProperty(name = "持有者", value = "持有者") + private String holder; + + /** 车辆类型 */ + @ApiModelProperty(name = "车辆类型", value = "车辆类型") + private String vehicleType; + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleSaveReq.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleSaveReq.java new file mode 100644 index 0000000..6a3c222 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/VehicleSaveReq.java @@ -0,0 +1,111 @@ +package com.muyu.customer.business.domain.req; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 车辆录入对象 vehicle + * + * @author muyu + * @date 2024-05-27 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "VehicleSaveReq", description = "车辆录入") +public class VehicleSaveReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 车辆id */ + + @ApiModelProperty(name = "车辆id", value = "车辆id") + private Long id; + + /** 车辆vin */ + + @ApiModelProperty(name = "车辆vin", value = "车辆vin") + private String vin; + + /** 品牌 */ + + @ApiModelProperty(name = "品牌", value = "品牌") + private String brand; + + /** 型号 */ + + @ApiModelProperty(name = "型号", value = "型号") + private String model; + + /** 生产日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + + @ApiModelProperty(name = "生产日期", value = "生产日期") + private Date productionDate; + + /** 车身类型 */ + + @ApiModelProperty(name = "车身类型", value = "车身类型") + private String bodyType; + + /** 车身颜色 */ + + @ApiModelProperty(name = "车身颜色", value = "车身颜色") + private String color; + + /** 发动机排量 */ + + @ApiModelProperty(name = "发动机排量", value = "发动机排量") + private BigDecimal engineCapacity; + + /** 燃油类型 */ + + @ApiModelProperty(name = "燃油类型", value = "燃油类型") + private String fuelType; + + /** 变速器类型 */ + + @ApiModelProperty(name = "变速器类型", value = "变速器类型") + private String transmission; + + /** 驱动方式 */ + + @ApiModelProperty(name = "驱动方式", value = "驱动方式") + private String driveType; + + /** 行驶里程 */ + + @ApiModelProperty(name = "行驶里程", value = "行驶里程") + private BigDecimal mileage; + + /** 注册日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + + @ApiModelProperty(name = "注册日期", value = "注册日期") + private Date registrationDate; + + /** 车牌号码 */ + + @ApiModelProperty(name = "车牌号码", value = "车牌号码") + private String licenseNumber; + + /** 持有者 */ + + @ApiModelProperty(name = "持有者", value = "持有者") + private String holder; + + /** 车辆类型 */ + + @ApiModelProperty(name = "车辆类型", value = "车辆类型") + private String vehicleType; + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-remote/pom.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-remote/pom.xml new file mode 100644 index 0000000..7276ccd --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-remote/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.muyu + muyu-customer-business + 3.6.3 + + + muyu-customer-business-remote + + + 17 + 17 + UTF-8 + + + diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/pom.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-server/pom.xml new file mode 100644 index 0000000..77f1d83 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/pom.xml @@ -0,0 +1,115 @@ + + + 4.0.0 + + com.muyu + muyu-customer-business + 3.6.3 + + + muyu-customer-business-server + + + 17 + 17 + UTF-8 + + + + + + com.muyu + muyu-customer-business-common + 3.6.3 + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + muyu-common-datasource + + + + + com.muyu + muyu-common-datascope + + + + + com.muyu + muyu-common-log + + + + + com.muyu + muyu-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/MuYuCustomerBusinessApplication.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/MuYuCustomerBusinessApplication.java new file mode 100644 index 0000000..e949ff3 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/MuYuCustomerBusinessApplication.java @@ -0,0 +1,23 @@ +package com.muyu.customer.business; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import com.muyu.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 车联网客户业务系统启动类 MuYuCustomerBusinessApplication + * + * @author DeKangLiu + * Date 2024/5/27 16:51 + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class MuYuCustomerBusinessApplication { + public static void main (String[] args) { + SpringApplication.run(MuYuCustomerBusinessApplication.class, args); + } +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java new file mode 100644 index 0000000..4e3e0fe --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java @@ -0,0 +1,111 @@ +package com.muyu.customer.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.customer.business.domain.Vehicle; +import com.muyu.customer.business.domain.req.VehicleQueryReq; +import com.muyu.customer.business.domain.req.VehicleSaveReq; +import com.muyu.customer.business.domain.req.VehicleEditReq; +import com.muyu.customer.business.service.VehicleService; +import com.muyu.common.core.web.page.TableDataInfo; + +/** + * 车辆录入Controller + * + * @author muyu + * @date 2024-05-27 + */ +@Api(tags = "车辆录入") +@RestController +@RequestMapping("/vehicle") +public class VehicleController extends BaseController { + @Autowired + private VehicleService vehicleService; + + /** + * 查询车辆录入列表 + */ + @ApiOperation("获取车辆录入列表") + @RequiresPermissions("customerBusiness:vehicle:list") + @GetMapping("/list") + public Result> list(VehicleQueryReq vehicleQueryReq) { + startPage(); + List list = vehicleService.list(Vehicle.queryBuild(vehicleQueryReq)); + return getDataTable(list); + } + + /** + * 导出车辆录入列表 + */ + @ApiOperation("导出车辆录入列表") + @RequiresPermissions("customerBusiness:vehicle:export") + @Log(title = "车辆录入", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Vehicle vehicle) { + List list = vehicleService.list(vehicle); + ExcelUtil util = new ExcelUtil(Vehicle.class); + util.exportExcel(response, list, "车辆录入数据"); + } + + /** + * 获取车辆录入详细信息 + */ + @ApiOperation("获取车辆录入详细信息") + @RequiresPermissions("customerBusiness:vehicle:query") + @GetMapping(value = "/{id}") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result getInfo(@PathVariable("id") Long id) { + return Result.success(vehicleService.getById(id)); + } + + /** + * 新增车辆录入 + */ + @RequiresPermissions("customerBusiness:vehicle:add") + @Log(title = "车辆录入", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增车辆录入") + public Result add(@RequestBody VehicleSaveReq vehicleSaveReq) { + return toAjax(vehicleService.save(Vehicle.saveBuild(vehicleSaveReq))); + } + + /** + * 修改车辆录入 + */ + @RequiresPermissions("customerBusiness:vehicle:edit") + @Log(title = "车辆录入", businessType = BusinessType.UPDATE) + @PutMapping("/{id}") + @ApiOperation("修改车辆录入") + public Result edit(@PathVariable Long id, @RequestBody VehicleEditReq vehicleEditReq) { + return toAjax(vehicleService.updateById(Vehicle.editBuild(id,vehicleEditReq))); + } + + /** + * 删除车辆录入 + */ + @RequiresPermissions("customerBusiness:vehicle:remove") + @Log(title = "车辆录入", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + @ApiOperation("删除车辆录入") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") + public Result remove(@PathVariable List ids) { + return toAjax(vehicleService.removeBatchByIds(ids)); + } +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/VehicleMapper.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/VehicleMapper.java new file mode 100644 index 0000000..aa124e4 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/VehicleMapper.java @@ -0,0 +1,15 @@ +package com.muyu.customer.business.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.customer.business.domain.Vehicle; + +/** + * 车辆录入Mapper接口 + * + * @author muyu + * @date 2024-05-27 + */ +public interface VehicleMapper extends BaseMapper { + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/VehicleService.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/VehicleService.java new file mode 100644 index 0000000..dd96af7 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/VehicleService.java @@ -0,0 +1,22 @@ +package com.muyu.customer.business.service; + +import java.util.List; +import com.muyu.customer.business.domain.Vehicle; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 车辆录入Service接口 + * + * @author muyu + * @date 2024-05-27 + */ +public interface VehicleService extends IService { + /** + * 查询车辆录入列表 + * + * @param vehicle 车辆录入 + * @return 车辆录入集合 + */ + public List list(Vehicle vehicle); + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/VehicleServiceImpl.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/VehicleServiceImpl.java new file mode 100644 index 0000000..f2bbe1a --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/VehicleServiceImpl.java @@ -0,0 +1,101 @@ +package com.muyu.customer.business.service.impl; + +import java.util.List; + +import com.muyu.common.core.utils.ObjUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.muyu.customer.business.mapper.VehicleMapper; +import com.muyu.customer.business.domain.Vehicle; +import com.muyu.customer.business.service.VehicleService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 车辆录入Service业务层处理 + * + * @author muyu + * @date 2024-05-27 + */ +@Slf4j +@Service +public class VehicleServiceImpl extends ServiceImpl implements VehicleService { + + /** + * 查询车辆录入列表 + * + * @param vehicle 车辆录入 + * @return 车辆录入 + */ + @Override + public List list(Vehicle vehicle) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + + if (ObjUtils.notNull(vehicle.getVin())){ + queryWrapper.eq(Vehicle::getVin, vehicle.getVin()); + } + + if (ObjUtils.notNull(vehicle.getBrand())){ + queryWrapper.eq(Vehicle::getBrand, vehicle.getBrand()); + } + + if (ObjUtils.notNull(vehicle.getModel())){ + queryWrapper.eq(Vehicle::getModel, vehicle.getModel()); + } + + if (ObjUtils.notNull(vehicle.getProductionDate())){ + queryWrapper.eq(Vehicle::getProductionDate, vehicle.getProductionDate()); + } + + if (ObjUtils.notNull(vehicle.getBodyType())){ + queryWrapper.eq(Vehicle::getBodyType, vehicle.getBodyType()); + } + + if (ObjUtils.notNull(vehicle.getColor())){ + queryWrapper.eq(Vehicle::getColor, vehicle.getColor()); + } + + if (ObjUtils.notNull(vehicle.getEngineCapacity())){ + queryWrapper.eq(Vehicle::getEngineCapacity, vehicle.getEngineCapacity()); + } + + if (ObjUtils.notNull(vehicle.getFuelType())){ + queryWrapper.eq(Vehicle::getFuelType, vehicle.getFuelType()); + } + + if (ObjUtils.notNull(vehicle.getTransmission())){ + queryWrapper.eq(Vehicle::getTransmission, vehicle.getTransmission()); + } + + if (ObjUtils.notNull(vehicle.getDriveType())){ + queryWrapper.eq(Vehicle::getDriveType, vehicle.getDriveType()); + } + + if (ObjUtils.notNull(vehicle.getMileage())){ + queryWrapper.eq(Vehicle::getMileage, vehicle.getMileage()); + } + + if (ObjUtils.notNull(vehicle.getRegistrationDate())){ + queryWrapper.eq(Vehicle::getRegistrationDate, vehicle.getRegistrationDate()); + } + + if (ObjUtils.notNull(vehicle.getLicenseNumber())){ + queryWrapper.eq(Vehicle::getLicenseNumber, vehicle.getLicenseNumber()); + } + + if (ObjUtils.notNull(vehicle.getHolder())){ + queryWrapper.eq(Vehicle::getHolder, vehicle.getHolder()); + } + + if (ObjUtils.notNull(vehicle.getVehicleType())){ + queryWrapper.eq(Vehicle::getVehicleType, vehicle.getVehicleType()); + } + + + + + + return list(queryWrapper); + } +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/banner.txt b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..d352e31 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/bootstrap.yml @@ -0,0 +1,30 @@ +# Tomcat +server: + port: 9207 + +# Spring +spring: + application: + # 应用名称 + name: muyu-customer-business + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 127.0.0.1:8848 + namespace: jinmo + config: + # 配置中心地址 + server-addr: 127.0.0.1:8848 + namespace: jinmo + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.customer.business.mapper: DEBUG diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/logback.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/logback.xml new file mode 100644 index 0000000..2748efd --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/VehicleMapper.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/VehicleMapper.xml new file mode 100644 index 0000000..b43bc4b --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/VehicleMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, vin, brand, model, production_date, body_type, color, engine_capacity, fuel_type, transmission, drive_type, mileage, registration_date, license_number, holder, vehicle_type, create_by, create_time, update_by, update_time, remark from vehicle + + diff --git a/muyu-modules/muyu-customer-business/pom.xml b/muyu-modules/muyu-customer-business/pom.xml new file mode 100644 index 0000000..a1ce1f4 --- /dev/null +++ b/muyu-modules/muyu-customer-business/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + com.muyu + muyu-modules + 3.6.3 + + pom + + muyu-customer-business车联网客户业务系统模块 + + + muyu-customer-business-common + muyu-customer-business-client + muyu-customer-business-remote + muyu-customer-business-server + + muyu-customer-business + + + 17 + 17 + UTF-8 + + + diff --git a/muyu-modules/muyu-net-working/muyu-net-working-client/pom.xml b/muyu-modules/muyu-net-working/muyu-net-working-client/pom.xml new file mode 100644 index 0000000..0e6b911 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-client/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.muyu + muyu-net-working + 3.6.3 + + + muyu-net-working-client + + + 17 + 17 + UTF-8 + + + diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/pom.xml b/muyu-modules/muyu-net-working/muyu-net-working-common/pom.xml new file mode 100644 index 0000000..4091296 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-common/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.muyu + muyu-net-working + 3.6.3 + + + muyu-net-working-common + + + 17 + 17 + UTF-8 + + + + com.muyu + muyu-common-core + + + + diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java new file mode 100644 index 0000000..6a11f5b --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java @@ -0,0 +1,196 @@ +package com.muyu.net.working.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.annotation.Excel; +import com.muyu.net.working.domain.req.EnterpriseQueryReq; +import com.muyu.net.working.domain.req.EnterpriseSaveReq; +import com.muyu.net.working.domain.req.EnterpriseEditReq; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 企业信息对象 enterprise + * + * @author muyu + * @date 2024-05-27 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("enterprise") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "Enterprise", description = "企业信息") +public class Enterprise extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) + @ApiModelProperty(name = "主键", value = "主键") + private String id; + + /** 企业名称 */ + @Excel(name = "企业名称") + @ApiModelProperty(name = "企业名称", value = "企业名称") + private String ebterpriseName; + + /** 法定代表人 */ + @Excel(name = "法定代表人") + @ApiModelProperty(name = "法定代表人", value = "法定代表人") + private String legalPerson; + + /** 经营执照凭证号码 */ + @Excel(name = "经营执照凭证号码") + @ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码") + private String businessLincenseNumber; + + /** 企业成立时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "企业成立时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(name = "企业成立时间", value = "企业成立时间") + private Date estabinessDate; + + /** 经营范围 */ + @Excel(name = "经营范围") + @ApiModelProperty(name = "经营范围", value = "经营范围") + private String businessScope; + + /** 注册地址 */ + @Excel(name = "注册地址") + @ApiModelProperty(name = "注册地址", value = "注册地址") + private String address; + + /** 企业联系方式 */ + @Excel(name = "企业联系方式") + @ApiModelProperty(name = "企业联系方式", value = "企业联系方式") + private String contactPhone; + + /** 公司邮箱 */ + @Excel(name = "公司邮箱") + @ApiModelProperty(name = "公司邮箱", value = "公司邮箱") + private String email; + + /** 企业当前状态 */ + @Excel(name = "企业当前状态") + @ApiModelProperty(name = "企业当前状态", value = "企业当前状态") + private String status; + + /** 企业入驻平台时期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "企业入驻平台时期", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期") + private Date registrationDate; + + /** 企业认证id */ + @Excel(name = "企业认证id") + @ApiModelProperty(name = "企业认证id", value = "企业认证id") + private Long certificationId; + + /** 认证时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "认证时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(name = "认证时间", value = "认证时间") + private Date authenticationDate; + + /** 服务级别 */ + @Excel(name = "服务级别") + @ApiModelProperty(name = "服务级别", value = "服务级别") + private Long serviceLevel; + + /** 开通服务id */ + @Excel(name = "开通服务id") + @ApiModelProperty(name = "开通服务id", value = "开通服务id") + private Long openServerId; + + /** 增值服务id */ + @Excel(name = "增值服务id") + @ApiModelProperty(name = "增值服务id", value = "增值服务id") + private Long addServerId; + + /** + * 查询构造器 + */ + public static Enterprise queryBuild( EnterpriseQueryReq enterpriseQueryReq){ + return Enterprise.builder() + .ebterpriseName(enterpriseQueryReq.getEbterpriseName()) + .legalPerson(enterpriseQueryReq.getLegalPerson()) + .businessLincenseNumber(enterpriseQueryReq.getBusinessLincenseNumber()) + .estabinessDate(enterpriseQueryReq.getEstabinessDate()) + .businessScope(enterpriseQueryReq.getBusinessScope()) + .address(enterpriseQueryReq.getAddress()) + .contactPhone(enterpriseQueryReq.getContactPhone()) + .email(enterpriseQueryReq.getEmail()) + .status(enterpriseQueryReq.getStatus()) + .registrationDate(enterpriseQueryReq.getRegistrationDate()) + .certificationId(enterpriseQueryReq.getCertificationId()) + .authenticationDate(enterpriseQueryReq.getAuthenticationDate()) + .serviceLevel(enterpriseQueryReq.getServiceLevel()) + .openServerId(enterpriseQueryReq.getOpenServerId()) + .addServerId(enterpriseQueryReq.getAddServerId()) + .build(); + } + + /** + * 添加构造器 + */ + public static Enterprise saveBuild(EnterpriseSaveReq enterpriseSaveReq){ + return Enterprise.builder() + .ebterpriseName(enterpriseSaveReq.getEbterpriseName()) + .legalPerson(enterpriseSaveReq.getLegalPerson()) + .businessLincenseNumber(enterpriseSaveReq.getBusinessLincenseNumber()) + .estabinessDate(enterpriseSaveReq.getEstabinessDate()) + .businessScope(enterpriseSaveReq.getBusinessScope()) + .address(enterpriseSaveReq.getAddress()) + .contactPhone(enterpriseSaveReq.getContactPhone()) + .email(enterpriseSaveReq.getEmail()) + .status(enterpriseSaveReq.getStatus()) + .registrationDate(enterpriseSaveReq.getRegistrationDate()) + .certificationId(enterpriseSaveReq.getCertificationId()) + .authenticationDate(enterpriseSaveReq.getAuthenticationDate()) + .serviceLevel(enterpriseSaveReq.getServiceLevel()) + .openServerId(enterpriseSaveReq.getOpenServerId()) + .addServerId(enterpriseSaveReq.getAddServerId()) + .createBy(enterpriseSaveReq.getCreateBy()) + .createTime(new Date()) + .remark(enterpriseSaveReq.getRemark()) + .build(); + } + + /** + * 修改构造器 + */ + public static Enterprise editBuild(String id, EnterpriseEditReq enterpriseEditReq){ + return Enterprise.builder() + .id(id) + .ebterpriseName(enterpriseEditReq.getEbterpriseName()) + .legalPerson(enterpriseEditReq.getLegalPerson()) + .businessLincenseNumber(enterpriseEditReq.getBusinessLincenseNumber()) + .estabinessDate(enterpriseEditReq.getEstabinessDate()) + .businessScope(enterpriseEditReq.getBusinessScope()) + .address(enterpriseEditReq.getAddress()) + .contactPhone(enterpriseEditReq.getContactPhone()) + .email(enterpriseEditReq.getEmail()) + .status(enterpriseEditReq.getStatus()) + .registrationDate(enterpriseEditReq.getRegistrationDate()) + .certificationId(enterpriseEditReq.getCertificationId()) + .authenticationDate(enterpriseEditReq.getAuthenticationDate()) + .serviceLevel(enterpriseEditReq.getServiceLevel()) + .openServerId(enterpriseEditReq.getOpenServerId()) + .addServerId(enterpriseEditReq.getAddServerId()) + .updateBy(enterpriseEditReq.getUpdateBy()) + .updateTime(new Date()) + .remark(enterpriseEditReq.getRemark()) + .build(); + } + +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java new file mode 100644 index 0000000..7284615 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java @@ -0,0 +1,91 @@ +package com.muyu.net.working.domain.req; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 企业信息对象 enterprise + * + * @author muyu + * @date 2024-05-27 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "EnterpriseEditReq", description = "企业信息") +public class EnterpriseEditReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 企业名称 */ + @ApiModelProperty(name = "企业名称", value = "企业名称") + private String ebterpriseName; + + /** 法定代表人 */ + @ApiModelProperty(name = "法定代表人", value = "法定代表人") + private String legalPerson; + + /** 经营执照凭证号码 */ + @ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码") + private String businessLincenseNumber; + + /** 企业成立时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(name = "企业成立时间", value = "企业成立时间") + private Date estabinessDate; + + /** 经营范围 */ + @ApiModelProperty(name = "经营范围", value = "经营范围") + private String businessScope; + + /** 注册地址 */ + @ApiModelProperty(name = "注册地址", value = "注册地址") + private String address; + + /** 企业联系方式 */ + @ApiModelProperty(name = "企业联系方式", value = "企业联系方式") + private String contactPhone; + + /** 公司邮箱 */ + @ApiModelProperty(name = "公司邮箱", value = "公司邮箱") + private String email; + + /** 企业当前状态 */ + @ApiModelProperty(name = "企业当前状态", value = "企业当前状态") + private String status; + + /** 企业入驻平台时期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期") + private Date registrationDate; + + /** 企业认证id */ + @ApiModelProperty(name = "企业认证id", value = "企业认证id") + private Long certificationId; + + /** 认证时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(name = "认证时间", value = "认证时间") + private Date authenticationDate; + + /** 服务级别 */ + @ApiModelProperty(name = "服务级别", value = "服务级别") + private Long serviceLevel; + + /** 开通服务id */ + @ApiModelProperty(name = "开通服务id", value = "开通服务id") + private Long openServerId; + + /** 增值服务id */ + @ApiModelProperty(name = "增值服务id", value = "增值服务id") + private Long addServerId; + +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseQueryReq.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseQueryReq.java new file mode 100644 index 0000000..2b893a3 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseQueryReq.java @@ -0,0 +1,91 @@ +package com.muyu.net.working.domain.req; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 企业信息对象 enterprise + * + * @author muyu + * @date 2024-05-27 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "EnterpriseQueryReq", description = "企业信息") +public class EnterpriseQueryReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 企业名称 */ + @ApiModelProperty(name = "企业名称", value = "企业名称") + private String ebterpriseName; + + /** 法定代表人 */ + @ApiModelProperty(name = "法定代表人", value = "法定代表人") + private String legalPerson; + + /** 经营执照凭证号码 */ + @ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码") + private String businessLincenseNumber; + + /** 企业成立时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(name = "企业成立时间", value = "企业成立时间") + private Date estabinessDate; + + /** 经营范围 */ + @ApiModelProperty(name = "经营范围", value = "经营范围") + private String businessScope; + + /** 注册地址 */ + @ApiModelProperty(name = "注册地址", value = "注册地址") + private String address; + + /** 企业联系方式 */ + @ApiModelProperty(name = "企业联系方式", value = "企业联系方式") + private String contactPhone; + + /** 公司邮箱 */ + @ApiModelProperty(name = "公司邮箱", value = "公司邮箱") + private String email; + + /** 企业当前状态 */ + @ApiModelProperty(name = "企业当前状态", value = "企业当前状态") + private String status; + + /** 企业入驻平台时期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期") + private Date registrationDate; + + /** 企业认证id */ + @ApiModelProperty(name = "企业认证id", value = "企业认证id") + private Long certificationId; + + /** 认证时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(name = "认证时间", value = "认证时间") + private Date authenticationDate; + + /** 服务级别 */ + @ApiModelProperty(name = "服务级别", value = "服务级别") + private Long serviceLevel; + + /** 开通服务id */ + @ApiModelProperty(name = "开通服务id", value = "开通服务id") + private Long openServerId; + + /** 增值服务id */ + @ApiModelProperty(name = "增值服务id", value = "增值服务id") + private Long addServerId; + +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseSaveReq.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseSaveReq.java new file mode 100644 index 0000000..03c34b6 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseSaveReq.java @@ -0,0 +1,111 @@ +package com.muyu.net.working.domain.req; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * 企业信息对象 enterprise + * + * @author muyu + * @date 2024-05-27 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "EnterpriseSaveReq", description = "企业信息") +public class EnterpriseSaveReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 主键 */ + + @ApiModelProperty(name = "主键", value = "主键") + private String id; + + /** 企业名称 */ + + @ApiModelProperty(name = "企业名称", value = "企业名称") + private String ebterpriseName; + + /** 法定代表人 */ + + @ApiModelProperty(name = "法定代表人", value = "法定代表人") + private String legalPerson; + + /** 经营执照凭证号码 */ + + @ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码") + private String businessLincenseNumber; + + /** 企业成立时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + + @ApiModelProperty(name = "企业成立时间", value = "企业成立时间") + private Date estabinessDate; + + /** 经营范围 */ + + @ApiModelProperty(name = "经营范围", value = "经营范围") + private String businessScope; + + /** 注册地址 */ + + @ApiModelProperty(name = "注册地址", value = "注册地址") + private String address; + + /** 企业联系方式 */ + + @ApiModelProperty(name = "企业联系方式", value = "企业联系方式") + private String contactPhone; + + /** 公司邮箱 */ + + @ApiModelProperty(name = "公司邮箱", value = "公司邮箱") + private String email; + + /** 企业当前状态 */ + + @ApiModelProperty(name = "企业当前状态", value = "企业当前状态") + private String status; + + /** 企业入驻平台时期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + + @ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期") + private Date registrationDate; + + /** 企业认证id */ + + @ApiModelProperty(name = "企业认证id", value = "企业认证id") + private Long certificationId; + + /** 认证时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + + @ApiModelProperty(name = "认证时间", value = "认证时间") + private Date authenticationDate; + + /** 服务级别 */ + + @ApiModelProperty(name = "服务级别", value = "服务级别") + private Long serviceLevel; + + /** 开通服务id */ + + @ApiModelProperty(name = "开通服务id", value = "开通服务id") + private Long openServerId; + + /** 增值服务id */ + + @ApiModelProperty(name = "增值服务id", value = "增值服务id") + private Long addServerId; + +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml b/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml new file mode 100644 index 0000000..f2fa13a --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-remote/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.muyu + muyu-net-working + 3.6.3 + + + muyu-net-working-remote + + + 17 + 17 + UTF-8 + + + diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml b/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml new file mode 100644 index 0000000..f461bd3 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/pom.xml @@ -0,0 +1,116 @@ + + + 4.0.0 + + com.muyu + muyu-net-working + 3.6.3 + + + muyu-net-working-server + + + 17 + 17 + UTF-8 + + + + + + com.muyu + muyu-net-working-common + 3.6.3 + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + muyu-common-datasource + + + + + com.muyu + muyu-common-datascope + + + + + com.muyu + muyu-common-log + + + + + com.muyu + muyu-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + + + diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/MuYuNetWorkingApplication.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/MuYuNetWorkingApplication.java new file mode 100644 index 0000000..b0eaf90 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/MuYuNetWorkingApplication.java @@ -0,0 +1,23 @@ +package com.muyu.net.working; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import com.muyu.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 车联网运营平台启动类 MuYuNetWorkingApplication + * + * @author DeKangLiu + * Date 2024/5/26 21:45 + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class MuYuNetWorkingApplication { + public static void main (String[] args) { + SpringApplication.run(MuYuNetWorkingApplication.class, args); + } +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java new file mode 100644 index 0000000..0618b4d --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java @@ -0,0 +1,111 @@ +package com.muyu.net.working.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.net.working.domain.Enterprise; +import com.muyu.net.working.domain.req.EnterpriseQueryReq; +import com.muyu.net.working.domain.req.EnterpriseSaveReq; +import com.muyu.net.working.domain.req.EnterpriseEditReq; +import com.muyu.net.working.service.EnterpriseService; +import com.muyu.common.core.web.page.TableDataInfo; + +/** + * 企业信息Controller + * + * @author muyu + * @date 2024-05-27 + */ +@Api(tags = "企业信息") +@RestController +@RequestMapping("/car") +public class EnterpriseController extends BaseController { + @Autowired + private EnterpriseService enterpriseService; + + /** + * 查询企业信息列表 + */ + @ApiOperation("获取企业信息列表") + @RequiresPermissions("netWorking:car:list") + @GetMapping("/list") + public Result> list(EnterpriseQueryReq enterpriseQueryReq) { + startPage(); + List list = enterpriseService.list(Enterprise.queryBuild(enterpriseQueryReq)); + return getDataTable(list); + } + + /** + * 导出企业信息列表 + */ + @ApiOperation("导出企业信息列表") + @RequiresPermissions("netWorking:car:export") + @Log(title = "企业信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Enterprise enterprise) { + List list = enterpriseService.list(enterprise); + ExcelUtil util = new ExcelUtil(Enterprise.class); + util.exportExcel(response, list, "企业信息数据"); + } + + /** + * 获取企业信息详细信息 + */ + @ApiOperation("获取企业信息详细信息") + @RequiresPermissions("netWorking:car:query") + @GetMapping(value = "/{id}") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class) + public Result getInfo(@PathVariable("id") String id) { + return Result.success(enterpriseService.getById(id)); + } + + /** + * 新增企业信息 + */ + @RequiresPermissions("netWorking:car:add") + @Log(title = "企业信息", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增企业信息") + public Result add(@RequestBody EnterpriseSaveReq enterpriseSaveReq) { + return toAjax(enterpriseService.save(Enterprise.saveBuild(enterpriseSaveReq))); + } + + /** + * 修改企业信息 + */ + @RequiresPermissions("netWorking:car:edit") + @Log(title = "企业信息", businessType = BusinessType.UPDATE) + @PutMapping("/{id}") + @ApiOperation("修改企业信息") + public Result edit(@PathVariable String id, @RequestBody EnterpriseEditReq enterpriseEditReq) { + return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq))); + } + + /** + * 删除企业信息 + */ + @RequiresPermissions("netWorking:car:remove") + @Log(title = "企业信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + @ApiOperation("删除企业信息") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") + public Result remove(@PathVariable List ids) { + return toAjax(enterpriseService.removeBatchByIds(ids)); + } +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java new file mode 100644 index 0000000..0a82543 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java @@ -0,0 +1,15 @@ +package com.muyu.net.working.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.net.working.domain.Enterprise; + +/** + * 企业信息Mapper接口 + * + * @author muyu + * @date 2024-05-27 + */ +public interface EnterpriseMapper extends BaseMapper { + +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java new file mode 100644 index 0000000..5bb5b4a --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java @@ -0,0 +1,22 @@ +package com.muyu.net.working.service; + +import java.util.List; +import com.muyu.net.working.domain.Enterprise; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 企业信息Service接口 + * + * @author muyu + * @date 2024-05-27 + */ +public interface EnterpriseService extends IService { + /** + * 查询企业信息列表 + * + * @param enterprise 企业信息 + * @return 企业信息集合 + */ + public List list(Enterprise enterprise); + +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java new file mode 100644 index 0000000..5ca6b7d --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java @@ -0,0 +1,101 @@ +package com.muyu.net.working.service.impl; + +import java.util.List; + +import com.muyu.common.core.utils.ObjUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.muyu.net.working.mapper.EnterpriseMapper; +import com.muyu.net.working.domain.Enterprise; +import com.muyu.net.working.service.EnterpriseService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 企业信息Service业务层处理 + * + * @author muyu + * @date 2024-05-27 + */ +@Slf4j +@Service +public class EnterpriseServiceImpl extends ServiceImpl implements EnterpriseService { + + /** + * 查询企业信息列表 + * + * @param enterprise 企业信息 + * @return 企业信息 + */ + @Override + public List list(Enterprise enterprise) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + + if (ObjUtils.notNull(enterprise.getEbterpriseName())){ + queryWrapper.like(Enterprise::getEbterpriseName, enterprise.getEbterpriseName()); + } + + if (ObjUtils.notNull(enterprise.getLegalPerson())){ + queryWrapper.eq(Enterprise::getLegalPerson, enterprise.getLegalPerson()); + } + + if (ObjUtils.notNull(enterprise.getBusinessLincenseNumber())){ + queryWrapper.eq(Enterprise::getBusinessLincenseNumber, enterprise.getBusinessLincenseNumber()); + } + + if (ObjUtils.notNull(enterprise.getEstabinessDate())){ + queryWrapper.eq(Enterprise::getEstabinessDate, enterprise.getEstabinessDate()); + } + + if (ObjUtils.notNull(enterprise.getBusinessScope())){ + queryWrapper.eq(Enterprise::getBusinessScope, enterprise.getBusinessScope()); + } + + if (ObjUtils.notNull(enterprise.getAddress())){ + queryWrapper.eq(Enterprise::getAddress, enterprise.getAddress()); + } + + if (ObjUtils.notNull(enterprise.getContactPhone())){ + queryWrapper.eq(Enterprise::getContactPhone, enterprise.getContactPhone()); + } + + if (ObjUtils.notNull(enterprise.getEmail())){ + queryWrapper.eq(Enterprise::getEmail, enterprise.getEmail()); + } + + if (ObjUtils.notNull(enterprise.getStatus())){ + queryWrapper.eq(Enterprise::getStatus, enterprise.getStatus()); + } + + if (ObjUtils.notNull(enterprise.getRegistrationDate())){ + queryWrapper.eq(Enterprise::getRegistrationDate, enterprise.getRegistrationDate()); + } + + if (ObjUtils.notNull(enterprise.getCertificationId())){ + queryWrapper.eq(Enterprise::getCertificationId, enterprise.getCertificationId()); + } + + if (ObjUtils.notNull(enterprise.getAuthenticationDate())){ + queryWrapper.eq(Enterprise::getAuthenticationDate, enterprise.getAuthenticationDate()); + } + + if (ObjUtils.notNull(enterprise.getServiceLevel())){ + queryWrapper.eq(Enterprise::getServiceLevel, enterprise.getServiceLevel()); + } + + if (ObjUtils.notNull(enterprise.getOpenServerId())){ + queryWrapper.eq(Enterprise::getOpenServerId, enterprise.getOpenServerId()); + } + + if (ObjUtils.notNull(enterprise.getAddServerId())){ + queryWrapper.eq(Enterprise::getAddServerId, enterprise.getAddServerId()); + } + + + + + + return list(queryWrapper); + } +} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/banner.txt b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..87f64d0 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/bootstrap.yml @@ -0,0 +1,30 @@ +# Tomcat +server: + port: 9204 + +# Spring +spring: + application: + # 应用名称 + name: muyu-net-working + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 127.0.0.1:8848 + namespace: jinmo + config: + # 配置中心地址 + server-addr: 127.0.0.1:8848 + namespace: jinmo + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.net.working.mapper: DEBUG diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/logback.xml b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/logback.xml new file mode 100644 index 0000000..aa340cd --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/netWorking/EnterpriseMapper.xml b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/netWorking/EnterpriseMapper.xml new file mode 100644 index 0000000..74678d7 --- /dev/null +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/netWorking/EnterpriseMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, ebterprise_name, legal_person, business_lincense_number, estabiness_date, business_scope, address, contact_phone, email, status, registration_date, certification_id, authentication_date, service_level, open_server_id, add_server_id, create_by, create_time, update_by, update_time, remark from enterprise + + diff --git a/muyu-modules/muyu-net-working/pom.xml b/muyu-modules/muyu-net-working/pom.xml new file mode 100644 index 0000000..27416fa --- /dev/null +++ b/muyu-modules/muyu-net-working/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.muyu + muyu-modules + 3.6.3 + + pom + + muyu-net-working车联网运营平台模块 + + + muyu-net-working-common + muyu-net-working-server + muyu-net-working-client + muyu-net-working-remote + + + + muyu-net-working + + + 17 + 17 + UTF-8 + + diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml index 6f633b7..86ea41a 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -49,6 +49,7 @@ select u.user_id, u.dept_id, + u.type, u.user_name, u.nick_name, u.email, @@ -75,11 +76,13 @@ r.role_key, r.role_sort, r.data_scope, - r.status as role_status + r.status as role_status, + e.ebterprise_name from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id + left join enterprise e on u.enterprise_id = e.id