diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java index 0eaa0fd..bd0c111 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java @@ -64,7 +64,7 @@ public class ManyDataSource implements ApplicationRunner { RemoteUserService remoteUserService = SpringUtils.getBean(RemoteUserService.class); Result> entListResult = remoteUserService.entList(); if (entListResult==null){ - throw new SaaSException("saas远调数据源错误"); + throw new SaaSException("saas远调数据源异常"); } List data = entListResult.getData(); if (entListResult.getCode() == Result.SUCCESS && data != null){ diff --git a/cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/domain/Car.java b/cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/domain/Car.java new file mode 100644 index 0000000..61c9e3f --- /dev/null +++ b/cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/domain/Car.java @@ -0,0 +1,154 @@ +package com.muyu.many.datasource.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.validation.annotation.Validated; + +import java.util.Date; + +/** + * @Author: zi run + * @Date 2024/9/23 23:33 + * @Description + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "sys_car", autoResultMap = true) +public class Car { + + /** + * 自增主键 + */ + @JsonFormat + @Schema + @NotNull + @Excel + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 车辆VIN码 + */ + @JsonFormat + @Schema + @Excel + @NotBlank + @TableField(value = "car_vin") + private String carVin; + + /** + * 车辆车牌号 + */ + @JsonFormat + @Schema + @Excel + @NotBlank + @TableField(value = "car_plate") + private String carPlate; + + /** + * 车辆品牌 + */ + @JsonFormat + @Schema + @Excel + @NotBlank + @TableField(value = "car_model") + private String carModel; + + /** + * 车辆类型 + */ + @JsonFormat + @Schema + @Excel + @NotBlank + @TableField(value = "car_type") + private String carType; + + /** + * 连线时间 + */ + @JsonFormat + @Schema + @Excel + @NotBlank + @TableField(value = "car_last_join_time") + private Date carLastJoinTime; + + /** + * 离线时间 + */ + @Schema + @Excel + @NotBlank + @TableField(value = "car_last_offline_time") + private Date carLastOfflineTime; + + /** + * 状态 + */ + @Schema + @Excel + @NotBlank + @TableField(value = "status") + private String status; + + /** + * 创建人 + */ + @Schema + @Excel + @NotBlank + @TableField(value = "create_by") + private String createBy; + + /** + * 创建时间 + */ + @Schema + @Excel + @NotBlank + @TableField(value = "create_time") + private Date createTime; + + /** + * 更新人 + */ + @Schema + @Excel + @NotBlank + @TableField(value = "update_by") + private String updateBy; + + /** + * 更新时间 + */ + @Schema + @Excel + @NotBlank + @TableField(value = "update_time") + private Date updateTime; + + /** + * 备注 + */ + @Schema + @Excel + @NotBlank + @TableField(value = "remark") + private String remark; +} diff --git a/cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/domain/FenceGroup.java b/cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/domain/FenceGroup.java new file mode 100644 index 0000000..f3a24b2 --- /dev/null +++ b/cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/domain/FenceGroup.java @@ -0,0 +1,100 @@ +package com.muyu.many.datasource.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: zi run + * @Date 2024/9/23 23:24 + * @Description + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "sys_corpuscle_fence", autoResultMap = true) +public class FenceGroup { + + /** + * 自增主键 + */ + @Schema + @Excel + @NotNull + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 围栏编码 + */ + @Schema + @Excel + @NotBlank + @TableField(value = "fence_code") + private String fenceCode; + + /** + * 业务类型 + */ + @Schema + @Excel + @NotEmpty + @TableField(value = "fence_business") + private String fenceBusiness; + + /** + * 围栏名称 + */ + @Schema + @Excel + @NotBlank + @TableField(value = "fence_name") + private String fenceName; + + /** + * 围栏类型 + */ + @Schema + @Excel + @NotNull + @TableField(value = "fence_type") + private String fenceType; + + /** + * 围栏位置 + */ + @Schema + @Excel + @NotBlank + @TableField(value = "fence_position") + private String fencePosition; + + /** + * 启动状态 + */ + @Schema + @Excel + @NotEmpty + @TableField(value = "status") + private String status; + + /** + * 描述信息 + */ + @Schema + @Excel + @NotBlank + @TableField(value = "fence_desc") + private String fenceDesc; +} diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml index a9089e2..408e060 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -53,4 +53,4 @@ spring: # xxl-job 配置文件 - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # rabbit 配置文件 - - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file