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

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

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

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

@@ -1,7 +1,7 @@
 package com.muyu.controller;
 
+
 import com.muyu.common.core.domain.Result;
-import com.muyu.domain.SysCarLog;
 import com.muyu.service.SysCarLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 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.RestController;
 
-import java.util.List;
 
 @RestController
 @RequestMapping("/sysCarLog")

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

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

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

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

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

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

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

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

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

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