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

Merge remote-tracking branch 'origin/dev.template'

dev
刘武 2024-09-22 09:58:07 +08:00
parent deed1f0516 c94b92fb9b
commit 9ed3b18ae6
7 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarController.java
View File

@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("/sysCar") @RequestMapping("/sysCar")
public class SysCarController { public class SysCarController {
@Autowired @Autowired
private SysCarService sysCarService; private SysCarService sysCarService;
@ -46,5 +47,4 @@ public class SysCarController {
} }

3
cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarLogController.java
View File

@ -1,7 +1,7 @@
package com.muyu.controller; package com.muyu.controller;
import com.muyu.common.core.domain.Result; import com.muyu.common.core.domain.Result;
import com.muyu.domain.SysCarLog;
import com.muyu.service.SysCarLogService; import com.muyu.service.SysCarLogService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController @RestController
@RequestMapping("/sysCarLog") @RequestMapping("/sysCarLog")

3
cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/CarTypeMapper.java
View File

@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
public interface CarTypeMapper extends BaseMapper<CarType> { public interface CarTypeMapper extends BaseMapper<CarType> {
CarType findCarTypeById(@Param("carTypeId") Long carTypeId);
} }

2
cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/SysCarMapper.java
View File

@ -17,6 +17,6 @@ public interface SysCarMapper extends BaseMapper<SysCar> {
SysCarVo selectSysCarVoById(@Param("id") Long id); SysCarVo selectSysCarVoById(@Param("id") Long id);
SysCar findCarByVin(@Param("carVin") String carVin);
} }

3
cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCaeTypeMapper.xml
View File

@ -4,8 +4,5 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.muyu.mapper.CarTypeMapper"> <mapper namespace="com.muyu.mapper.CarTypeMapper">
<select id="findCarTypeById" resultType="com.muyu.domain.CarType">
select * from car_type where id=#{carTypeId}
</select>
</mapper> </mapper>

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

@ -38,7 +38,5 @@
LEFT JOIN tb_fence ON sys_car.fence_id=tb_fence.fence_id LEFT JOIN tb_fence ON sys_car.fence_id=tb_fence.fence_id
where sys_car.id=#{id} where sys_car.id=#{id}
</select> </select>
<select id="findCarByVin" resultType="com.muyu.domain.SysCar">
select * from sys_car where car_vin=#{carVin}
</select>
</mapper> </mapper>

2
cloud-modules/cloud-modules-template/src/main/java/com/template/controller/MessageTemplateTypeController.java
View File

@ -80,7 +80,7 @@ public class MessageTemplateTypeController {
/** /**
* 根据车辆类型查出所对应的模版 * 根据车辆类型查出所对应的模版
* @param templateName * @param templatedId
* @return * @return
*/ */
@PostMapping("/findMessageByTemplateName") @PostMapping("/findMessageByTemplateName")