diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCar.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCar.java
index 37cfaeb..b176d7b 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCar.java
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCar.java
@@ -25,5 +25,6 @@ public class SysCar extends BaseEntity {
private String carBatteryManufacturer;
private String carBatteryModel;
private Long strategyId;
+ private Long groupId;
}
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/resp/SysCarVo.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/resp/SysCarVo.java
index 966e77c..8703e4b 100644
--- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/resp/SysCarVo.java
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/resp/SysCarVo.java
@@ -17,6 +17,8 @@ public class SysCarVo extends SysCar {
private String typeName;
@Excel(name = "策略名称")
private String strategyName;
+ @Excel(name = "围栏组名称")
+ private String groupName;
diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCarMapper.xml b/cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCarMapper.xml
index e095fcd..86dcce4 100644
--- a/cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCarMapper.xml
+++ b/cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCarMapper.xml
@@ -6,9 +6,9 @@
INSERT INTO `four`.`sys_car`
( `car_vin`, `car_type_id`, `state`, `car_motor_manufacturer`, `car_motor_model`,
- `car_battery_manufacturer`, `car_battery_model`, `strategy_id`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+ `car_battery_manufacturer`, `car_battery_model`, `strategy_id`,`group_id`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`,)
VALUES (#{carVin}, #{carTypeId}, '1', #{carMotorManufacturer}, #{carMotorModel},
- #{carBatteryManufacturer}, #{carBatteryModel}, #{strategyId},#{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark})
+ #{carBatteryManufacturer}, #{carBatteryModel}, #{strategyId},#{groupId},#{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark})
UPDATE `four`.`sys_car`
@@ -20,6 +20,7 @@
`car_battery_manufacturer` = #{carBatteryManufacturer},
`car_battery_model` = #{carBatteryModel},
`strategy_id` = #{strategyId},
+ `group_id`=#{groupId}
`create_by` = #{createBy},
`create_time` = #{createTime},
`update_by` = #{updateBy},
@@ -27,10 +28,11 @@
`remark` = #{remark} WHERE `id` = #{id}