From 66ea9aeb3d98fb7802faf18f9fe406b63121e598 Mon Sep 17 00:00:00 2001
From: Liu Wu <2780205363@qq.com>
Date: Fri, 20 Sep 2024 16:27:57 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BB=93?=
=?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
cloud-modules/cloud-modules-car/pom.xml | 109 ++++++++++++++++++
.../java/com/muyu/CarSystemApplication.java | 15 +++
.../muyu/controller/CarTypeController.java | 26 +++++
.../com/muyu/controller/SysCarController.java | 48 ++++++++
.../muyu/controller/SysCarLogController.java | 32 +++++
.../main/java/com/muyu/domain/CarType.java | 19 +++
.../src/main/java/com/muyu/domain/SysCar.java | 38 ++++++
.../main/java/com/muyu/domain/SysCarLog.java | 23 ++++
.../java/com/muyu/domain/req/SysCarReq.java | 18 +++
.../java/com/muyu/domain/resp/SysCarVo.java | 21 ++++
.../java/com/muyu/mapper/CarTypeMapper.java | 9 ++
.../java/com/muyu/mapper/SysCarLogMapper.java | 8 ++
.../java/com/muyu/mapper/SysCarMapper.java | 20 ++++
.../java/com/muyu/service/CarTypeService.java | 13 +++
.../com/muyu/service/SysCarLogService.java | 15 +++
.../java/com/muyu/service/SysCarService.java | 19 +++
.../muyu/service/impl/CarTypeServiceImpl.java | 22 ++++
.../service/impl/SysCarLogServiceImpl.java | 30 +++++
.../muyu/service/impl/SysCarServiceImpl.java | 42 +++++++
.../src/main/resources/banner.txt | 2 +
.../src/main/resources/bootstrap.yml | 56 +++++++++
.../src/main/resources/logback/dev.xml | 74 ++++++++++++
.../src/main/resources/logback/prod.xml | 81 +++++++++++++
.../src/main/resources/logback/test.xml | 81 +++++++++++++
.../main/resources/mapper/SysCarMapper.xml | 41 +++++++
cloud-modules/pom.xml | 1 +
26 files changed, 863 insertions(+)
create mode 100644 cloud-modules/cloud-modules-car/pom.xml
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/CarSystemApplication.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/CarTypeController.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarController.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarLogController.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/CarType.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCar.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCarLog.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/req/SysCarReq.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/resp/SysCarVo.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/CarTypeMapper.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/SysCarLogMapper.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/SysCarMapper.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/CarTypeService.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/SysCarLogService.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/SysCarService.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarLogServiceImpl.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java
create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/banner.txt
create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml
create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml
create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml
create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCarMapper.xml
diff --git a/cloud-modules/cloud-modules-car/pom.xml b/cloud-modules/cloud-modules-car/pom.xml
new file mode 100644
index 0000000..2bc7c34
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/pom.xml
@@ -0,0 +1,109 @@
+
+
+ 4.0.0
+
+ com.muyu
+ cloud-modules
+ 3.6.3
+
+
+ cloud-modules-car
+
+
+ 17
+ 17
+ UTF-8
+
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-bootstrap
+ 4.1.2
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
+ com.mysql
+ mysql-connector-j
+
+
+
+
+ com.muyu
+ cloud-common-datasource
+
+
+
+
+ com.muyu
+ cloud-common-datascope
+
+
+
+
+ com.muyu
+ cloud-common-log
+
+
+
+
+ com.muyu
+ cloud-common-api-doc
+
+
+
+
+ com.muyu
+ cloud-common-rabbit
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ repackage
+
+
+
+
+
+
+
+
+
+
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CarSystemApplication.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CarSystemApplication.java
new file mode 100644
index 0000000..2594c43
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CarSystemApplication.java
@@ -0,0 +1,15 @@
+package com.muyu;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+@SpringBootApplication
+@EnableFeignClients
+@MapperScan(value = "com.muyu.mapper")
+public class CarSystemApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(CarSystemApplication.class,args);
+ }
+}
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
new file mode 100644
index 0000000..a3cbd9a
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/CarTypeController.java
@@ -0,0 +1,26 @@
+package com.muyu.controller;
+
+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;
+
+
+@RestController
+@RequestMapping("/carType")
+public class CarTypeController {
+ @Autowired
+ private CarTypeService carTypeService;
+
+
+ @GetMapping("/selectCarTypeList")
+ public Result selectCarTypeList(){
+ return Result.success(carTypeService.selectCarTypeList());
+ }
+
+
+
+}
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
new file mode 100644
index 0000000..8f55852
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarController.java
@@ -0,0 +1,48 @@
+package com.muyu.controller;
+
+import com.muyu.common.core.domain.Result;
+import com.muyu.domain.SysCar;
+import com.muyu.domain.req.SysCarReq;
+import com.muyu.service.SysCarService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@RequestMapping("/sysCar")
+public class SysCarController {
+ @Autowired
+ private SysCarService sysCarService;
+
+ @PostMapping("/selectSysCarVoList")
+ public Result selectSysCarVoList(@RequestBody SysCarReq sysCarReq){
+ return Result.success(sysCarService.selectSysCarVoList(sysCarReq));
+ }
+
+
+ @GetMapping("/selectSysCarVoById/{id}")
+ public Result selectSysCarVoById(@PathVariable("id") Long id){
+ return Result.success(sysCarService.selectSysCarVoById(id));
+ }
+
+
+
+ @PostMapping("/addSysCar")
+ public Result addSysCar(@RequestBody SysCar sysCar){
+ return Result.success(sysCarService.addSysCar(sysCar));
+ }
+
+ @PutMapping("/updateSysCar")
+ public Result updateSysCar(@RequestBody SysCar sysCar){
+ return Result.success(sysCarService.updateSysCar(sysCar));
+ }
+
+
+ @DeleteMapping("/deleteSysCarById/{id}")
+ public Result deleteSysCarById(@PathVariable("id") Long id){
+ int i = sysCarService.deleteSysCarById(id);
+ return i>0?Result.success():Result.error();
+ }
+
+
+}
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarLogController.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarLogController.java
new file mode 100644
index 0000000..465cff6
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarLogController.java
@@ -0,0 +1,32 @@
+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;
+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")
+public class SysCarLogController {
+ @Autowired
+ private SysCarLogService sysCarLogService;
+
+
+ @GetMapping("/selectList")
+ public Result selectList(){
+ return Result.success(sysCarLogService.selectList());
+ }
+
+ @GetMapping("/selectList/{id}")
+ public Result selectById(@PathVariable("id") Long id){
+ return Result.success(sysCarLogService.selectById(id));
+ }
+
+
+}
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/CarType.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/CarType.java
new file mode 100644
index 0000000..11989b3
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/CarType.java
@@ -0,0 +1,19 @@
+package com.muyu.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-car/src/main/java/com/muyu/domain/SysCar.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCar.java
new file mode 100644
index 0000000..573d321
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCar.java
@@ -0,0 +1,38 @@
+package com.muyu.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-car/src/main/java/com/muyu/domain/SysCarLog.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCarLog.java
new file mode 100644
index 0000000..62d4dc2
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCarLog.java
@@ -0,0 +1,23 @@
+package com.muyu.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "sys_car_log",autoResultMap = true)
+public class SysCarLog {
+
+ private String id;
+ private String carVin;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+}
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/req/SysCarReq.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/req/SysCarReq.java
new file mode 100644
index 0000000..46acd38
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/req/SysCarReq.java
@@ -0,0 +1,18 @@
+package com.muyu.domain.req;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SysCarReq {
+ private String carVin;
+ private String carMotorManufacturer;
+ private String carMotorModel;
+ private String carBatteryManufacturer;
+ private String carBatteryModel;
+}
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
new file mode 100644
index 0000000..0fae538
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/resp/SysCarVo.java
@@ -0,0 +1,21 @@
+package com.muyu.domain.resp;
+
+import com.muyu.domain.SysCar;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SysCarVo extends SysCar {
+
+ private String typeName;
+ private String fenceName;
+
+
+
+
+}
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
new file mode 100644
index 0000000..46c09df
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/CarTypeMapper.java
@@ -0,0 +1,9 @@
+package com.muyu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.domain.CarType;
+import org.apache.ibatis.annotations.Mapper;
+
+
+public interface CarTypeMapper extends BaseMapper {
+}
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/SysCarLogMapper.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/SysCarLogMapper.java
new file mode 100644
index 0000000..357deb3
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/SysCarLogMapper.java
@@ -0,0 +1,8 @@
+package com.muyu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.domain.SysCar;
+import com.muyu.domain.SysCarLog;
+
+public interface SysCarLogMapper extends BaseMapper {
+}
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
new file mode 100644
index 0000000..e276098
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/SysCarMapper.java
@@ -0,0 +1,20 @@
+package com.muyu.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.domain.SysCar;
+
+import com.muyu.domain.req.SysCarReq;
+import com.muyu.domain.resp.SysCarVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+public interface SysCarMapper extends BaseMapper {
+ List selectSysCarVoList(SysCarReq sysCarReq);
+
+
+ SysCarVo selectSysCarVoById(@Param("id") Long id);
+
+}
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
new file mode 100644
index 0000000..718d461
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/CarTypeService.java
@@ -0,0 +1,13 @@
+package com.muyu.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.domain.CarType;
+import com.muyu.mapper.CarTypeMapper;
+
+import java.util.List;
+
+
+public interface CarTypeService extends IService {
+ List selectCarTypeList();
+
+}
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/SysCarLogService.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/SysCarLogService.java
new file mode 100644
index 0000000..775e4a5
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/SysCarLogService.java
@@ -0,0 +1,15 @@
+package com.muyu.service;
+
+import com.muyu.domain.SysCarLog;
+
+import java.util.List;
+
+public interface SysCarLogService {
+
+
+ List selectList();
+
+ SysCarLog selectById(Long id);
+
+
+}
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
new file mode 100644
index 0000000..278c008
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/SysCarService.java
@@ -0,0 +1,19 @@
+package com.muyu.service;
+
+import com.muyu.domain.SysCar;
+import com.muyu.domain.req.SysCarReq;
+import com.muyu.domain.resp.SysCarVo;
+
+import java.util.List;
+
+public interface SysCarService {
+ List selectSysCarVoList(SysCarReq sysCarReq);
+
+ SysCarVo selectSysCarVoById(Long id);
+
+ int addSysCar(SysCar sysCar);
+
+ int deleteSysCarById(Long id);
+
+ int updateSysCar(SysCar sysCar);
+}
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
new file mode 100644
index 0000000..3648d52
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java
@@ -0,0 +1,22 @@
+package com.muyu.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.domain.CarType;
+import com.muyu.mapper.CarTypeMapper;
+import com.muyu.service.CarTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class CarTypeServiceImpl extends ServiceImpl implements CarTypeService {
+@Autowired
+private CarTypeMapper carTypeMapper;
+ @Override
+ public List selectCarTypeList() {
+ QueryWrapper carTypeQueryWrapper = new QueryWrapper<>();
+ return carTypeMapper.selectList(carTypeQueryWrapper);
+ }
+}
diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarLogServiceImpl.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarLogServiceImpl.java
new file mode 100644
index 0000000..4a2d507
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarLogServiceImpl.java
@@ -0,0 +1,30 @@
+package com.muyu.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.domain.CarType;
+import com.muyu.domain.SysCarLog;
+import com.muyu.mapper.CarTypeMapper;
+import com.muyu.mapper.SysCarLogMapper;
+import com.muyu.service.CarTypeService;
+import com.muyu.service.SysCarLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class SysCarLogServiceImpl extends ServiceImpl implements SysCarLogService {
+ @Autowired
+ private SysCarLogMapper sysCarLogMapper;
+ @Override
+ public List selectList() {
+ QueryWrapper sysCarLogQueryWrapper = new QueryWrapper<>();
+ return sysCarLogMapper.selectList(sysCarLogQueryWrapper);
+ }
+
+ @Override
+ public SysCarLog selectById(Long id) {
+ return sysCarLogMapper.selectById(id);
+ }
+}
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
new file mode 100644
index 0000000..388674f
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java
@@ -0,0 +1,42 @@
+package com.muyu.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.domain.SysCar;
+import com.muyu.domain.req.SysCarReq;
+import com.muyu.domain.resp.SysCarVo;
+import com.muyu.mapper.SysCarMapper;
+import com.muyu.service.SysCarService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class SysCarServiceImpl extends ServiceImpl implements SysCarService {
+ @Autowired
+ private SysCarMapper sysCarMapper;
+ @Override
+ public List selectSysCarVoList(SysCarReq sysCarReq) {
+ return sysCarMapper.selectSysCarVoList(sysCarReq);
+ }
+
+ @Override
+ public SysCarVo selectSysCarVoById(Long id) {
+ return sysCarMapper.selectSysCarVoById(id);
+ }
+
+ @Override
+ public int addSysCar(SysCar sysCar) {
+ return sysCarMapper.insert(sysCar);
+ }
+
+ @Override
+ public int deleteSysCarById(Long id) {
+ return sysCarMapper.deleteById(id);
+ }
+
+ @Override
+ public int updateSysCar(SysCar sysCar) {
+ return sysCarMapper.updateById(sysCar);
+ }
+}
diff --git a/cloud-modules/cloud-modules-car/src/main/resources/banner.txt b/cloud-modules/cloud-modules-car/src/main/resources/banner.txt
new file mode 100644
index 0000000..0dd5eee
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/resources/banner.txt
@@ -0,0 +1,2 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
diff --git a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..fc476a1
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
@@ -0,0 +1,56 @@
+# Tomcat
+server:
+ port: 9520
+
+# nacos线上地址
+nacos:
+ addr: 47.101.53.251:8848
+ user-name: nacos
+ password: nacos
+ namespace: sx
+
+# Spring
+spring:
+ application:
+ # 应用名称
+ name: cloud-car
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: ${nacos.addr}
+ # nacos用户名
+ username: ${nacos.user-name}
+ # nacos密码
+ password: ${nacos.password}
+ # 命名空间
+ namespace: ${nacos.namespace}
+ config:
+ # 服务注册地址
+ server-addr: ${nacos.addr}
+ # nacos用户名
+ username: ${nacos.user-name}
+ # nacos密码
+ password: ${nacos.password}
+ # 命名空间
+ namespace: ${nacos.namespace}
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ # 系统共享配置
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ # 系统环境Config共享配置
+ - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ # xxl-job 配置文件
+ - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ # rabbit 配置文件
+ - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+logging:
+ level:
+ com.muyu.system.mapper: DEBUG
+
diff --git a/cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml
new file mode 100644
index 0000000..621579c
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+ ${log.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml
new file mode 100644
index 0000000..2419bf9
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+ ${log.sky.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+ ${log.sky.pattern}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml
new file mode 100644
index 0000000..2419bf9
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+ ${log.sky.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+ ${log.sky.pattern}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
new file mode 100644
index 0000000..fdfd15b
--- /dev/null
+++ b/cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCarMapper.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml
index 9ed6247..4bcfb77 100644
--- a/cloud-modules/pom.xml
+++ b/cloud-modules/pom.xml
@@ -11,6 +11,7 @@
cloud-modules-system
cloud-modules-gen
+ cloud-modules-car
cloud-modules-file
cloud-modules-template
cloud-modules-fence
From 66aced7a75b0b9ffa9c8b1386c7c78bf8425d05e Mon Sep 17 00:00:00 2001
From: Number7 <1845377266@qq.com>
Date: Sat, 21 Sep 2024 11:51:09 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../muyu/controller/CarTypeController.java | 15 ++++-
.../com/muyu/controller/SysCarController.java | 11 ++++
.../java/com/muyu/mapper/CarTypeMapper.java | 3 +
.../java/com/muyu/mapper/SysCarMapper.java | 2 +
.../java/com/muyu/service/CarTypeService.java | 2 +
.../java/com/muyu/service/SysCarService.java | 3 +
.../muyu/service/impl/CarTypeServiceImpl.java | 5 ++
.../muyu/service/impl/SysCarServiceImpl.java | 5 ++
.../resources/mapper/SysCaeTypeMapper.xml | 11 ++++
.../main/resources/mapper/SysCarMapper.xml | 3 +
cloud-modules/cloud-modules-template/pom.xml | 35 +++++++++++
.../com/template/TemplateApplication.java | 2 +-
.../template/controller/CarController.java | 46 +++++++++++++++
.../controller/DataTypeController.java | 4 ++
.../MessageTemplateTypeController.java | 9 +++
.../controller/TemplateController.java | 16 +++++
.../java/com/template/domain/CarType.java | 19 ++++++
.../main/java/com/template/domain/SysCar.java | 38 ++++++++++++
.../java/com/template/mapper/CarMapper.java | 22 +++++++
.../mapper/MessageTemplateTypeMapper.java | 2 +
.../com/template/mapper/TemplateMapper.java | 2 +
.../java/com/template/service/CarService.java | 18 ++++++
.../service/MessageTemplateTypeService.java | 2 +
.../com/template/service/TemplateService.java | 2 +
.../template/service/impl/CarServiceImpl.java | 33 +++++++++++
.../impl/MessageTemplateTypeServiceImpl.java | 5 ++
.../service/impl/TemplateServiceImpl.java | 59 ++++++++++++++++++-
.../main/java/com/template/util/ToIoTDB.java | 36 +++++++++++
.../resources/mapper/message/CarMapper.xml | 13 ++++
.../message/MessageTemplateTypeMapper.xml | 10 ++++
.../mapper/message/TemplateMapper.xml | 4 ++
31 files changed, 430 insertions(+), 7 deletions(-)
create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/mapper/SysCaeTypeMapper.xml
create mode 100644 cloud-modules/cloud-modules-template/src/main/java/com/template/controller/CarController.java
create mode 100644 cloud-modules/cloud-modules-template/src/main/java/com/template/domain/CarType.java
create mode 100644 cloud-modules/cloud-modules-template/src/main/java/com/template/domain/SysCar.java
create mode 100644 cloud-modules/cloud-modules-template/src/main/java/com/template/mapper/CarMapper.java
create mode 100644 cloud-modules/cloud-modules-template/src/main/java/com/template/service/CarService.java
create mode 100644 cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/CarServiceImpl.java
create mode 100644 cloud-modules/cloud-modules-template/src/main/java/com/template/util/ToIoTDB.java
create mode 100644 cloud-modules/cloud-modules-template/src/main/resources/mapper/message/CarMapper.xml
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 templateList();
+ Template findTemplateByName(@Param("typeName") String typeName);
+
}
diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/CarService.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/CarService.java
new file mode 100644
index 0000000..97cba3b
--- /dev/null
+++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/CarService.java
@@ -0,0 +1,18 @@
+package com.template.service;
+
+import com.template.domain.CarType;
+import com.template.domain.SysCar;
+
+/**
+ * @Author:liuxinyue
+ * @Package:com.template.service
+ * @Project:cloud-server
+ * @name:CarService
+ * @Date:2024/9/21 9:25
+ */
+public interface CarService {
+ SysCar findCarByVin(String carVin);
+
+ CarType findCarTypeById(Long carTypeId);
+
+}
diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/MessageTemplateTypeService.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/MessageTemplateTypeService.java
index 2e67473..b56a215 100644
--- a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/MessageTemplateTypeService.java
+++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/MessageTemplateTypeService.java
@@ -27,4 +27,6 @@ public interface MessageTemplateTypeService {
List finddeviceStatusData(Integer templatedId, String code);
+ List findMessageByTemplateName(String templateName);
+
}
diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/TemplateService.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/TemplateService.java
index c70bc33..4854166 100644
--- a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/TemplateService.java
+++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/TemplateService.java
@@ -15,4 +15,6 @@ public interface TemplateService {
List templateList();
+ void messageParsing(String templateMessage);
+
}
diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/CarServiceImpl.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/CarServiceImpl.java
new file mode 100644
index 0000000..503bad7
--- /dev/null
+++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/CarServiceImpl.java
@@ -0,0 +1,33 @@
+package com.template.service.impl;
+
+import com.template.domain.CarType;
+import com.template.domain.SysCar;
+import com.template.mapper.CarMapper;
+import com.template.service.CarService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author:liuxinyue
+ * @Package:com.template.service.impl
+ * @Project:cloud-server
+ * @name:CarServiceImpl
+ * @Date:2024/9/21 9:26
+ */
+@Service
+public class CarServiceImpl implements CarService {
+
+ @Autowired
+ private CarMapper carMapper;
+
+
+ @Override
+ public SysCar findCarByVin(String carVin) {
+ return carMapper.findCarByVin(carVin);
+ }
+
+ @Override
+ public CarType findCarTypeById(Long carTypeId) {
+ return carMapper.carMapper(carTypeId);
+ }
+}
diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/MessageTemplateTypeServiceImpl.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/MessageTemplateTypeServiceImpl.java
index db29239..9c83bf4 100644
--- a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/MessageTemplateTypeServiceImpl.java
+++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/MessageTemplateTypeServiceImpl.java
@@ -47,4 +47,9 @@ public class MessageTemplateTypeServiceImpl implements MessageTemplateTypeServi
public List finddeviceStatusData(Integer templatedId, String code) {
return messageTemplateTypeMapper.finddeviceStatusData(templatedId,code);
}
+
+ @Override
+ public List findMessageByTemplateName(String templateName) {
+ return messageTemplateTypeMapper.findMessageByTemplateName(templateName);
+ }
}
diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java
index ca0af10..d9248da 100644
--- a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java
+++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java
@@ -1,13 +1,16 @@
package com.template.service.impl;
-
+import com.muyu.common.core.domain.Result;
+import com.template.domain.CarType;
+import com.template.domain.MessageTemplateType;
+import com.template.domain.SysCar;
import com.template.domain.Template;
import com.template.mapper.TemplateMapper;
+import com.template.service.CarService;
+import com.template.service.MessageTemplateTypeService;
import com.template.service.TemplateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.util.List;
-
/**
* @Author:liuxinyue
* @Package:com.template.service.impl
@@ -21,9 +24,59 @@ public class TemplateServiceImpl implements TemplateService{
@Autowired
private TemplateMapper templateMapper;
+ @Autowired
+ private CarService carService;
+
+ @Autowired
+ private MessageTemplateTypeService messageTemplateTypeService;
+
@Override
public List templateList() {
return templateMapper.templateList();
}
+ @Override
+ public void messageParsing(String templateMessage) {
+ //先截取出VIN码 然后根据VIN码查询这个车属于什么类型
+ if(templateMessage.length()<18){
+ throw new RuntimeException("The vehicle message is incorrect");
+ }
+ //取出VIN码
+ String carVin = templateMessage.substring(1, 18-1);
+ //根据VIN码获取车辆信息
+ SysCar carByVin = carService.findCarByVin(carVin);
+ //根据车辆类型ID获取车辆类型名称
+ CarType carTypeById = carService.findCarTypeById(carByVin.getCarTypeId());
+ //查询报文模版
+ Template templateDate=templateMapper.findTemplateByName(carTypeById.getTypeName());
+ //根据报文模版的ID查询对应的模版
+ List messageByTemplateName = messageTemplateTypeService.findMessageByTemplateName(templateDate.getTemplateName());
+ for (MessageTemplateType messageTemplateType : messageByTemplateName) {
+
+
+ }
+
+
+ }
+
+ public static void main(String[] args) {
+
+ String character="1A 2B 3C 4D 5E 6F";
+ //将这个报文去除空格
+ String[] split = character.split(" ");
+
+ //字符数组
+ char[] asciiChars = new char[split.length];
+
+ for (int i = 0; i < split.length; i++) {
+ // 将16进制字符串转换为整数(字节值)
+ int decimal = Integer.parseInt(split[i], 16);
+
+ asciiChars[i] = (char) decimal;
+
+ }
+
+ System.out.println(new String(asciiChars));
+
+ }
}
diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/util/ToIoTDB.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/util/ToIoTDB.java
new file mode 100644
index 0000000..a9d4faf
--- /dev/null
+++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/util/ToIoTDB.java
@@ -0,0 +1,36 @@
+package com.template.util;
+import org.apache.iotdb.rpc.IoTDBConnectionException;
+import org.apache.iotdb.rpc.StatementExecutionException;
+import org.springframework.context.annotation.Configuration;
+import org.apache.iotdb.session.Session;
+import org.apache.iotdb.session.SessionDataSet;
+
+
+/**
+ * @Author:liuxinyue
+ * @Package:com.template.util
+ * @Project:cloud-server
+ * @name:ToIoTDB
+ * @Date:2024/9/20 19:40
+ */
+@Configuration
+public class ToIoTDB {
+
+ // IoTDB连接信息
+ private static final String HOST = "127.0.0.1";
+ private static final int PORT = 6667;
+ private static final String USERNAME = "root";
+ private static final String PASSWORD = "root";
+
+ // 需要创建的schema信息
+ private static final String STORAGE_GROUP = "root.ln";
+ private static final String[] TIMESERIES_PATHS = {
+ "root.ln.wf01.wt01.temperature",
+ "root.ln.wf01.wt01.humidity"
+ };
+
+
+
+
+
+}
diff --git a/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/CarMapper.xml b/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/CarMapper.xml
new file mode 100644
index 0000000..42d7405
--- /dev/null
+++ b/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/CarMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml b/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml
index 6934821..40511b6 100644
--- a/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml
+++ b/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml
@@ -43,4 +43,14 @@
where message_template_type.template_id=#{templatedId} and message_template_type.message_class=#{code}
+
+
diff --git a/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/TemplateMapper.xml b/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/TemplateMapper.xml
index e4f535a..be28634 100644
--- a/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/TemplateMapper.xml
+++ b/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/TemplateMapper.xml
@@ -8,4 +8,8 @@
select * from t_template
+
+
From 46138738740028ce7bea7857e8e2383e6aa392e6 Mon Sep 17 00:00:00 2001
From: Number7 <1845377266@qq.com>
Date: Sat, 21 Sep 2024 12:27:04 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/template/domain/MessageTemplate.java | 85 +++++++++++++++++++
.../service/impl/TemplateServiceImpl.java | 18 ++--
2 files changed, 97 insertions(+), 6 deletions(-)
create mode 100644 cloud-modules/cloud-modules-template/src/main/java/com/template/domain/MessageTemplate.java
diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/domain/MessageTemplate.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/domain/MessageTemplate.java
new file mode 100644
index 0000000..860de01
--- /dev/null
+++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/domain/MessageTemplate.java
@@ -0,0 +1,85 @@
+package com.template.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.sql.Date;
+
+/**
+ * @Author:liuxinyue
+ * @Package:com.template.domain
+ * @Project:cloud-server
+ * @name:MessageTemplate
+ * @Date:2024/9/21 12:09
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+@EqualsAndHashCode(callSuper=false)
+public class MessageTemplate {
+
+ /**
+ * 主键
+ */
+ private Integer messageId;
+ /**
+ * 车辆VIN码
+ */
+ private String vinCode;
+ /**
+ * 时间戳
+ */
+ private Date timeStamp;
+ private String longItude;
+ private String latitude;
+ private String speedVehicle;
+ private String totalMileage;
+ private String totalVoltage;
+ private String combinedCurrent;
+ private String insulationResistance;
+ private String gearPosition;
+ private String acceleratorPedalTravelValue;
+ private String brakePedalTravelValue;
+ private String specificFuelConsumption;
+ private String motorControllerTemperature;
+ private String motorSpeed;
+ private String motorTorque;
+ private String motorTemperature;
+ private String motorVoltage;
+ private String motorCurrent;
+ private String powerBatteryRemainingSoc;
+ private String maximumFeedbackPower;
+ private String maximumDischargePower;
+ private String bmsSelfCheckCounter;
+ private String powerBattery;
+ private String totalVoltageLoadSide;
+ private String maximumVoltage;
+ private String minimumVoltage;
+ private String maximumTemperature;
+ private String minimumTemperature;
+ private String availableCapacity;
+ private String vehicleStatus;
+ private String chargingState;
+ private String operationalStatus;
+ private String soc;
+ private String energyStorageDevices;
+ private String driveMotorCondition;
+ private String whetherWorks;
+ private String eas;
+ private String ptc;
+ private String eps;
+ private String abs;
+ private String mcu;
+ private String heatingState;
+ private String powerBatteryStatus;
+ private String stateBatteryInsulation;
+ private String dcdc;
+ private String chg;
+ private String checkDigit;
+ private String cutoffBit;
+
+}
diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java
index d9248da..874ec6d 100644
--- a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java
+++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java
@@ -1,9 +1,6 @@
package com.template.service.impl;
import com.muyu.common.core.domain.Result;
-import com.template.domain.CarType;
-import com.template.domain.MessageTemplateType;
-import com.template.domain.SysCar;
-import com.template.domain.Template;
+import com.template.domain.*;
import com.template.mapper.TemplateMapper;
import com.template.service.CarService;
import com.template.service.MessageTemplateTypeService;
@@ -37,6 +34,8 @@ public class TemplateServiceImpl implements TemplateService{
@Override
public void messageParsing(String templateMessage) {
+
+ MessageTemplate messageTemplate = new MessageTemplate();
//先截取出VIN码 然后根据VIN码查询这个车属于什么类型
if(templateMessage.length()<18){
throw new RuntimeException("The vehicle message is incorrect");
@@ -51,9 +50,16 @@ public class TemplateServiceImpl implements TemplateService{
Template templateDate=templateMapper.findTemplateByName(carTypeById.getTypeName());
//根据报文模版的ID查询对应的模版
List messageByTemplateName = messageTemplateTypeService.findMessageByTemplateName(templateDate.getTemplateName());
+
for (MessageTemplateType messageTemplateType : messageByTemplateName) {
-
-
+ //车辆VIN码
+ String[] split = templateMessage.split(" ");
+ //开始位置
+ Integer startIndex = messageTemplateType.getStartIndex();
+ //结束位置
+ Integer endIndex = messageTemplateType.getEndIndex();
+ String messageField = messageTemplateType.getMessageField();
+ String str="set"+messageField;
}
From 93cca647a4d06fc7ef6f0f21e120ec4bff702ff1 Mon Sep 17 00:00:00 2001
From: Number7 <1845377266@qq.com>
Date: Sat, 21 Sep 2024 20:11:28 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E6=96=87?=
=?UTF-8?q?=E8=A7=A3=E6=9E=90=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../MessageTemplateTypeController.java | 4 +-
.../controller/TemplateController.java | 2 +-
.../mapper/MessageTemplateTypeMapper.java | 2 +-
.../service/MessageTemplateTypeService.java | 2 +-
.../impl/MessageTemplateTypeServiceImpl.java | 4 +-
.../service/impl/TemplateServiceImpl.java | 73 +++++++++----------
.../resources/mapper/message/CarMapper.xml | 2 +-
.../message/MessageTemplateTypeMapper.xml | 2 +-
8 files changed, 44 insertions(+), 47 deletions(-)
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 98b0341..d5cee97 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
@@ -84,7 +84,7 @@ public class MessageTemplateTypeController {
* @return
*/
@PostMapping("/findMessageByTemplateName")
- public Result> findMessageByTemplateName(@RequestParam("templateName") String templateName) {
- return Result.success(messageTemplateTypeService.findMessageByTemplateName(templateName));
+ public Result> findMessageByTemplateName(@RequestParam("templatedId") Integer templatedId) {
+ return Result.success(messageTemplateTypeService.findMessageByTemplateName(templatedId));
}
}
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 4068cfb..c1a2b36 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
@@ -42,7 +42,7 @@ public class TemplateController {
* @return
*/
@PostMapping("/messageParsing")
- public Result messageParsing(@RequestParam String templateMessage){
+ public Result messageParsing(@RequestParam("templateMessage") String templateMessage){
templateService.messageParsing(templateMessage);
return Result.success();
}
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 96279f3..389a8d4 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,6 +30,6 @@ public interface MessageTemplateTypeMapper {
List findvehicleData(@Param("templatedId") Integer templatedId, @Param("code") String code);
- List findMessageByTemplateName(@Param("templateName") String templateName);
+ List findMessageByTemplateName(@Param("templatedId") Integer templatedId);
}
diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/MessageTemplateTypeService.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/MessageTemplateTypeService.java
index b56a215..ac5fe90 100644
--- a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/MessageTemplateTypeService.java
+++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/MessageTemplateTypeService.java
@@ -27,6 +27,6 @@ public interface MessageTemplateTypeService {
List finddeviceStatusData(Integer templatedId, String code);
- List findMessageByTemplateName(String templateName);
+ List findMessageByTemplateName(Integer templatedId);
}
diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/MessageTemplateTypeServiceImpl.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/MessageTemplateTypeServiceImpl.java
index 9c83bf4..63f72e9 100644
--- a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/MessageTemplateTypeServiceImpl.java
+++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/MessageTemplateTypeServiceImpl.java
@@ -49,7 +49,7 @@ public class MessageTemplateTypeServiceImpl implements MessageTemplateTypeServi
}
@Override
- public List findMessageByTemplateName(String templateName) {
- return messageTemplateTypeMapper.findMessageByTemplateName(templateName);
+ public List findMessageByTemplateName(Integer templatedId) {
+ return messageTemplateTypeMapper.findMessageByTemplateName(templatedId);
}
}
diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java
index 874ec6d..0fe5e0d 100644
--- a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java
+++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java
@@ -34,55 +34,52 @@ public class TemplateServiceImpl implements TemplateService{
@Override
public void messageParsing(String templateMessage) {
-
+ //新能源车里面有的配置
MessageTemplate messageTemplate = new MessageTemplate();
//先截取出VIN码 然后根据VIN码查询这个车属于什么类型
if(templateMessage.length()<18){
throw new RuntimeException("The vehicle message is incorrect");
}
+ //将报文进行切割
+ String[] hexArray = templateMessage.split(" ");
+ StringBuilder result = new StringBuilder();
+ for (String hex : hexArray) {
+ int decimal = Integer.parseInt(hex, 16);
+ result.append((char) decimal);
+ }
//取出VIN码
- String carVin = templateMessage.substring(1, 18-1);
+ String carVin = result.substring(0, 18-1);
+ System.out.println("carVin码为:"+carVin);
//根据VIN码获取车辆信息
SysCar carByVin = carService.findCarByVin(carVin);
- //根据车辆类型ID获取车辆类型名称
- CarType carTypeById = carService.findCarTypeById(carByVin.getCarTypeId());
- //查询报文模版
- Template templateDate=templateMapper.findTemplateByName(carTypeById.getTypeName());
- //根据报文模版的ID查询对应的模版
- List messageByTemplateName = messageTemplateTypeService.findMessageByTemplateName(templateDate.getTemplateName());
+ if(carByVin==null){
+ throw new RuntimeException("Check this car!!");
+ }else{
+ //根据车辆类型ID获取车辆类型名称
+ CarType carTypeById = carService.findCarTypeById(carByVin.getCarTypeId());
+ //查询报文模版
+ Template templateDate=templateMapper.findTemplateByName(carTypeById.getTypeName());
+ //根据报文模版的ID查询对应的模版
+ List messageByTemplateName = messageTemplateTypeService.findMessageByTemplateName(templateDate.getTemplateId());
+ //将模版里面有的配置进行循环
+ for (MessageTemplateType messageTemplateType : messageByTemplateName) {
+ //开始位置
+ Integer startIndex = messageTemplateType.getStartIndex();
+ //结束位置
+ Integer endIndex = messageTemplateType.getEndIndex();
+ //车辆VIN码
+ if(messageTemplateType.getMessageField().equals("vinCode")){
+ messageTemplate.setVinCode(result.substring(startIndex, endIndex-1));
+ }
+ if(messageTemplateType.getMessageField().equals("latitude")){
+ messageTemplate.setLatitude(result.substring(startIndex, endIndex-1));
+ }
+ }
- for (MessageTemplateType messageTemplateType : messageByTemplateName) {
- //车辆VIN码
- String[] split = templateMessage.split(" ");
- //开始位置
- Integer startIndex = messageTemplateType.getStartIndex();
- //结束位置
- Integer endIndex = messageTemplateType.getEndIndex();
- String messageField = messageTemplateType.getMessageField();
- String str="set"+messageField;
- }
-
-
- }
-
- public static void main(String[] args) {
-
- String character="1A 2B 3C 4D 5E 6F";
- //将这个报文去除空格
- String[] split = character.split(" ");
-
- //字符数组
- char[] asciiChars = new char[split.length];
-
- for (int i = 0; i < split.length; i++) {
- // 将16进制字符串转换为整数(字节值)
- int decimal = Integer.parseInt(split[i], 16);
-
- asciiChars[i] = (char) decimal;
+ System.out.println("解析后的报文是:"+messageTemplate);
}
- System.out.println(new String(asciiChars));
-
}
+
}
diff --git a/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/CarMapper.xml b/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/CarMapper.xml
index 42d7405..828fe75 100644
--- a/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/CarMapper.xml
+++ b/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/CarMapper.xml
@@ -8,6 +8,6 @@
select * from sys_car where car_vin=#{carVin}
diff --git a/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml b/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml
index 40511b6..1c8f8e2 100644
--- a/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml
+++ b/cloud-modules/cloud-modules-template/src/main/resources/mapper/message/MessageTemplateTypeMapper.xml
@@ -50,7 +50,7 @@
FROM
message_template_type
LEFT JOIN data_type ON data_type.data_type_id = message_template_type.data_type_id
- where message_template_type.template_name=#{templateName}
+ where message_template_type.template_id=#{templatedId}
From 5da94ff43a372b231d50104bb338db0ff271a6ea Mon Sep 17 00:00:00 2001
From: Number7 <1845377266@qq.com>
Date: Sat, 21 Sep 2024 21:03:44 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=BF=9E=E6=8E=A5IoTDB=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/TemplateServiceImpl.java | 45 +++++++++++++++++--
1 file changed, 42 insertions(+), 3 deletions(-)
diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java
index 0fe5e0d..0b21cc4 100644
--- a/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java
+++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/service/impl/TemplateServiceImpl.java
@@ -7,6 +7,8 @@ import com.template.service.MessageTemplateTypeService;
import com.template.service.TemplateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.sql.*;
import java.util.List;
/**
* @Author:liuxinyue
@@ -75,11 +77,48 @@ public class TemplateServiceImpl implements TemplateService{
messageTemplate.setLatitude(result.substring(startIndex, endIndex-1));
}
}
-
System.out.println("解析后的报文是:"+messageTemplate);
-
}
-
}
+ //连接IoTDB数据库并执行插入操作
+ public void addIoTDBTemplate(MessageTemplate messageTemplate) throws ClassNotFoundException {
+ // IoTDB 数据库的连接信息
+ String url = "jdbc:iotdb://47.116.173.119:6667/";
+ String user = "root";
+ String password = "root";
+ // 注册 JDBC 驱动
+ Class.forName("org.apache.iotdb.jdbc.IoTDBDriver");
+ System.out.println("JDBC Driver Registered!");
+ try {
+ // 注册 JDBC 驱动
+ Class.forName("org.apache.iotdb.jdbc.IoTDBDriver");
+ System.out.println("JDBC Driver Registered!");
+ // 数据库连接
+ Connection connection = DriverManager.getConnection(url, user, password);
+ System.out.println("Connected to IoTDB!");
+ // 插入数据的 SQL 语句
+ String insertSQL = "INSERT INTO root.four.message_template ( vin_code, time_stamp, long_itude, latitude, speed_vehicle, total_mileage, total_voltage, combined_current, insulation_resistance, " +
+ "gear_position, accelerator_pedal_travel_value, brake_pedal_travel_value, specific_fuel_consumption, motor_controller_temperature, motor_speed, motor_torque, motor_temperature, motor_voltage, motor_current, " +
+ "power_battery_remaining_soc, maximum_feedback_power, maximum_discharge_power, bms_self_check_counter, power_battery, total_voltage_load_side, maximum_voltage, minimum_voltage, maximum_temperature, minimum_temperature," +
+ " available_capacity, vehicle_status, charging_state, operational_status, soc, energy_storage_devices," +
+ " drive_motor_condition, whether_works, eas, ptc, eps, abs, mcu, heating_state, power_battery_status, state_battery_insulation, dcdc, chg, check_digit, cutoff_bit) VALUES ( ?, ?, ?, ?, ?, ?, ?, " +
+ "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ??, ?, ?, ?, ?, ?, ?, ?, ?, " +
+ "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+ // 使用 PreparedStatement 插入数据
+ PreparedStatement preparedStatement = connection.prepareStatement(insertSQL);
+ // 执行插入
+ preparedStatement.execute();
+ System.out.println("Data inserted successfully!");
+ // 关闭连接
+ preparedStatement.close();
+ connection.close();
+ } catch (ClassNotFoundException e) {
+ System.err.println("JDBC Driver not found: " + e.getMessage());
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+
}
From 340e270b895cd15ae01d20c24cea5986383c2d3e Mon Sep 17 00:00:00 2001
From: Number7 <1845377266@qq.com>
Date: Sun, 22 Sep 2024 09:29:43 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=BF=9E=E6=8E=A5IoTDB=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/muyu/controller/CarTypeController.java | 13 ++++---------
.../java/com/muyu/controller/SysCarController.java | 9 ---------
.../main/java/com/muyu/service/CarTypeService.java | 2 +-
.../com/muyu/service/impl/CarTypeServiceImpl.java | 4 ----
4 files changed, 5 insertions(+), 23 deletions(-)
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 fb2fe4d..89d8fa6 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
@@ -14,20 +14,15 @@ public class CarTypeController {
private CarTypeService carTypeService;
+ /**
+ *车辆类型列表
+ * @return
+ */
@GetMapping("/selectCarTypeList")
public Result selectCarTypeList(){
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 6c28b27..7175c6e 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,15 +45,6 @@ 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/service/CarTypeService.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/CarTypeService.java
index 2552cba..6f283a2 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,6 +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/impl/CarTypeServiceImpl.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java
index 1d18443..3862c02 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
@@ -20,8 +20,4 @@ private CarTypeMapper carTypeMapper;
return carTypeMapper.selectList(carTypeQueryWrapper);
}
- @Override
- public CarType findCarTypeById(Long carTypeId) {
- return carTypeMapper.findCarTypeById(carTypeId);
- }
}