diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/CarTypeController.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/CarTypeController.java index a3cbd9a..fb2fe4d 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/CarTypeController.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/CarTypeController.java @@ -4,9 +4,7 @@ import com.muyu.common.core.domain.Result; import com.muyu.domain.CarType; import com.muyu.service.CarTypeService; 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.RestController; +import org.springframework.web.bind.annotation.*; @RestController @@ -21,6 +19,17 @@ public class CarTypeController { return Result.success(carTypeService.selectCarTypeList()); } + /** + * 根据类型ID获取车辆类型 + * @param carTypeId + * @return + */ + @PostMapping("/findCarTypeById") + public Result findCarTypeById(@RequestParam Long carTypeId) { + return Result.success(carTypeService.findCarTypeById(carTypeId)); + } + + } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarController.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarController.java index 8f55852..6c28b27 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarController.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarController.java @@ -45,4 +45,15 @@ public class SysCarController { } + /** + * 根据VIN码查询车信息 + * @param carVin + * @return + */ + @PostMapping("/findCarByVin") + public Result findCarByVin(@RequestParam String carVin){ + return Result.success(sysCarService.findCarByVin(carVin)); + } + + } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/CarTypeMapper.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/CarTypeMapper.java index 46c09df..26b33f3 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/CarTypeMapper.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/CarTypeMapper.java @@ -3,7 +3,10 @@ package com.muyu.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.CarType; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; public interface CarTypeMapper extends BaseMapper { + CarType findCarTypeById(@Param("carTypeId") Long carTypeId); + } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/SysCarMapper.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/SysCarMapper.java index e276098..e68fd22 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/SysCarMapper.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/SysCarMapper.java @@ -17,4 +17,6 @@ public interface SysCarMapper extends BaseMapper { SysCarVo selectSysCarVoById(@Param("id") Long id); + SysCar findCarByVin(@Param("carVin") String carVin); + } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/CarTypeService.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/CarTypeService.java index 718d461..2552cba 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/CarTypeService.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/CarTypeService.java @@ -10,4 +10,6 @@ import java.util.List; public interface CarTypeService extends IService { List selectCarTypeList(); + CarType findCarTypeById(Long carTypeId); + } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/SysCarService.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/SysCarService.java index 278c008..02bec13 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/SysCarService.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/SysCarService.java @@ -16,4 +16,7 @@ public interface SysCarService { int deleteSysCarById(Long id); int updateSysCar(SysCar sysCar); + + SysCar findCarByVin(String carVin); + } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java index 3648d52..1d18443 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java @@ -19,4 +19,9 @@ private CarTypeMapper carTypeMapper; QueryWrapper carTypeQueryWrapper = new QueryWrapper<>(); return carTypeMapper.selectList(carTypeQueryWrapper); } + + @Override + public CarType findCarTypeById(Long carTypeId) { + return carTypeMapper.findCarTypeById(carTypeId); + } } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java index 388674f..1aa7a89 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java @@ -39,4 +39,9 @@ public class SysCarServiceImpl extends ServiceImpl impleme public int updateSysCar(SysCar sysCar) { return sysCarMapper.updateById(sysCar); } + + @Override + public SysCar findCarByVin(String carVin) { + return sysCarMapper.findCarByVin(carVin); + } } diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCaeTypeMapper.xml b/cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCaeTypeMapper.xml new file mode 100644 index 0000000..64cef95 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCaeTypeMapper.xml @@ -0,0 +1,11 @@ + + + + + + + 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 fdfd15b..c1dd680 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 @@ -38,4 +38,7 @@ LEFT JOIN tb_fence ON sys_car.fence_id=tb_fence.fence_id where sys_car.id=#{id} + diff --git a/cloud-modules/cloud-modules-template/pom.xml b/cloud-modules/cloud-modules-template/pom.xml index 94c2990..1392ec7 100644 --- a/cloud-modules/cloud-modules-template/pom.xml +++ b/cloud-modules/cloud-modules-template/pom.xml @@ -26,6 +26,41 @@ + + + org.apache.iotdb + iotdb-session + 0.13.2 + + + org.apache.iotdb + iotdb-jdbc + 0.13.2 + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.2.0 + + + + com.baomidou + mybatis-plus-boot-starter + 3.5.5 + + + mybatis-spring + org.mybatis + + + + + org.mybatis + mybatis-spring + 3.0.3 + + diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/TemplateApplication.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/TemplateApplication.java index 7100318..cc760d8 100644 --- a/cloud-modules/cloud-modules-template/src/main/java/com/template/TemplateApplication.java +++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/TemplateApplication.java @@ -1,10 +1,10 @@ package com.template; - import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * @Author:liuxinyue diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/CarController.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/CarController.java new file mode 100644 index 0000000..ecaf186 --- /dev/null +++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/CarController.java @@ -0,0 +1,46 @@ +package com.template.controller; + +import com.muyu.common.core.domain.Result; +import com.template.domain.CarType; +import com.template.domain.SysCar; +import com.template.service.CarService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author:liuxinyue + * @Package:com.template.controller + * @Project:cloud-server + * @name:CarController + * @Date:2024/9/21 9:25 + */ +@RestController +@RequestMapping("/car") +public class CarController { + + @Autowired + private CarService carService; + /** + * 根据VIN码查询车信息 + * @param carVin + * @return + */ + @PostMapping("/findCarByVin") + public Result findCarByVin(@RequestParam String carVin){ + return Result.success(carService.findCarByVin(carVin)); + } + + /** + * 根据类型ID获取车辆类型 + * @param carTypeId + * @return + */ + @PostMapping("/findCarTypeById") + public Result findCarTypeById(@RequestParam Long carTypeId) { + return Result.success(carService.findCarTypeById(carTypeId)); + } + +} diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/DataTypeController.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/DataTypeController.java index 1bd0a74..4e1da4d 100644 --- a/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/DataTypeController.java +++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/DataTypeController.java @@ -27,6 +27,10 @@ public class DataTypeController { private DataTypeService dataTypeService; + /** + * 数据类型列表 + * @return + */ @PostMapping("/dataTypeList") public Result> dataTypeList() { return Result.success(dataTypeService.dataTypeList()); diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/MessageTemplateTypeController.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/MessageTemplateTypeController.java index a988756..98b0341 100644 --- a/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/MessageTemplateTypeController.java +++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/MessageTemplateTypeController.java @@ -78,4 +78,13 @@ public class MessageTemplateTypeController { return Result.success(messageTemplateTypeService.finddeviceStatusData(templatedId,code)); } + /** + * 根据车辆类型查出所对应的模版 + * @param templateName + * @return + */ + @PostMapping("/findMessageByTemplateName") + public Result> findMessageByTemplateName(@RequestParam("templateName") String templateName) { + return Result.success(messageTemplateTypeService.findMessageByTemplateName(templateName)); + } } diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/TemplateController.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/TemplateController.java index e1e30e7..4068cfb 100644 --- a/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/TemplateController.java +++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/controller/TemplateController.java @@ -26,11 +26,27 @@ public class TemplateController { private TemplateService templateService; + /** + * 报文模版列表 + * @return + */ @PostMapping("/templateList") public Result> templateList() { return Result.success(templateService.templateList()); } + /** + * 解析报文 + * @param templateMessage + * @return + */ + @PostMapping("/messageParsing") + public Result messageParsing(@RequestParam String templateMessage){ + templateService.messageParsing(templateMessage); + return Result.success(); + } + + } diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/domain/CarType.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/domain/CarType.java new file mode 100644 index 0000000..fca9bd4 --- /dev/null +++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/domain/CarType.java @@ -0,0 +1,19 @@ +package com.template.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "car_type",autoResultMap = true) +public class CarType { + @TableId(value = "id") + private Long id; + private String typeName; + private Long messageId; + +} diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/domain/SysCar.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/domain/SysCar.java new file mode 100644 index 0000000..442659b --- /dev/null +++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/domain/SysCar.java @@ -0,0 +1,38 @@ +package com.template.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName(value = "sys_car",autoResultMap = true) +public class SysCar extends BaseEntity { + @TableId(value = "id") + private Long id; + private String carVin; + private Long carTypeId; + private String state; + private Long fenceId; + private String carMotorManufacturer; + private String carMotorModel; + private String carBatteryManufacturer; + private String carBatteryModel; + + + + + + + + + + + +} diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/mapper/CarMapper.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/mapper/CarMapper.java new file mode 100644 index 0000000..68146c4 --- /dev/null +++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/mapper/CarMapper.java @@ -0,0 +1,22 @@ +package com.template.mapper; + +import com.template.domain.CarType; +import com.template.domain.SysCar; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @Author:liuxinyue + * @Package:com.template.mapper + * @Project:cloud-server + * @name:CarMapper + * @Date:2024/9/21 9:26 + */ +@Mapper +public interface CarMapper { + + SysCar findCarByVin(@Param("carVin") String carVin); + + CarType carMapper(@Param("carTypeId") Long carTypeId); + +} diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/mapper/MessageTemplateTypeMapper.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/mapper/MessageTemplateTypeMapper.java index 914e938..96279f3 100644 --- a/cloud-modules/cloud-modules-template/src/main/java/com/template/mapper/MessageTemplateTypeMapper.java +++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/mapper/MessageTemplateTypeMapper.java @@ -30,4 +30,6 @@ public interface MessageTemplateTypeMapper { List findvehicleData(@Param("templatedId") Integer templatedId, @Param("code") String code); + List findMessageByTemplateName(@Param("templateName") String templateName); + } diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/mapper/TemplateMapper.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/mapper/TemplateMapper.java index 7bba63c..0ba2238 100644 --- a/cloud-modules/cloud-modules-template/src/main/java/com/template/mapper/TemplateMapper.java +++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/mapper/TemplateMapper.java @@ -18,4 +18,6 @@ public interface TemplateMapper { List