From f6c9db3a2a5303889d88eb25dc540242a9a470a2 Mon Sep 17 00:00:00 2001 From: Number7 <1845377266@qq.com> Date: Sun, 22 Sep 2024 20:47:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=A6=E8=BE=86=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=95=85=E9=9A=9C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/controller/SysCarController.java | 14 ++++++ .../java/com/muyu/domain/SysCarFaultLog.java | 44 +++++++++++++++++++ .../java/com/muyu/mapper/SysCarMapper.java | 5 ++- .../java/com/muyu/service/SysCarService.java | 5 +++ .../muyu/service/impl/SysCarServiceImpl.java | 7 +++ .../main/resources/mapper/SysCarMapper.xml | 9 ++++ cloud-modules/cloud-modules-template/pom.xml | 10 ----- .../template/controller/CarController.java | 2 - .../java/com/template/domain/Template.java | 1 - .../template/service/impl/CarServiceImpl.java | 1 + .../service/impl/TemplateServiceImpl.java | 16 +++---- 11 files changed, 90 insertions(+), 24 deletions(-) create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCarFaultLog.java 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 f62f385..a3eecf7 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 @@ -2,11 +2,16 @@ package com.muyu.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.SysCar; +import com.muyu.domain.SysCarFaultLog; import com.muyu.domain.req.SysCarReq; + +import com.muyu.domain.resp.SysCarVo; import com.muyu.service.SysCarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/sysCar") @@ -44,5 +49,14 @@ public class SysCarController { return i>0?Result.success():Result.error(); } + /** + * 根据车辆的VIN码查询该车的故障记录 + * @param carVin + * @return + */ + @PostMapping("/findFenceByCarVin") + public Result> findFenceByCarVin(@RequestParam("carVin") String carVin){ + return Result.success(sysCarService.findFenceByCarVin(carVin)); + } } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCarFaultLog.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCarFaultLog.java new file mode 100644 index 0000000..9a86ec7 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/SysCarFaultLog.java @@ -0,0 +1,44 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * @Author：liuxinyue + * @Package：com.muyu.domain + * @Project：cloud-server + * @name：SysCarFault + * @Date：2024/9/22 20:11 + */ +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class SysCarFaultLog{ + + /** + * 主键 + */ + private Integer id; + /** + * 故障码 + */ + private String faultCode; + /** + * 故障开始时间 + */ + private Date startTime; + /** + * 故障结束时间 + */ + private Date endTime; + /** + * 车辆VIN码 + */ + private String vin; +} 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..bfb7d3a 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 @@ -3,7 +3,9 @@ package com.muyu.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.SysCar; +import com.muyu.domain.SysCarFaultLog; import com.muyu.domain.req.SysCarReq; + import com.muyu.domain.resp.SysCarVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,7 +16,8 @@ import java.util.List; public interface SysCarMapper extends BaseMapper { List selectSysCarVoList(SysCarReq sysCarReq); - SysCarVo selectSysCarVoById(@Param("id") Long id); + List findFenceByCarVin(@Param("carVin") String carVin); + } 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..76c54b1 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 @@ -1,7 +1,9 @@ package com.muyu.service; import com.muyu.domain.SysCar; +import com.muyu.domain.SysCarFaultLog; import com.muyu.domain.req.SysCarReq; + import com.muyu.domain.resp.SysCarVo; import java.util.List; @@ -16,4 +18,7 @@ public interface SysCarService { int deleteSysCarById(Long id); int updateSysCar(SysCar sysCar); + + List findFenceByCarVin(String carVin); + } 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..3d24033 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 @@ -2,7 +2,9 @@ package com.muyu.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.SysCar; +import com.muyu.domain.SysCarFaultLog; import com.muyu.domain.req.SysCarReq; + import com.muyu.domain.resp.SysCarVo; import com.muyu.mapper.SysCarMapper; import com.muyu.service.SysCarService; @@ -39,4 +41,9 @@ public class SysCarServiceImpl extends ServiceImpl impleme public int updateSysCar(SysCar sysCar) { return sysCarMapper.updateById(sysCar); } + + @Override + public List findFenceByCarVin(String carVin) { + return sysCarMapper.findFenceByCarVin(carVin); + } } 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..7ec3893 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,13 @@ 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 1392ec7..96d39aa 100644 --- a/cloud-modules/cloud-modules-template/pom.xml +++ b/cloud-modules/cloud-modules-template/pom.xml @@ -110,16 +110,7 @@ cloud-common-api-doc - - - com.muyu - cloud-common-xxl - - - com.muyu - cloud-common-rabbit - @@ -138,5 +129,4 @@ - 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 index ecaf186..c5305c7 100644 --- 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 @@ -1,5 +1,4 @@ package com.template.controller; - import com.muyu.common.core.domain.Result; import com.template.domain.CarType; import com.template.domain.SysCar; @@ -9,7 +8,6 @@ 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 diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/template/domain/Template.java b/cloud-modules/cloud-modules-template/src/main/java/com/template/domain/Template.java index c4798f8..0dada85 100644 --- a/cloud-modules/cloud-modules-template/src/main/java/com/template/domain/Template.java +++ b/cloud-modules/cloud-modules-template/src/main/java/com/template/domain/Template.java @@ -20,7 +20,6 @@ import java.util.Date; @NoArgsConstructor public class Template { - /** * 模版ID */ 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 index 503bad7..f065806 100644 --- 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 @@ -30,4 +30,5 @@ public class CarServiceImpl implements CarService { public CarType findCarTypeById(Long carTypeId) { return carMapper.carMapper(carTypeId); } + } 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 0b21cc4..1e9cdc0 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,4 +1,5 @@ package com.template.service.impl; +import com.alibaba.fastjson.JSONObject; import com.muyu.common.core.domain.Result; import com.template.domain.*; import com.template.mapper.TemplateMapper; @@ -36,8 +37,8 @@ public class TemplateServiceImpl implements TemplateService{ @Override public void messageParsing(String templateMessage) { - //新能源车里面有的配置 - MessageTemplate messageTemplate = new MessageTemplate(); + //给一个JSON对象 + JSONObject jsonObject = new JSONObject(); //先截取出VIN码 然后根据VIN码查询这个车属于什么类型 if(templateMessage.length()<18){ throw new RuntimeException("The vehicle message is incorrect"); @@ -69,15 +70,10 @@ public class TemplateServiceImpl implements TemplateService{ 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)); - } + //将每个解析后的字段都存入到JSON对象中 + jsonObject.put(messageTemplateType.getMessageField(), result.substring(startIndex, endIndex-1)); } - System.out.println("解析后的报文是:"+messageTemplate); + System.out.println("解析后的报文是:"+jsonObject); } }