From 00b4350289592493a0c9818517ab5b5a9286b97d Mon Sep 17 00:00:00 2001 From: JangCan <2862008188@qq.com> Date: Wed, 10 Apr 2024 11:33:34 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E8=A7=A3=E6=9E=90=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0=EF=BC=8C=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/ResolverMalfunctionLog.java | 47 +++++++++++++++++++ .../controller/MalfunctionController.java | 33 +++++++++++++ .../resolver/mapper/MalfunctionMapper.java | 11 +++++ .../resolver/service/MalfunctionService.java | 9 ++++ .../service/impl/MalfunctionServiceImpl.java | 23 +++++++++ .../MalfunctionEventServiceImpl.java | 11 +++++ .../mapper/resolver/MalfunctionMapper.xml | 11 +++++ 7 files changed, 145 insertions(+) create mode 100644 zhilian-common/zhilian-common-resolver/src/main/java/com/zhilian/common/resolver/domain/ResolverMalfunctionLog.java create mode 100644 zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/controller/MalfunctionController.java create mode 100644 zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/mapper/MalfunctionMapper.java create mode 100644 zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/MalfunctionService.java create mode 100644 zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/MalfunctionServiceImpl.java create mode 100644 zhilian-modules/zhilian-resolver/src/main/resources/mapper/resolver/MalfunctionMapper.xml diff --git a/zhilian-common/zhilian-common-resolver/src/main/java/com/zhilian/common/resolver/domain/ResolverMalfunctionLog.java b/zhilian-common/zhilian-common-resolver/src/main/java/com/zhilian/common/resolver/domain/ResolverMalfunctionLog.java new file mode 100644 index 0000000..550144c --- /dev/null +++ b/zhilian-common/zhilian-common-resolver/src/main/java/com/zhilian/common/resolver/domain/ResolverMalfunctionLog.java @@ -0,0 +1,47 @@ +package com.zhilian.common.resolver.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +/** + * @ClassName ResolverMalfunctionLog + * @Description 解析故障日志 + * @Author Can.J + * @Date 2024/4/10 11:10 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ResolverMalfunctionLog { + /** + * 故障主键id + */ + private Long id; + /** + * 故障码 + */ + private String malfunctionCode; + /** + * 车辆VIN + */ + private String malfunctionVin; + /** + * 开始报警时间 + */ + private Date startTime; + /** + * 故障类型 + */ + private String breakType; + /** + * 结束报警时间 + */ + private Date endTime; + /** + * 故障标签 + */ + private String malfunctionTag; + +} diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/controller/MalfunctionController.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/controller/MalfunctionController.java new file mode 100644 index 0000000..5896419 --- /dev/null +++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/controller/MalfunctionController.java @@ -0,0 +1,33 @@ +package com.zhilian.resolver.controller; + +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.resolver.domain.ResolverMalfunctionLog; +import com.zhilian.resolver.service.MalfunctionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +/** + * @ClassName MalfunctionController + * @Description 解析故障日志控制层 测试 + * @Author Can.J + * @Date 2024/4/10 11:13 + */ +@RestController +@RequestMapping("/malfunction") +public class MalfunctionController { + @Autowired + private MalfunctionService malfunctionService; + + /** + * 解析故障日志添加 测试 + * @param resolverMalfunctionLog + * @return + */ + @PostMapping("/resolverMalfunctionInsert") + public Result resolverMalfunctionInsert(@RequestBody ResolverMalfunctionLog resolverMalfunctionLog){ + Result resolverMalfunctionInsert =malfunctionService.resolverMalfunctionInsert(resolverMalfunctionLog); + return resolverMalfunctionInsert; + } +} diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/mapper/MalfunctionMapper.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/mapper/MalfunctionMapper.java new file mode 100644 index 0000000..b6ab721 --- /dev/null +++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/mapper/MalfunctionMapper.java @@ -0,0 +1,11 @@ +package com.zhilian.resolver.mapper; + +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.resolver.domain.ResolverMalfunctionLog; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface MalfunctionMapper { + Result resolverMalfunctionInsert(ResolverMalfunctionLog resolverMalfunctionLog); + +} diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/MalfunctionService.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/MalfunctionService.java new file mode 100644 index 0000000..106e03e --- /dev/null +++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/MalfunctionService.java @@ -0,0 +1,9 @@ +package com.zhilian.resolver.service; + +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.resolver.domain.ResolverMalfunctionLog; + +public interface MalfunctionService { + Result resolverMalfunctionInsert(ResolverMalfunctionLog resolverMalfunctionLog); + +} diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/MalfunctionServiceImpl.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/MalfunctionServiceImpl.java new file mode 100644 index 0000000..aaa3c79 --- /dev/null +++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/MalfunctionServiceImpl.java @@ -0,0 +1,23 @@ +package com.zhilian.resolver.service.impl; + +import com.zhilian.common.core.domain.Result; +import com.zhilian.common.resolver.domain.ResolverMalfunctionLog; +import com.zhilian.resolver.mapper.MalfunctionMapper; +import com.zhilian.resolver.service.MalfunctionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +/** + * @ClassName MalfunctionServiceImpl + * @Description 解析故障日志业务实现层 测试 + * @Author Can.J + * @Date 2024/4/10 11:12 + */ +@Service +public class MalfunctionServiceImpl implements MalfunctionService { + @Autowired + private MalfunctionMapper malfunctionMapper; + @Override + public Result resolverMalfunctionInsert(ResolverMalfunctionLog resolverMalfunctionLog) { + return malfunctionMapper.resolverMalfunctionInsert(resolverMalfunctionLog); + } +} diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/eventMalfunction/MalfunctionEventServiceImpl.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/eventMalfunction/MalfunctionEventServiceImpl.java index 660db86..cf333d4 100644 --- a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/eventMalfunction/MalfunctionEventServiceImpl.java +++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/eventMalfunction/MalfunctionEventServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.zhilian.business.domain.BusinessBreak; import com.zhilian.business.remote.RemoteBreakService; import com.zhilian.common.redis.service.RedisService; +import com.zhilian.common.resolver.domain.ResolverMalfunctionLog; import com.zhilian.common.resolver.domain.ResolverReportData; import com.zhilian.resolver.mapper.UserMapper; import com.zhilian.resolver.service.ResolverEventService; @@ -50,6 +51,11 @@ public class MalfunctionEventServiceImpl implements ResolverEventService { BusinessBreak businessBreak = new BusinessBreak(); businessBreak.setBreakVin(vehicleData.getVin()); + + //测试故障日志添加 + ResolverMalfunctionLog resolverMalfunctionLog = new ResolverMalfunctionLog(); + resolverMalfunctionLog.setMalfunctionVin(vehicleData.getVin()); + // * 车辆状态 1：正常 0：故障 if(vehicleData.getVehicleStatus()==0){ businessBreak.setBreakCode("CL001"); @@ -57,6 +63,11 @@ public class MalfunctionEventServiceImpl implements ResolverEventService { businessBreak.setBreakType("车体故障"); businessBreak.setBreakState("1"); remoteBreakService.add(businessBreak); + + //测试故障日志添加 + resolverMalfunctionLog.setMalfunctionCode("CL001"); + + } // * 充电状态 1：正常 0：故障 diff --git a/zhilian-modules/zhilian-resolver/src/main/resources/mapper/resolver/MalfunctionMapper.xml b/zhilian-modules/zhilian-resolver/src/main/resources/mapper/resolver/MalfunctionMapper.xml new file mode 100644 index 0000000..1db4d72 --- /dev/null +++ b/zhilian-modules/zhilian-resolver/src/main/resources/mapper/resolver/MalfunctionMapper.xml @@ -0,0 +1,11 @@ + + + + + + INSERT INTO `vehicle-resolver`.`resolver_malfunction_log` (`malfunction_code`, `malfunction_vin`, `start_time`, `break_type`, `end_time`, `malfunction_tag`) + VALUES (#{malfunctionCode}, #{malfunctionVin}, #{startTime}, #{breakType}, #{endTime}, #{malfunctionTag}); + +