diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBox.java b/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBox.java new file mode 100644 index 0000000..ddb8ec1 --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBox.java @@ -0,0 +1,64 @@ +package com.god.base.server.common.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + + +/** + * 电池箱信息表 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName("t_battery_box") +public class BatteryBox { + + /** + * 电池箱主键 + */ + private long batteryBoxId; + /** + * 电池包编码 + */ + private String batteryBoxBatteryPackCoding; + /** + * 电池包型名称 + */ + private String batteryBoxName; + /** + * 电池型号编号 + */ + private String batteryBoxNumber; + /** + * 实际容量 + */ + private String batteryBoxActualCapacity; + /** + * 实际电压 + */ + private String batteryBoxVirtualVoltage; + /** + * 实际质量 + */ + private String batteryBoxActualMass; + /** + * 出厂时间 + */ + @DateTimeFormat + private Date batteryBoxDate; + /** + * 所在电池组编码 + */ + private long cellId; + /** + * 所在车辆VIN + */ + private String carVin; +} diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBoxModel.java b/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBoxModel.java new file mode 100644 index 0000000..f224dac --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBoxModel.java @@ -0,0 +1,56 @@ +package com.god.base.server.common.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 电池箱型号 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName("t_batteryBox_model") +public class BatteryBoxModel { + /** + * 电池箱型号主键 + */ + private long batteryBoxModelId; + /** + * 型号名称 + */ + private String batteryBoxModelName; + /** + * 型号编号 + */ + private String batteryBoxModelNumber; + /** + * 电池包规格代码 + */ + private String batteryBoxModelPackSpecificationCode; + /** + * 电池品牌 + */ + private int batteryBoxModelBrand; + /** + * 温度探针总数 + */ + private String batteryBoxModelTemperatureProbePopulation; + /** + * 模块串并联方式 + */ + private String batteryBoxModelModuleSeriesParallelMode; + /** + * 模块个数 + */ + private String batteryBoxModelNumberOfModules; + /** + * 生产厂商名称 + */ + private String batteryBoxModelManufacturerName; + + +} diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/Car.java b/car-base-common/src/main/java/com/god/base/server/common/domain/Car.java new file mode 100644 index 0000000..3ceef4a --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domain/Car.java @@ -0,0 +1,127 @@ +package com.god.base.server.common.domain; + + +import com.baomidou.mybatisplus.annotation.TableName; +import com.god.base.server.common.domain.request.CarRequest; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * 车辆信息 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName(value = "t_car") +public class Car { + /** + * 车辆Vin 主键 + */ + private String carVinId; + /** + * 单位id + */ + private long userId; + /** + * 车辆类型id + */ + private long carTypeId; + /** + * 电池箱信息id + */ + private long batteryBoxId; + /** + * 电池组id + */ + private long cellId; + /** + * 单体电池id + */ + private long batteryCellId; + /** + * 电池组模块id + */ + private long batteryPackInformationId; + /** + * 电子围栏ID + */ + private long fenceId; + /** + * 车牌号 + */ + private String carNumber; + /** + * 驱动机主键 + */ + private long driveMotorId; + /** + * 车辆总里程 + */ + private String carMileage; + /** + * 创建者 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新者 + */ + private String updateBy; + /** + * 更新时间 + */ + @DateTimeFormat + private Date updateTime; + /** + * 区域 + */ + private String address; + /** + * 电池厂商 + */ + private String batteryManufacturer; + /** + * 电机厂商 + */ + private String motorManufacturer; + /** + * 电机编号 + */ + private String motorNumber; + /** + * 电池编号 + */ + private String batteryNumber; + /** + * 逻辑删除 + */ + private int isDelete; + + + public static Car addReqBuild(CarRequest carRequest){ + return Car.builder() + //把所有的属性点都加上 + .carVinId(carRequest.getCarVinId()) + .carTypeId(carRequest.getCarTypeId()) + .batteryManufacturer(carRequest.getBatteryManufacturer()) + .motorManufacturer(carRequest.getMotorManufacturer()) + .motorNumber(carRequest.getMotorNumber()) + .batteryNumber(carRequest.getBatteryNumber()) + .batteryNumber(carRequest.getBatteryNumber()) + .build() + ; + } + + + + +} diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/CarType.java b/car-base-common/src/main/java/com/god/base/server/common/domain/CarType.java new file mode 100644 index 0000000..cb39128 --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domain/CarType.java @@ -0,0 +1,29 @@ +package com.god.base.server.common.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 车辆类型表 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName("t_carT_type") +public class CarType { + + /** + * 车辆类型主建 + */ + private long id; + /** + * 类型名称 + */ + private String carTypename; + + +} diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/Fence.java b/car-base-common/src/main/java/com/god/base/server/common/domain/Fence.java new file mode 100644 index 0000000..20dd588 --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domain/Fence.java @@ -0,0 +1,43 @@ +package com.god.base.server.common.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 电子围栏 + */ +@NoArgsConstructor +@AllArgsConstructor +@Data +@Builder +@TableName("t_fence") +public class Fence { + /** + * 围栏id + */ + private String fenceId; + /** + * 围栏经纬度串（逗号拼接字符串） + */ + private String fenceAddress; + /** + * 标签编号 + */ + private String labelId; + /** + * 创建时间 + */ + private String createTime; + /** + * 修改时间 + */ + private String updateTime; + /** + * 创建者 + */ + private String createBy; + +} diff --git a/car-base-common/src/main/java/com/god/base/server/common/domain/request/CarRequest.java b/car-base-common/src/main/java/com/god/base/server/common/domain/request/CarRequest.java new file mode 100644 index 0000000..a2ddded --- /dev/null +++ b/car-base-common/src/main/java/com/god/base/server/common/domain/request/CarRequest.java @@ -0,0 +1,58 @@ +package com.god.base.server.common.domain.request; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 车辆请求参数 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@NotNull +public class CarRequest { + + /** + * 车辆Vin 主键 + */ + @NotEmpty(message = "车辆vin不能为空") + private String carVinId; + /** + * 车辆类型 + */ + @NotEmpty(message = "车辆类型不能为空") + private long carTypeId; + /** + * 电子围栏ID + */ + @NotEmpty(message = "电子围栏不能为空") + private long fenceId; + /** + * 电池厂商 + */ + @NotEmpty(message = "电池厂商不能为空") + private String batteryManufacturer; + /** + * 电机厂商 + */ + @NotEmpty(message = "电机厂商不能为空") + private String motorManufacturer; + /** + * 电机编号 + */ + @NotEmpty(message = "电机编号不能为空") + private String motorNumber; + /** + * 电池编号 + */ + @NotEmpty(message = "电池编号不能为空") + private String batteryNumber; + + + + +} diff --git a/car-base-common/src/main/resources/banner.txt b/car-base-common/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/car-base-common/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/car-base-common/src/main/resources/bootstrap.yml b/car-base-common/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..403a368 --- /dev/null +++ b/car-base-common/src/main/resources/bootstrap.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9803 + +# Spring +spring: + application: + # 应用名称 + name: god-car-base + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: nacos.god.com:8848 + config: + # 配置中心地址 + server-addr: nacos.god.com:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.god.system.mapper: DEBUG diff --git a/car-base-common/src/main/resources/logback.xml b/car-base-common/src/main/resources/logback.xml new file mode 100644 index 0000000..4800c95 --- /dev/null +++ b/car-base-common/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/car-base-server/pom.xml b/car-base-server/pom.xml index f434546..f4257ee 100644 --- a/car-base-server/pom.xml +++ b/car-base-server/pom.xml @@ -59,6 +59,17 @@ com.mysql mysql-connector-j + + com.ruoyi + ruoyi-common-security + 3.6.3 + + + + com.baomidou + mybatis-plus-boot-starter + 3.4.2 + com.baomidou @@ -93,4 +104,4 @@ - \ No newline at end of file + diff --git a/car-base-server/src/main/java/com/god/base/server/GodCarBaseApplication.java b/car-base-server/src/main/java/com/god/base/server/GodCarBaseApplication.java index bcf1604..49d14d9 100644 --- a/car-base-server/src/main/java/com/god/base/server/GodCarBaseApplication.java +++ b/car-base-server/src/main/java/com/god/base/server/GodCarBaseApplication.java @@ -17,6 +17,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class GodCarBaseApplication { public static void main (String[] args) { - SpringApplication.run(com.god.base.server.GodCarBaseApplication .class, args); + SpringApplication.run(GodCarBaseApplication.class, args); } } diff --git a/car-base-server/src/main/java/com/god/base/server/controller/CarController.java b/car-base-server/src/main/java/com/god/base/server/controller/CarController.java new file mode 100644 index 0000000..4f6fab7 --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/controller/CarController.java @@ -0,0 +1,77 @@ +package com.god.base.server.controller; +import com.god.base.server.common.domain.Car; +import com.god.base.server.common.domain.request.CarRequest; +import com.god.base.server.service.CarService; +import com.ruoyi.common.core.domain.R; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 车辆管理 + */ +@RestController +@RequestMapping("/car") +@Log4j2 +public class CarController { + @Autowired + private CarService carService; + + + /** + * 车辆信息查看 + */ + @GetMapping("carList/{userId}") + public R carList(@PathVariable String userId){ + log.info("请求参数" + userId); + R> carList = carService.carList(userId); + log.info("响应参数" + carList); + return R.ok(carList); + } + + + /** + * 添加车辆 + */ + @PostMapping("/addCar") + public R addCarP(@RequestBody @Validated CarRequest carRequest){ + log.info("请求参数" + carRequest); + boolean save = carService.save(Car.addReqBuild(carRequest)); + log.info("响应参数" + save); + return R.ok(); + } + /** + * 修改车辆的连接 进行上报 + */ + @PostMapping("/updCar/{vinId}") + public R updCat(@PathVariable @Validated String vinId){ + log.info("请求参数" + vinId); + carService.updateById(vinId); + log.info("响应参数" + vinId); + return R.ok(); + } + + /** + * 逻辑删除 + */ + @PostMapping("/delCar/{vinId}") + public R delCar(@PathVariable String vinId){ + log.info("请求参数" + vinId); + boolean b = carService.removeById(vinId); + log.info("响应参数" + b); + return R.ok(); + } + + /** + * 实时轨迹 + */ + @PostMapping + public R sSgj(){ + return null; + } + + +} diff --git a/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java b/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java new file mode 100644 index 0000000..70785fa --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java @@ -0,0 +1,19 @@ +package com.god.base.server.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.god.base.server.common.domain.Car; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +/** + * 车辆mapper + */ +@Mapper +public interface CarMapper extends BaseMapper { + + List getList(@Param("userId1") Long userId1); +} diff --git a/car-base-server/src/main/java/com/god/base/server/service/CarService.java b/car-base-server/src/main/java/com/god/base/server/service/CarService.java new file mode 100644 index 0000000..6e92a2a --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/service/CarService.java @@ -0,0 +1,21 @@ +package com.god.base.server.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.god.base.server.common.domain.Car; +import com.ruoyi.common.core.domain.R; +import org.apache.ibatis.annotations.Param; + + +import java.util.List; + +/** + * 车辆管理层 + */ +public interface CarService extends IService { + + + R> carList(@Param("userId") String userId); + + void updateById(@Param("vinId") String vinId); +} diff --git a/car-base-server/src/main/java/com/god/base/server/test/5.html b/car-base-server/src/main/java/com/god/base/server/test/5.html new file mode 100644 index 0000000..3d946d4 --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/test/5.html @@ -0,0 +1,89 @@ + + + + + Title + + +开始搭建围栏 + +
+ + + + + centers: ["116.400274 , 39.9322"], +
+ + + + + + + diff --git a/car-base-server/src/main/java/com/god/base/server/test/Test.html b/car-base-server/src/main/java/com/god/base/server/test/Test.html new file mode 100644 index 0000000..b32a738 --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/test/Test.html @@ -0,0 +1,30 @@ + + + + + + + + 地图显示 + + + +
+ + + + + diff --git a/car-base-server/src/main/java/com/god/base/server/test/Test2.html b/car-base-server/src/main/java/com/god/base/server/test/Test2.html new file mode 100644 index 0000000..473ee34 --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/test/Test2.html @@ -0,0 +1,81 @@ + + + + + + + + 多边形的绘制和编辑 + + + + + +
+
+ + +
+ + + diff --git a/car-base-server/src/main/java/com/god/base/server/test/Test3.html b/car-base-server/src/main/java/com/god/base/server/test/Test3.html new file mode 100644 index 0000000..376e220 --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/test/Test3.html @@ -0,0 +1,145 @@ + + + + + Title + + + + + +开始建围栏点击开始建立围栏后，围栏操作按钮才可见 + +
+ + + + + +
+ + + + diff --git a/car-base-server/src/main/java/com/god/base/server/test/Test4.html b/car-base-server/src/main/java/com/god/base/server/test/Test4.html new file mode 100644 index 0000000..22871dc --- /dev/null +++ b/car-base-server/src/main/java/com/god/base/server/test/Test4.html @@ -0,0 +1,82 @@ + + + + + Title + + + + + + + + diff --git a/car-base-server/src/main/resources/bootstrap.yml b/car-base-server/src/main/resources/bootstrap.yml index 21efc42..df297f8 100644 --- a/car-base-server/src/main/resources/bootstrap.yml +++ b/car-base-server/src/main/resources/bootstrap.yml @@ -4,9 +4,11 @@ server: # Spring spring: +# main: +# allow-bean-definition-overriding: true application: # 应用名称 - name: god-car-base + name: god-car-management profiles: # 环境配置 active: dev diff --git a/car-base-server/src/main/resources/mapper/CarMapper.xml b/car-base-server/src/main/resources/mapper/CarMapper.xml new file mode 100644 index 0000000..761df06 --- /dev/null +++ b/car-base-server/src/main/resources/mapper/CarMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + +