group-four
/
project-car
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

feat():修改车辆管理

dev.warn
SuiXxx 2024-09-27 11:51:43 +08:00
parent 92595bf769
commit 830dc64d08
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCar.java
View File

@ -25,5 +25,6 @@ public class SysCar extends BaseEntity {
private String carBatteryManufacturer; private String carBatteryManufacturer;
private String carBatteryModel; private String carBatteryModel;
private Long strategyId; private Long strategyId;
private Long groupId;
} }

2
cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/resp/SysCarVo.java
View File

@ -17,6 +17,8 @@ public class SysCarVo extends SysCar {
private String typeName; private String typeName;
@Excel(name = "策略名称") @Excel(name = "策略名称")
private String strategyName; private String strategyName;
@Excel(name = "围栏组名称")
private String groupName;

11
cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCarMapper.xml
View File

@ -6,9 +6,9 @@
<insert id="addSysCar"> <insert id="addSysCar">
INSERT INTO `four`.`sys_car` INSERT INTO `four`.`sys_car`
( `car_vin`, `car_type_id`, `state`, `car_motor_manufacturer`, `car_motor_model`, ( `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}, VALUES (#{carVin}, #{carTypeId}, '1', #{carMotorManufacturer}, #{carMotorModel},
#{carBatteryManufacturer}, #{carBatteryModel}, #{strategyId},#{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark}) #{carBatteryManufacturer}, #{carBatteryModel}, #{strategyId},#{groupId},#{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark})
</insert> </insert>
<update id="updSysCarById"> <update id="updSysCarById">
UPDATE `four`.`sys_car` UPDATE `four`.`sys_car`
@ -20,6 +20,7 @@
`car_battery_manufacturer` = #{carBatteryManufacturer}, `car_battery_manufacturer` = #{carBatteryManufacturer},
`car_battery_model` = #{carBatteryModel}, `car_battery_model` = #{carBatteryModel},
`strategy_id` = #{strategyId}, `strategy_id` = #{strategyId},
`group_id`=#{groupId}
`create_by` = #{createBy}, `create_by` = #{createBy},
`create_time` = #{createTime}, `create_time` = #{createTime},
`update_by` = #{updateBy}, `update_by` = #{updateBy},
@ -27,10 +28,11 @@
`remark` = #{remark} WHERE `id` = #{id} `remark` = #{remark} WHERE `id` = #{id}
</update> </update>
<select id="selectSysCarVoList" resultType="com.muyu.domain.resp.SysCarVo"> <select id="selectSysCarVoList" resultType="com.muyu.domain.resp.SysCarVo">
SELECT * ,car_type.type_name,warn_strategy.strategy_name SELECT * ,car_type.type_name,warn_strategy.strategy_name,electronic_fence_group.group_name
FROM `sys_car` FROM `sys_car`
LEFT JOIN car_type ON sys_car.car_type_id=car_type.id LEFT JOIN car_type ON sys_car.car_type_id=car_type.id
LEFT JOIN warn_strategy ON sys_car.strategy_id=warn_strategy.id LEFT JOIN warn_strategy ON sys_car.strategy_id=warn_strategy.id
LEFT JOIN electronic_fence_group ON sys_car.group_id=electronic_fence_group.id
<where> <where>
<if test="carVin!=null and carVin!=''"> <if test="carVin!=null and carVin!=''">
sys_car.car_vin=#{carVin} sys_car.car_vin=#{carVin}
@ -55,10 +57,11 @@
<select id="selectSysCarVoById" resultType="com.muyu.domain.resp.SysCarVo"> <select id="selectSysCarVoById" resultType="com.muyu.domain.resp.SysCarVo">
SELECT * ,car_type.type_name,warn_strategy.strategy_name SELECT * ,car_type.type_name,warn_strategy.strategy_name,electronic_fence_group.group_name
FROM `sys_car` FROM `sys_car`
LEFT JOIN car_type ON sys_car.car_type_id=car_type.id LEFT JOIN car_type ON sys_car.car_type_id=car_type.id
LEFT JOIN warn_strategy ON sys_car.strategy_id=warn_strategy.id LEFT JOIN warn_strategy ON sys_car.strategy_id=warn_strategy.id
LEFT JOIN electronic_fence_group ON sys_car.group_id=electronic_fence_group.id
where sys_car.id=#{id} where sys_car.id=#{id}
</select> </select>
<select id="findFenceByCarVin" resultType="com.muyu.domain.resp.SysCarFaultLogVo"> <select id="findFenceByCarVin" resultType="com.muyu.domain.resp.SysCarFaultLogVo">