diff --git a/fivegroup-gateway/src/main/resources/bootstrap.yml b/fivegroup-gateway/src/main/resources/bootstrap.yml index cd21605..f8f955d 100644 --- a/fivegroup-gateway/src/main/resources/bootstrap.yml +++ b/fivegroup-gateway/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 8087 + port: 8085 # Spring spring: application: diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/controller/HistoryTrackController.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/controller/HistoryTrackController.java deleted file mode 100644 index 16c4bc2..0000000 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/controller/HistoryTrackController.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.fivegroup.trajectory.controller; - -import com.fivegroup.common.core.domain.Result; -import com.fivegroup.common.log.annotation.WebLog; -import com.fivegroup.trajectory.domain.HistoryTrack; -import com.fivegroup.trajectory.service.HistoryTrackService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * 历史数据操作处理 - * - * @author fivegroup - */ -@RestController -@RequestMapping("/historyTrack") -public class HistoryTrackController { - @Autowired - private HistoryTrackService historyTrackService; - - @WebLog(name = "历史数据查询") - @GetMapping("/vehicleHistoryTrack") - public Result> vehicleHistoryTrack(@RequestParam("vehicleId") Integer vehicleId) { - return historyTrackService.vehicleHistoryTrack(vehicleId); - } - -} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/controller/TrackController.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/controller/TrackController.java index 25bbc64..9b0ccde 100644 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/controller/TrackController.java +++ b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/controller/TrackController.java @@ -2,7 +2,7 @@ package com.fivegroup.trajectory.controller; import com.fivegroup.common.core.domain.Result; import com.fivegroup.common.log.annotation.WebLog; -import com.fivegroup.trajectory.domain.Track; +import com.fivegroup.trajectory.domain.VehicleData; import com.fivegroup.trajectory.service.TrackService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -23,15 +23,8 @@ public class TrackController { @WebLog(name = "查看车辆实时轨迹") @GetMapping("/vehicleTrack") - public Result> vehicleTrack(@RequestParam("vehicleId") Integer vehicleId) { - return trackService.vehicleTrack(vehicleId); + public Result> trackList(@RequestParam("vehicleVin") String vehicleVin) { + return trackService.trackList(vehicleVin); } - @WebLog(name = "添加数据") - @PostMapping("/insertTrack") - public Result insertTrack(@RequestBody Track track) { - return trackService.insertTrack(track); - } - - } diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/controller/VehicleController.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/controller/VehicleController.java index 40bd16c..4ba8a6b 100644 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/controller/VehicleController.java +++ b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/controller/VehicleController.java @@ -1,82 +1,56 @@ package com.fivegroup.trajectory.controller; -import com.fivegroup.common.core.domain.Result; import com.fivegroup.common.log.annotation.WebLog; -import com.fivegroup.trajectory.domain.*; +import com.fivegroup.trajectory.domain.Vehicle; +import com.fivegroup.trajectory.domain.VehicleType; import com.fivegroup.trajectory.service.VehicleService; +import com.fivegroup.common.core.domain.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * 车辆数据操作处理 - * - * @author fivegroup - */ @RestController @RequestMapping("/vehicle") public class VehicleController { @Autowired private VehicleService vehicleService; - @WebLog(name = "查询在线的车辆") + @WebLog(name = "车辆列表") @GetMapping("/vehicleList") public Result> vehicleList() { return vehicleService.vehicleList(); } - @WebLog(name = "新增车辆") - @PostMapping("/insertVehicle") - public Result insertVehicle(@RequestBody Vehicle vehicle){ - return vehicleService.insertVehicle(vehicle); - } - - @WebLog(name = "回显") - @GetMapping("/getVehicleByVehicleId") - public Result getVehicleByVehicleId(@RequestParam("vehicleId") Integer vehicleId) { - return vehicleService.getVehicleByVehicleId(vehicleId); - } - - @WebLog(name = "修改车辆状态") - @PostMapping("/updateVehicle") - public Result updateVehicleStatus(@RequestBody Vehicle vehicle){ - return vehicleService.updateVehicleStatus(vehicle); - } - - @WebLog(name = "删除车辆信息") - @DeleteMapping("/deleteVehicle") - public Result deleteVehicle(@RequestParam("vehicleId") Integer vehicleId) { - return vehicleService.deleteVehicle(vehicleId); - } - - @WebLog(name = "车辆类型") + @WebLog(name ="车辆类型") @GetMapping("/vehicleTypeList") public Result> vehicleTypeList() { return vehicleService.vehicleTypeList(); } - @WebLog(name = "电池制造商") - @GetMapping("/batteryMerchantList") - public Result> batteryMerchantList() { - return vehicleService.batteryMerchantList(); + @WebLog(name = "新增车辆") + @PostMapping("/insertVehicle") + public Result insertVehicle(@RequestBody Vehicle vehicle) { + return vehicleService.insertVehicle(vehicle); } - @WebLog(name = "电池") - @GetMapping("/batteryList") - public Result> batteryList() { - return vehicleService.batteryList(); + @WebLog(name = "删除车辆") + @DeleteMapping("/deleteVehicle") + public Result deleteVehicle(@RequestParam("vehicleId") Integer vehicleId) { + return vehicleService.deleteVehicle(vehicleId); } - @WebLog(name = "电机制造商") - @GetMapping("/motorMerchantList") - public Result> motorMerchantList() { - return vehicleService.motorMerchantList(); + @WebLog(name = "查询车辆") + @GetMapping("/findVehicleById") + public Result findVehicleById(@RequestParam("vehicleId") Integer vehicleId) { + return vehicleService.findVehicleById(vehicleId); } - @WebLog(name = "电机") - @GetMapping("/motorList") - public Result> motorList() { - return vehicleService.motorList(); + @WebLog(name = "修改车辆") + @PutMapping("/updateVehicle") + public Result updateVehicle(@RequestBody Vehicle vehicle) { + return vehicleService.updateVehicle(vehicle); } + + } diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/Battery.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/Battery.java deleted file mode 100644 index 714bff9..0000000 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/Battery.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.fivegroup.trajectory.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 电池表 v_battery - * - * @author fivegroup - */ - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class Battery { - /** - * 电池ID - */ - private int batteryId; - - /** - * 电池名称 - */ - private String batteryName; -} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/BatteryMerchant.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/BatteryMerchant.java deleted file mode 100644 index c274909..0000000 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/BatteryMerchant.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.fivegroup.trajectory.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 电池厂商表 v_battery_merchant - * - * @author fivegroup - */ - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class BatteryMerchant { - /** - * 电池厂商ID - */ - private int batteryMerchantId; - - /** - * 电池厂商名称 - */ - private String batteryMerchantName; -} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/HistoryTrack.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/HistoryTrack.java deleted file mode 100644 index 1f9ab27..0000000 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/HistoryTrack.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.fivegroup.trajectory.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 历史轨迹表 v_history_track - * - * @author fivegroup - */ - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class HistoryTrack { - /** - * 历史轨迹ID - */ - private int trackId; - - /** - * 车辆ID - */ - private int vehicleId; - - /** - * 开始经度 - */ - private double startLatitude; - - /** - * 开始纬度 - */ - private double startLongitude; - - /** - * 结束经度 - */ - private double endLatitude; - - /** - * 结束纬度 - */ - private double endLongitude; -} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/Motor.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/Motor.java deleted file mode 100644 index d4b02e8..0000000 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/Motor.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.fivegroup.trajectory.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 电机表 v_motor - * - * @author fivegroup - */ - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class Motor { - /** - * 电机ID - */ - private int motorId; - - /** - * 电机名称 - */ - private String motorName; -} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/MotorMerchant.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/MotorMerchant.java deleted file mode 100644 index 7c24445..0000000 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/MotorMerchant.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.fivegroup.trajectory.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 电机厂商表 v_motor_merchant - * - * @author fivegroup - */ - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MotorMerchant { - /** - * 电机厂商ID - */ - private int motorMerchantId; - - /** - * 电机厂商名称 - */ - private String motorMerchantName; -} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/Track.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/Track.java deleted file mode 100644 index d261772..0000000 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/Track.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.fivegroup.trajectory.domain; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * 实时轨迹表 v_track - * - * @author fivegroup - */ - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class Track { - /** - * 实时轨迹ID - */ - private int trackId; - - /** - * 车辆ID - */ - private int vehicleId; - - /** - * 经度 - */ - private double latitude; - - /** - * 纬度 - */ - private double longitude; - - /** - * 时间戳 - */ - private Date timestamp; -} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/Vehicle.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/Vehicle.java index bc141cd..a511576 100644 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/Vehicle.java +++ b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/Vehicle.java @@ -1,12 +1,9 @@ package com.fivegroup.trajectory.domain; -import lombok.*; - -/** - * 车辆表 v_vehicle - * - * @author fivegroup - */ +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; @Data @Builder @@ -14,79 +11,20 @@ import lombok.*; @AllArgsConstructor public class Vehicle { - /** - * 车辆ID - */ private int vehicleId; - /** - * 车辆车牌号 - */ - private String vehiclePlateNumber; - - /** - * 车辆VIN号 - */ private String vehicleVin; - /** - * 品牌名称 - */ - private String vehicleBrand; - - /** - * 车辆类型Id - */ private int vehicleTypeId; - - /** - * 车辆类型名称 - */ private String vehicleTypeName; - /** - * 电机厂商Id - */ - private int motorMerchantId; + private int wallId; - /** - * 电机厂商名称 - */ - private String motorMerchantName; + private String motorMerchant; - /** - * 电机Id - */ - private int motorId; + private String batteryMerchant; - /** - * 电机名称 - */ - private String motorName; - - /** - * 电池厂商Id - */ - private int batteryMerchantId; - - /** - * 电池厂商名称 - */ - private String batteryMerchantName; - - /** - * 电池Id - */ - private int batteryId; - - /** - * 电池名称 - */ - private String batteryName; - - /** - * 车辆状态 - */ - private String vehicleStatus; + private String motor; + private String battery; } diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/VehicleData.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/VehicleData.java new file mode 100644 index 0000000..5917910 --- /dev/null +++ b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/VehicleData.java @@ -0,0 +1,308 @@ +package com.fivegroup.trajectory.domain; + +import lombok.*; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 车辆所有数据 + * + * @author ZhangXushuo + * @version 2023/12/4 - 21:28 + */ +@Data +@ToString +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class VehicleData { + /** + * 主键id + */ + + private Integer id; + + /** + * VIN + */ + private String vin; + + /** + * 时间戳 + */ + private Date createTime; + + /** + * 经度 + */ + private String longitude; + + /** + * 维度 + */ + private String latitude; + + /** + * 速度 + */ + private String speed; + + /** + * 里程 + */ + private BigDecimal mileage; + + /** + * 总电压 + */ + private String voltage; + + /** + * 总电流 + */ + private String current; + + /** + * 绝缘电阻 + */ + private String resistance; + + /** + * 档位 + */ + private String gear; + + /** + * 加速踏板行程值 + */ + private String accelerationPedal; + + /** + * 制动踏板行程值 + */ + private String brakePedal; + + /** + * 燃料消耗率 + */ + private String fuelConsumptionRate; + + /** + * 电机控制器温度 + */ + private String motorControllerTemperature; + + /** + * 电机转速 + */ + private String motorSpeed; + + /** + * 电机转矩 + */ + private String motorTorque; + + /** + * 电机温度 + */ + private String motorTemperature; + + /** + * 电机电压 + */ + private String motorVoltage; + + /** + * 电机电流 + */ + private String motorCurrent; + + /** + * 动力电池剩余电量SOC + */ + private BigDecimal remainingBattery; + + + /** + * 当前状态允许的最大反馈功率 + */ + private String maximumFeedbackPower; + + /** + * 当前状态允许最大放电功率 + */ + private String maximumDischargePower; + + /** + * BMS自检计数器 + */ + private String selfCheckCounter; + + /** + * 动力电池充放电电流 + */ + private String totalBatteryCurrent; + + /** + * 动力电池负载端总电压V3 + */ + private String totalBatteryVoltage; + + /** + * 单次最大电压 + */ + private String singleBatteryMaxVoltage; + + /** + * 单体电池最低电压 + */ + private String singleBatteryMinVoltage; + + /** + * 单体电池最高温度 + */ + private String singleBatteryMaxTemperature; + + /** + * 单体电池最低温度 + */ + private String singleBatteryMinTemperature; + + /** + * 动力电池可用容量 + */ + private String availableBatteryCapacity; + + /** + * 车辆状态 + */ + private int vehicleStatus; + + /** + * 充电状态 + */ + private int chargingStatus; + + /** + * 运行状态 + */ + private int operatingStatus; + + /** + * SOC + */ + private int socStatus; + + /** + * 可充电储能装置工作状态 + */ + private int chargingEnergyStorageStatus; + + /** + * 驱动电机状态 + */ + private int driveMotorStatus; + + /** + * 定位是否有效 + */ + private int positionStatus; + + /** + * EAS(汽车防盗系统)状态 + */ + private int easStatus; + + /** + * PTC(电动加热器)状态 + */ + private int ptcStatus; + + /** + * EPS(电动助力系统)状态 + */ + private int epsStatus; + + /** + * ABS(防抱死)状态 + */ + private int absStatus; + + /** + * MCU(电机/逆变器)状态 + */ + private int mcuStatus; + + /** + * 动力电池加热状态 + */ + private int heatingStatus; + + /** + * 动力电池当前状态 + */ + private int batteryStatus; + + /** + * 动力电池保温状态 + */ + private int batteryInsulationStatus; + + + public static VehicleData getBuild(String messages) { + char start = messages.charAt(0); + char end = messages.charAt(messages.length() - 1); + System.out.println(start); + System.out.println(end); + return VehicleData.builder() + .vin(messages.substring(1, 18)) + //messages.substring(18, 31) + .createTime(new Date()) + .longitude(messages.substring(31, 42)) + .latitude(messages.substring(42, 52)) + .speed(messages.substring(52, 58)) + .mileage(new BigDecimal(messages.substring(58, 69))) + .voltage(messages.substring(69, 75)) + .current(messages.substring(75, 80)) + .resistance(messages.substring(80, 89)) + .gear(messages.substring(89, 90)) + .accelerationPedal(messages.substring(90, 92)) + .brakePedal(messages.substring(92, 94)) + .fuelConsumptionRate(messages.substring(94, 99)) + .motorControllerTemperature(messages.substring(99, 105)) + .motorSpeed(messages.substring(105, 110)) + .motorTorque(messages.substring(110, 114)) + .motorTemperature(messages.substring(114, 120)) + .motorVoltage(messages.substring(120, 125)) + .motorCurrent(messages.substring(125, 133)) + .remainingBattery(new BigDecimal(messages.substring(133, 139))) + .maximumFeedbackPower(messages.substring(139, 145)) + .maximumDischargePower(messages.substring(145, 151)) + .selfCheckCounter(messages.substring(151, 153)) + .totalBatteryCurrent(messages.substring(153, 158)) + .totalBatteryVoltage(messages.substring(158, 164)) + .singleBatteryMaxVoltage(messages.substring(164, 168)) + .singleBatteryMinVoltage(messages.substring(168, 172)) + .singleBatteryMaxTemperature(messages.substring(172, 178)) + .singleBatteryMinTemperature(messages.substring(178, 184)) + .availableBatteryCapacity(messages.substring(184, 190)) + .vehicleStatus(Integer.valueOf(messages.substring(190, 191))) + .chargingStatus(Integer.valueOf(messages.substring(191, 192))) + .operatingStatus(Integer.valueOf(messages.substring(192, 193))) + .socStatus(Integer.valueOf(messages.substring(193, 194))) + .chargingEnergyStorageStatus(Integer.valueOf(messages.substring(194, 195))) + .driveMotorStatus(Integer.valueOf(messages.substring(195, 196))) + .positionStatus(Integer.valueOf(messages.substring(196, 197))) + .easStatus(Integer.valueOf(messages.substring(197, 198))) + .ptcStatus(Integer.valueOf(messages.substring(198, 199))) + .epsStatus(Integer.valueOf(messages.substring(199, 200))) + .absStatus(Integer.valueOf(messages.substring(200, 201))) + .mcuStatus(Integer.valueOf(messages.substring(201, 202))) + .heatingStatus(Integer.valueOf(messages.substring(202, 203))) + .batteryStatus(Integer.valueOf(messages.substring(203, 204))) + .batteryInsulationStatus(Integer.valueOf(messages.substring(204, 205))) + .build(); + + } +} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/VehicleType.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/VehicleType.java index 68bd0dc..0a52caa 100644 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/VehicleType.java +++ b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/domain/VehicleType.java @@ -1,28 +1,10 @@ package com.fivegroup.trajectory.domain; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 车辆类型表 v_vehicle_type - * - * @author fivegroup - */ @Data -@Builder -@NoArgsConstructor -@AllArgsConstructor public class VehicleType { - /** - * 车辆类型ID - */ private int vehicleTypeId; - /** - * 车辆类型名称 - */ private String vehicleTypeName; } diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/mapper/HistoryTrackMapper.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/mapper/HistoryTrackMapper.java deleted file mode 100644 index 6826da7..0000000 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/mapper/HistoryTrackMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fivegroup.trajectory.mapper; - -import com.fivegroup.trajectory.domain.HistoryTrack; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - - -/** - * 历史数据 数据层 - * - * @author fivegroup - */ -@Mapper -public interface HistoryTrackMapper { - List vehicleHistoryTrack(@Param("vehicleId") Integer vehicleId); -} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/mapper/TrackMapper.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/mapper/TrackMapper.java index 216b547..88e5c77 100644 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/mapper/TrackMapper.java +++ b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/mapper/TrackMapper.java @@ -1,6 +1,7 @@ package com.fivegroup.trajectory.mapper; -import com.fivegroup.trajectory.domain.Track; + +import com.fivegroup.trajectory.domain.VehicleData; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,7 +15,6 @@ import java.util.List; */ @Mapper public interface TrackMapper { - List vehicleTrack(@Param("vehicleId") Integer vehicleId); - Integer insertTrack(Track track); + List getVehicleDate(@Param("vehicleVin") String vehicleVin); } diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/mapper/VehicleMapper.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/mapper/VehicleMapper.java index 108397c..5b1cd2e 100644 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/mapper/VehicleMapper.java +++ b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/mapper/VehicleMapper.java @@ -1,36 +1,23 @@ package com.fivegroup.trajectory.mapper; -import com.fivegroup.common.core.trajectory.Brand; -import com.fivegroup.trajectory.domain.*; +import com.fivegroup.trajectory.domain.Vehicle; +import com.fivegroup.trajectory.domain.VehicleType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; -/** - * 车辆查询 数据层 - * - * @author fivegroup - */ @Mapper public interface VehicleMapper { List vehicleList(); - Integer insertVehicle(Vehicle vehicle); + List vehicleTypeList(); - Integer updateVehicleStatus(Vehicle vehicle); + int insertVehicle(Vehicle vehicle); int deleteVehicle(@Param("vehicleId") Integer vehicleId); - Vehicle getVehicleByVehicleId(@Param("vehicleId") Integer vehicleId); + Vehicle findVehicleById(@Param("vehicleId") Integer vehicleId); - List vehicleTypeList(); - - List batteryMerchantList(); - - List batteryList(); - - List motorMerchantList(); - - List motorList(); + int updateVehicle(Vehicle vehicle); } diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/HistoryTrackService.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/HistoryTrackService.java deleted file mode 100644 index bd3fe38..0000000 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/HistoryTrackService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.fivegroup.trajectory.service; - -import com.fivegroup.common.core.domain.Result; -import com.fivegroup.trajectory.domain.HistoryTrack; - -import java.util.List; -/** - * 历史数据查询 服务层 - * - * @author fivegroup - */ -public interface HistoryTrackService { - Result> vehicleHistoryTrack(Integer vehicleId); -} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/TrackService.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/TrackService.java index b42bb60..8e1b877 100644 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/TrackService.java +++ b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/TrackService.java @@ -1,7 +1,7 @@ package com.fivegroup.trajectory.service; import com.fivegroup.common.core.domain.Result; -import com.fivegroup.trajectory.domain.Track; +import com.fivegroup.trajectory.domain.VehicleData; import org.springframework.stereotype.Service; import java.util.List; @@ -13,7 +13,7 @@ import java.util.List; */ @Service public interface TrackService { - Result> vehicleTrack(Integer vehicleId); - Result insertTrack(Track track); + + Result> trackList(String vehicleVin); } diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/VehicleService.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/VehicleService.java index 2f89b02..de5aef9 100644 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/VehicleService.java +++ b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/VehicleService.java @@ -1,33 +1,22 @@ package com.fivegroup.trajectory.service; + import com.fivegroup.common.core.domain.Result; -import com.fivegroup.common.core.trajectory.Brand; -import com.fivegroup.trajectory.domain.*; +import com.fivegroup.trajectory.domain.Vehicle; +import com.fivegroup.trajectory.domain.VehicleType; import java.util.List; -/** - * 车辆查询 服务层 - * - * @author fivegroup - */ + public interface VehicleService { Result> vehicleList(); - Result insertVehicle(Vehicle vehicle); - - Result updateVehicleStatus(Vehicle vehicle); - - Result deleteVehicle(Integer vehicleId); - - Result getVehicleByVehicleId(Integer vehicleId); - Result> vehicleTypeList(); - Result> batteryMerchantList(); + Result insertVehicle(Vehicle vehicle); - Result> batteryList(); + Result deleteVehicle(Integer vehicleId); - Result> motorMerchantList(); + Result findVehicleById(Integer vehicleId); - Result> motorList(); + Result updateVehicle(Vehicle vehicle); } diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/impl/HistoryTrackServiceImpl.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/impl/HistoryTrackServiceImpl.java deleted file mode 100644 index e51de9e..0000000 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/impl/HistoryTrackServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.fivegroup.trajectory.service.impl; - -import com.fivegroup.common.core.domain.Result; -import com.fivegroup.trajectory.domain.HistoryTrack; -import com.fivegroup.trajectory.mapper.HistoryTrackMapper; -import com.fivegroup.trajectory.service.HistoryTrackService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -/** - * 历史数据 业务层处理 - * - * @author fivegroup - */ -@Service -public class HistoryTrackServiceImpl implements HistoryTrackService { - @Autowired - private HistoryTrackMapper historyTrackMapper; - - @Override - public Result> vehicleHistoryTrack(Integer vehicleId) { - List historyTracks = historyTrackMapper.vehicleHistoryTrack(vehicleId); - return Result.success(historyTracks); - } -} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/impl/TrackServiceImpl.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/impl/TrackServiceImpl.java index 1417f3b..66a2194 100644 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/impl/TrackServiceImpl.java +++ b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/impl/TrackServiceImpl.java @@ -1,12 +1,12 @@ package com.fivegroup.trajectory.service.impl; import com.fivegroup.common.core.domain.Result; +import com.fivegroup.trajectory.domain.VehicleData; import com.fivegroup.trajectory.mapper.TrackMapper; import com.fivegroup.trajectory.service.TrackService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.fivegroup.trajectory.domain.Track; import java.util.List; @@ -23,19 +23,11 @@ public class TrackServiceImpl implements TrackService { @Override - public Result> vehicleTrack(Integer vehicleId) { - List trackList = trackMapper.vehicleTrack(vehicleId); - return Result.success(trackList,"查询成功"); - } - - @Override - public Result insertTrack(Track track) { - Integer i = trackMapper.insertTrack(track); - if (i>0) { - return Result.success(i,"数据接收成功"); + public Result> trackList(String vehicleVin) { + List vehicleDate = trackMapper.getVehicleDate(vehicleVin); + if (vehicleDate!=null) { + return Result.success(vehicleDate,"经度纬度查询成功"); } - return Result.error(i,"数据接收失败"); + return Result.error("没有数据"); } - - } diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/impl/VehicleIServiceImpl.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/impl/VehicleIServiceImpl.java deleted file mode 100644 index 8edbcbf..0000000 --- a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/impl/VehicleIServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.fivegroup.trajectory.service.impl; - -import com.fivegroup.common.core.domain.Result; -import com.fivegroup.common.core.trajectory.Brand; -import com.fivegroup.trajectory.domain.*; -import com.fivegroup.trajectory.mapper.VehicleMapper; -import com.fivegroup.trajectory.service.VehicleService; -import lombok.extern.log4j.Log4j2; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 车辆查询 业务层处理 - * - * @author fivegroup - */ -@Log4j2 -@Service -public class VehicleIServiceImpl implements VehicleService { - @Autowired - private VehicleMapper vehicleMapper; - - @Override - public Result> vehicleList() { - List vehicles = vehicleMapper.vehicleList(); - return Result.success(vehicles,"全部车辆查询成功"); - } -// - @Override - public Result insertVehicle(Vehicle vehicle) { - Integer i = vehicleMapper.insertVehicle(vehicle); - if (i > 0) { - return Result.success("新增成功"); - } - return Result.error("新增失败"); - } - - @Override - public Result updateVehicleStatus(Vehicle vehicle) { - Integer i = vehicleMapper.updateVehicleStatus(vehicle); - if (i > 0) { - return Result.success("更新成功"); - } - return Result.error("更新失败"); - } - - @Override - public Result deleteVehicle(Integer vehicleId) { - try { - vehicleMapper.deleteVehicle(vehicleId); - return Result.success("删除成功"); - } catch (Exception e) { - // 记录异常日志 - log.error("删除车辆信息失败", e); - return Result.error("删除失败"); - } - } - - @Override - public Result getVehicleByVehicleId(Integer vehicleId) { - Vehicle vehicle = vehicleMapper.getVehicleByVehicleId(vehicleId); - return Result.success(vehicle,"车辆查询成功"); - } - - @Override - public Result> vehicleTypeList() { - List vehicleTypeList = vehicleMapper.vehicleTypeList(); - return Result.success(vehicleTypeList,"车辆类型查询成功"); - } - - @Override - public Result> batteryMerchantList() { - List batteryMerchantList = vehicleMapper.batteryMerchantList(); - return Result.success(batteryMerchantList,"电池厂家查询成功"); - } - - @Override - public Result> batteryList() { - List batteryList = vehicleMapper.batteryList(); - return Result.success(batteryList,"电池查询成功"); - } - - @Override - public Result> motorMerchantList() { - List motorMerchantList = vehicleMapper.motorMerchantList(); - return Result.success(motorMerchantList,"电机厂商查询成功"); - } - - @Override - public Result> motorList() { - List motorList = vehicleMapper.motorList(); - return Result.success(motorList,"电机查询成功"); - } - - -} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/impl/VehicleServiceImpl.java b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/impl/VehicleServiceImpl.java new file mode 100644 index 0000000..7b6b6b7 --- /dev/null +++ b/fivegroup-modules/fivegroup-trajectory/src/main/java/com/fivegroup/trajectory/service/impl/VehicleServiceImpl.java @@ -0,0 +1,57 @@ +package com.fivegroup.trajectory.service.impl; + +import com.fivegroup.common.core.domain.Result; +import com.fivegroup.trajectory.domain.Vehicle; +import com.fivegroup.trajectory.domain.VehicleType; +import com.fivegroup.trajectory.mapper.VehicleMapper; +import com.fivegroup.trajectory.service.VehicleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +@Service +public class VehicleServiceImpl implements VehicleService { + @Autowired + private VehicleMapper vehicleMapper; + @Override + public Result> vehicleList() { + List vehicleList = vehicleMapper.vehicleList(); + return Result.success(vehicleList,"查询成功"); + } + + @Override + public Result> vehicleTypeList() { + List vehicleTypeList = vehicleMapper.vehicleTypeList(); + return Result.success(vehicleTypeList,"查询成功"); + } + + @Override + public Result insertVehicle(Vehicle vehicle) { + if(vehicleMapper.insertVehicle(vehicle)>0){ + return Result.success("添加成功"); + } + return Result.error("添加失败"); + } + + @Override + public Result deleteVehicle(Integer vehicleId) { + if(vehicleMapper.deleteVehicle(vehicleId)>0){ + return Result.success("删除成功"); + } + return Result.error("删除失败"); + } + + @Override + public Result findVehicleById(Integer vehicleId) { + Vehicle vehicle = vehicleMapper.findVehicleById(vehicleId); + return Result.success(vehicle,"查询成功"); + } + + @Override + public Result updateVehicle(Vehicle vehicle) { + if(vehicleMapper.updateVehicle(vehicle)>0){ + return Result.success("修改成功"); + } + return Result.success("修改失败"); + } +} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/resources/mapper/HistoryTrackMapper.xml b/fivegroup-modules/fivegroup-trajectory/src/main/resources/mapper/HistoryTrackMapper.xml deleted file mode 100644 index 6228c93..0000000 --- a/fivegroup-modules/fivegroup-trajectory/src/main/resources/mapper/HistoryTrackMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/resources/mapper/TrackMapper.xml b/fivegroup-modules/fivegroup-trajectory/src/main/resources/mapper/TrackMapper.xml index 65f21fa..f4cb801 100644 --- a/fivegroup-modules/fivegroup-trajectory/src/main/resources/mapper/TrackMapper.xml +++ b/fivegroup-modules/fivegroup-trajectory/src/main/resources/mapper/TrackMapper.xml @@ -1,24 +1,15 @@ - - INSERT INTO v_track ( track_id, vehicle_id, latitude, longitude, timestamp ) - VALUES - ( 0, #{vehicleId}, #{latitude}, #{longitude}, Now() ); - - - SELECT - track_id, - vehicle_id, - latitude, - longitde, - timestamp + longitude, + latitude FROM - v_track + t_vehicle WHERE - vehicle_id = #{vehicleId} + vin = #{vehicleVin} diff --git a/fivegroup-modules/fivegroup-trajectory/src/main/resources/mapper/VehicleMapper.xml b/fivegroup-modules/fivegroup-trajectory/src/main/resources/mapper/VehicleMapper.xml index abda913..e56bf54 100644 --- a/fivegroup-modules/fivegroup-trajectory/src/main/resources/mapper/VehicleMapper.xml +++ b/fivegroup-modules/fivegroup-trajectory/src/main/resources/mapper/VehicleMapper.xml @@ -1,69 +1,68 @@ - - INSERT INTO v_vehicle ( vehicle_id, vehicle_vin,vehicle_plateNumber, vehicle_brand, vehicle_type_id, battery_merchant_id, battery_id, motor_merchant_id, motor_id, vehicle_status ) - VALUES - ( 0, #{vehicleVin}, #{vehiclePlateNumber},#{vehicleBrand}, #{vehicleTypeId}, #{batteryMerchantId}, #{batteryId}, #{motorMerchantId}, #{motorId}, 0 ); + + INSERT INTO v_vehicle ( + vehicle_vin, + vehicle_type_id, + wall_id, + motor_merchant, + battery_merchant, + motor, + battery + ) VALUES ( + #{vehicleVin}, + #{vehicleTypeId}, + #{wallId}, + #{motorMerchant}, + #{batteryMerchant}, + #{motor}, + #{battery} + ) - - UPDATE v_vehicle - SET vehicle_vin = #{vehicleVin}, - vehicle_plateNumber = #{vehiclePlateNumber}, - vehicle_brand = #{vehicleBrand}, + + UPDATE v_vehicle SET + vehicle_vin = #{vehicleVin}, vehicle_type_id = #{vehicleTypeId}, - battery_merchant_id = #{batteryMerchantId}, - battery_id = #{batteryId}, - motor_merchant_id = #{motorMerchantId}, - motor_id = #{motorId} - WHERE - vehicle_id = #{vehicleId} - - - - DELETE FROM v_vehicle + wall_id = #{wallId}, + motor_merchant = #{motorMerchant}, + battery_merchant = #{batteryMerchant}, + motor = #{motor}, + battery = #{battery} WHERE vehicle_id = #{vehicleId} + + + DELETE FROM v_vehicle WHERE vehicle_id = #{vehicleId} - SELECT - v.vehicle_id, - v.vehicle_vin, - v.vehicle_plateNumber, - v.vehicle_brand, - type.vehicle_type_name, - mm.motor_merchant_name, - m.motor_name, - bm.battery_merchant_name, - b.battery_name, - v.vehicle_status + vehicle_id, + vehicle_vin, + wall_id, + vehicle_type_name, + motor_merchant, + battery_merchant, + motor, + battery FROM v_vehicle v - JOIN v_vehicle_type type ON v.vehicle_type_id = type.vehicle_type_id - JOIN v_motor_merchant mm ON v.motor_merchant_id = mm.motor_merchant_id - JOIN v_motor m ON v.motor_id = m.motor_id - JOIN v_battery_merchant bm ON v.battery_merchant_id = bm.battery_merchant_id - JOIN v_battery b ON v.battery_id = b.battery_id + LEFT JOIN v_vehicle_type type ON v.vehicle_type_id = type.vehicle_type_id WHERE v.vehicle_id = #{vehicleId} - - - -