From 4e4e80f64d54e77ab3b1c2d26766099b91f6fae4 Mon Sep 17 00:00:00 2001 From: Su ZeJing <3039179835@qq.com> Date: Wed, 10 Apr 2024 11:23:42 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/impl/MarkersFenceServiceImpl.java | 10 +++++----- .../service/impl/VehicleMarkersServiceImpl.java | 10 +++++----- .../src/main/resources/mapper/FenceMapper.xml | 7 ------- .../src/main/resources/mapper/VehicleMapper.xml | 7 ------- .../src/main/resources/mapper/VehicleMarkersMapper.xml | 7 ------- 5 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml delete mode 100644 zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml delete mode 100644 zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMarkersMapper.xml diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java index 5346718..b445052 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/MarkersFenceServiceImpl.java @@ -9,6 +9,7 @@ import com.zhilian.business.service.MarkersFenceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service @@ -19,20 +20,19 @@ public class MarkersFenceServiceImpl extends ServiceImpl markersFences = new ArrayList<>(); markers.getFenceIds().forEach(fenceId -> { MarkersFence markersFence = new MarkersFence(); markersFence.setMarkerId(markers.getMarkersId()); markersFence.setFenceId(fenceId); - markersFenceMapper.insert(markersFence); + markersFences.add(markersFence); }); - return true; + return this.saveBatch(markersFences); } @Override public void removeAllFence(Markers markers) { List list = this.list(new LambdaQueryWrapper().eq(MarkersFence::getMarkerId, markers.getMarkersId())); - list.forEach(item -> { - this.removeById(item.getMarkerId()); - }); + this.removeBatchByIds(list); } } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java index 35ab99a..48b1284 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/VehicleMarkersServiceImpl.java @@ -9,6 +9,7 @@ import com.zhilian.business.service.VehicleMarkersService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -17,20 +18,19 @@ public class VehicleMarkersServiceImpl extends ServiceImpl list = new ArrayList<>(); vehicle.getMarkersIds().forEach(markerId -> { VehicleMarkers vehicleMarkers = new VehicleMarkers(); vehicleMarkers.setVehicleId(vehicle.getVehicleId()); vehicleMarkers.setMarkersId(markerId); - this.save(vehicleMarkers); + list.add(vehicleMarkers); }); - return true; + return this.saveBatch(list); } @Override public void removeAllVehicle(Vehicle vehicle) { List list = this.list(new LambdaQueryWrapper().eq(VehicleMarkers::getVehicleId, vehicle.getVehicleId())); - list.forEach(item -> { - this.removeById(item.getVehicleId()); - }); + this.removeByIds(list); } } diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml deleted file mode 100644 index 6acc1c7..0000000 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/FenceMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml deleted file mode 100644 index 3addf96..0000000 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMarkersMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMarkersMapper.xml deleted file mode 100644 index 536f8f4..0000000 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/VehicleMarkersMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 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 2/6] =?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}); + + From 46639b77a0a060ce4879061b91d5a82ef37a53af Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Wed, 10 Apr 2024 20:41:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/BreakLogController.java | 11 +++++++++++ .../java/com/zhilian/business/domain/BreakLog.java | 4 +++- .../com/zhilian/business/mapper/BreakLogMapper.java | 2 ++ .../zhilian/business/service/BreakLogService.java | 2 ++ .../business/service/impl/BreakLogServiceImpl.java | 5 +++++ .../src/main/resources/mapper/BreakLogMapper.xml | 13 +++++++++---- 6 files changed, 32 insertions(+), 5 deletions(-) diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java index 6de8793..5aac0d8 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java @@ -3,7 +3,9 @@ package com.zhilian.business.controller; import com.zhilian.business.domain.BreakLog; import com.zhilian.business.service.BreakLogService; import com.zhilian.common.core.domain.Result; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -60,4 +62,13 @@ public class BreakLogController { return success; } + @PostMapping("logDel/{breakLogId}") + public Result logDel(@PathVariable Integer breakLogId){ + int del = breakLogService.logDel(breakLogId); + Result success = Result.success(del); + return success; + } + + + } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java index 068c39d..ccc22cf 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/domain/BreakLog.java @@ -25,6 +25,8 @@ public class BreakLog { private String breakTime; /** 开始报警时间 */ private String breakDate; - /** 是否报警 */ + /** 故障状态 */ private String breakState; + /** 逻辑删除 */ + private Integer breakDel; } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java index a8c7c7e..c072e45 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java @@ -18,4 +18,6 @@ public interface BreakLogMapper { int logAdd(BreakLog breakLog); int updLog(BreakLog breakLog); + + int logDel(Integer breakLogId); } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java index 10792ac..1168a49 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java @@ -16,4 +16,6 @@ public interface BreakLogService { int logAdd(BreakLog breakLog); int updLog(BreakLog breakLog); + + int logDel(Integer breakLogId); } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java index f3288a7..0c47c9f 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java @@ -74,4 +74,9 @@ public class BreakLogServiceImpl implements BreakLogService { public int updLog(BreakLog breakLog) { return breakLogMapper.updLog(breakLog); } + + @Override + public int logDel(Integer breakLogId) { + return breakLogMapper.logDel(breakLogId); + } } diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml index 82afe6b..a9919c4 100644 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml @@ -6,18 +6,23 @@ INSERT INTO `zhilian-business`.`business_break_log` - ( `break_code`, `break_vin`, `break_time`, `break_type`, `break_date`, `break_state`) + ( `break_code`, `break_vin`, `break_time`, `break_type`, `break_date`, `break_state`,`break_del`) VALUES - (#{breakCode}, #{breakVin}, NOW(), #{breakType}, NOW(), #{breakState}); + (#{breakCode}, #{breakVin},#{breakTime}, #{breakType},DATE_ADD(NOW(),INTERVAL 8 HOUR), #{breakState},0); UPDATE `zhilian-business`.`business_break_log` - SET `break_code` = #{breakCode}, `break_vin` = #{breakVin}, `break_time` = NOW(), `break_type` = #{breakType}, `break_date` = NOW(), `break_state` = #{breakState} + SET `break_code` = #{breakCode}, `break_vin` = #{breakVin}, `break_time` = NOW(), `break_type` = #{breakType}, `break_date` = NOW(), `break_state` = #{breakState}, `break_del` = #{breakDel} WHERE `break_log_id` = #{breakLogId}; + + UPDATE `zhilian-business`.`business_break_log` + SET break_del = 1 + WHERE break_log_id = #{breakLogId} + From 13960a292ff2ae7ff7f01d4d57432e7b079165de Mon Sep 17 00:00:00 2001 From: YuanYh <2972788632@qq.com> Date: Wed, 10 Apr 2024 20:42:48 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zhilian/business/domain/BreakLog.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/BreakLog.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/BreakLog.java index 497e4db..9bd9d92 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/BreakLog.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/BreakLog.java @@ -25,4 +25,6 @@ public class BreakLog { private String breakDate; /** 是否报警 */ private String breakState; + /** 逻辑删除 */ + private Integer breakDel; } From a144a4d96ab8ec250ef96075d26913e467d73903 Mon Sep 17 00:00:00 2001 From: JangCan <2862008188@qq.com> Date: Wed, 10 Apr 2024 22:40:27 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat=20=E6=95=85=E9=9A=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=AD=98=E5=82=A8redis,mysql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhilian/business/domain/BreakLog.java | 6 +- .../business/remote/RemoteBreakService.java | 5 +- .../factory/RemoteBreakFallbackFactory.java | 12 +- .../com/zhilian/common/resolver/ErrorCar.java | 23 -- .../domain/ResolverMalfunctionLog.java | 47 --- .../service/impl/BreakLogServiceImpl.java | 1 + .../controller/MalfunctionController.java | 33 -- .../resolver/mapper/MalfunctionMapper.java | 11 - .../resolver/service/MalfunctionService.java | 9 - .../service/impl/MalfunctionServiceImpl.java | 23 -- .../GeofenceEventServiceImpl.java | 58 ++-- .../MalfunctionEventServiceImpl.java | 325 ++++++++---------- .../mapper/resolver/MalfunctionMapper.xml | 11 - 13 files changed, 202 insertions(+), 362 deletions(-) delete mode 100644 zhilian-common/zhilian-common-resolver/src/main/java/com/zhilian/common/resolver/ErrorCar.java delete mode 100644 zhilian-common/zhilian-common-resolver/src/main/java/com/zhilian/common/resolver/domain/ResolverMalfunctionLog.java delete mode 100644 zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/controller/MalfunctionController.java delete mode 100644 zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/mapper/MalfunctionMapper.java delete mode 100644 zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/MalfunctionService.java delete mode 100644 zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/MalfunctionServiceImpl.java delete mode 100644 zhilian-modules/zhilian-resolver/src/main/resources/mapper/resolver/MalfunctionMapper.xml diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/BreakLog.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/BreakLog.java index 9bd9d92..8c90a67 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/BreakLog.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/domain/BreakLog.java @@ -2,6 +2,8 @@ package com.zhilian.business.domain; import lombok.Data; +import java.util.Date; + /** * @ClassName BreakLog * @Description TODO @@ -20,9 +22,9 @@ public class BreakLog { /** 故障类型 */ private String breakType; /** 结束报警时间 */ - private String breakTime; + private Date breakTime; /** 开始报警时间 */ - private String breakDate; + private Date breakDate; /** 是否报警 */ private String breakState; /** 逻辑删除 */ diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteBreakService.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteBreakService.java index 23409d5..0f06ea5 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteBreakService.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteBreakService.java @@ -1,6 +1,7 @@ package com.zhilian.business.remote; import com.zhilian.business.domain.Break; +import com.zhilian.business.domain.BreakLog; import com.zhilian.business.domain.BusinessBreak; import com.zhilian.business.remote.factory.RemoteBreakFallbackFactory; import com.zhilian.common.core.constant.ServiceNameConstants; @@ -15,8 +16,8 @@ public interface RemoteBreakService { /** * 新增故障 */ - @PostMapping - public Result add(@RequestBody BusinessBreak businessBreak); + @PostMapping("logAdd") + public Result logAdd(@RequestBody BreakLog breakLog); } diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteBreakFallbackFactory.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteBreakFallbackFactory.java index f12ee6b..3fdd31f 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteBreakFallbackFactory.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteBreakFallbackFactory.java @@ -1,5 +1,6 @@ package com.zhilian.business.remote.factory; +import com.zhilian.business.domain.BreakLog; import com.zhilian.business.domain.BusinessBreak; import com.zhilian.business.remote.RemoteBreakService; import com.zhilian.common.core.domain.Result; @@ -13,10 +14,17 @@ public class RemoteBreakFallbackFactory implements FallbackFactory split){ - if(split.size()<4){ + /** + * 判断点是否在矩形内（射线法） + * + * @param pointLat 纬度 + * @param pointLng 经度 + * @param coordinates 矩形顶点坐标数组，格式为：[纬度1,经度1,纬度2,经度2,纬度3,经度3] + * @return 如果点在矩形内，返回true；否则返回false + */ + private boolean isWithinFence(double pointLat, double pointLng, List coordinates) { + if (coordinates.size() < 4) { throw new IllegalArgumentException("不符合条件"); } @@ -64,14 +73,23 @@ public class GeofenceEventServiceImpl implements ResolverEventService { double[] latitudes = new double[4]; for (int i = 0; i < 4; i++) { - String[] coordinates = split.get(i).split(","); - latitudes[i] = parseDouble(coordinates[0]); - longitudes[i] = parseDouble(coordinates[1]); + String[] coordinate = coordinates.get(i).split(","); + latitudes[i] = parseDouble(coordinate[0]); + longitudes[i] = parseDouble(coordinate[1]); } - return isPointInRectangle(pointLat,pointLat,latitudes,longitudes); + return isPointInRectangle(pointLat, pointLng, latitudes, longitudes); } + /** + * 判断点是否在矩形内（射线法） + * + * @param pointLat 纬度 + * @param pointLng 经度 + * @param latitudes 矩形顶点纬度数组 + * @param longitudes 矩形顶点经度数组 + * @return 如果点在矩形内，返回true；否则返回false + */ private boolean isPointInRectangle(double pointLat, double pointLng, double[] latitudes, double[] longitudes) { // 根据矩形顶点顺序确定最小和最大纬度、经度 double minLatitude = Arrays.stream(latitudes).min().orElseThrow(); 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 cf333d4..ac5137b 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 @@ -1,10 +1,7 @@ package com.zhilian.resolver.service.impl.eventMalfunction; - -import com.alibaba.fastjson.JSON; -import com.zhilian.business.domain.BusinessBreak; +import com.zhilian.business.domain.BreakLog; 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; @@ -14,13 +11,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.HashSet; +import java.util.Set; import java.util.concurrent.TimeUnit; /** - * @ClassName MalfunctionEventServiceImpl - * @Description 故障事件服务 - * @Author Can.J - * @Date 2024/4/4 10:00 + * @ClassName MalfunctionEventServiceImpl + * @Description 故障事件服务 + * @Author Can.J + * @Date 2024/4/4 10:00 */ @Slf4j @Service("malfunction") @@ -46,185 +45,153 @@ public class MalfunctionEventServiceImpl implements ResolverEventService { @Override public void execute(ResolverReportData vehicleData) { log.info("故障事件开始执行"); - if(isAnyFieldZero(vehicleData)){ - resolverReportInfoService.saveDataToDatabaseByMalfunction(vehicleData); + if(isAnyFieldZero(vehicleData)){ + resolverReportInfoService.saveDataToDatabaseByMalfunction(vehicleData); - BusinessBreak businessBreak = new BusinessBreak(); - businessBreak.setBreakVin(vehicleData.getVin()); + BreakLog breakLog = new BreakLog(); + breakLog.setBreakVin(vehicleData.getVin()); - //测试故障日志添加 - ResolverMalfunctionLog resolverMalfunctionLog = new ResolverMalfunctionLog(); - resolverMalfunctionLog.setMalfunctionVin(vehicleData.getVin()); + // * 车辆状态 1：正常 0：故障 + if(vehicleData.getVehicleStatus()==0){ + breakLog.setBreakCode("CL001"); + breakLog.setBreakType("车体故障"); + breakLog.setBreakState("1"); + } - // * 车辆状态 1：正常 0：故障 - if(vehicleData.getVehicleStatus()==0){ - businessBreak.setBreakCode("CL001"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("车体故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); + // * 充电状态 1：正常 0：故障 + // private int chargingStatus; + if(vehicleData.getChargingStatus()==0){ + breakLog.setBreakCode("CD001"); + breakLog.setBreakType("电池故障"); + breakLog.setBreakState("1"); + } - //测试故障日志添加 - resolverMalfunctionLog.setMalfunctionCode("CL001"); + // * 运行状态 1：正常 0：故障 + if(vehicleData.getOperatingStatus()==0){ + breakLog.setBreakCode("DW001"); + breakLog.setBreakType("行驶故障"); + breakLog.setBreakState("1"); + } + + // * SOC 状态 1：正常 0：故障 + if(vehicleData.getSocStatus()==0){ + breakLog.setBreakCode("SOC001"); + breakLog.setBreakType("电池故障"); + breakLog.setBreakState("1"); + } + + // 可充电储能装置工作状态 1：正常 0：故障; + if(vehicleData.getChargingEnergyStorageStatus()==0){ + breakLog.setBreakCode("CDC001"); + breakLog.setBreakType("电池故障"); + breakLog.setBreakState("1"); + } + + // 驱动电机状态 1：正常 0：故障 + if(vehicleData.getDriveMotorStatus()==0){ + breakLog.setBreakCode("DJ001"); + breakLog.setBreakType("电机故障"); + breakLog.setBreakState("1"); + } + + // 定位是否有效 1：有效 0：无效 + if(vehicleData.getPositionStatus()==0){ + breakLog.setBreakCode("SOC001"); + breakLog.setBreakType("定位故障"); + breakLog.setBreakState("1"); + } + + // * EAS(汽车防盗系统)状态 1：正常 0：故障 + if(vehicleData.getEasStatus()==0){ + breakLog.setBreakCode("EAS001"); + breakLog.setBreakType("EAS故障"); + breakLog.setBreakState("1"); + } + + // * PTC(电动加热器)状态 1：正常 0：故障 + if(vehicleData.getPtcStatus()==0){ + breakLog.setBreakCode("PTC001"); + breakLog.setBreakType("加热故障"); + breakLog.setBreakState("1"); + } + + // * EPS(电动助力系统)状态 1：正常 0：故障 + if(vehicleData.getEpsStatus()==0){ + breakLog.setBreakCode("EPS001"); + breakLog.setBreakType("电动助力故障"); + breakLog.setBreakState("1"); + } + + // * ABS(防抱死)状态 1：正常 0：故障 + if(vehicleData.getAbsStatus()==0){ + breakLog.setBreakCode("ABS001"); + breakLog.setBreakType("ABS故障"); + breakLog.setBreakState("1"); + } + + // * MCU(电机/逆变器)状态 1：正常 0：故障 + if(vehicleData.getMcuStatus()==0){ + breakLog.setBreakCode("MCU001"); + breakLog.setBreakType("MCU故障"); + breakLog.setBreakState("1"); + } + + // * 动力电池加热状态 1：正常 0：故障 + if(vehicleData.getHeatingStatus()==0){ + breakLog.setBreakCode("DC002"); + breakLog.setBreakType("电池故障"); + breakLog.setBreakState("1"); + } + + // * 动力电池当前状态 1：正常 0：故障 + if(vehicleData.getBatteryStatus()==0){ + breakLog.setBreakCode("DC003"); + breakLog.setBreakType("电池故障"); + breakLog.setBreakState("1"); + } + + // * 动力电池保温状态 1：正常 0：故障 + if(vehicleData.getBatteryInsulationStatus()==0){ + breakLog.setBreakCode("DC004"); + breakLog.setBreakType("电池故障"); + breakLog.setBreakState("1"); + } + + // * DCDC(电力交换系统) 状态 1：正常 0：故障 + if(vehicleData.getDcdcStatus()==0){ + breakLog.setBreakCode("DCDC005"); + breakLog.setBreakType("电力故障"); + breakLog.setBreakState("1"); + } + + // * CHG(充电机)状态 1：正常 0：故障 + if(vehicleData.getChgStatus()==0){ + breakLog.setBreakCode("CDJ005"); + breakLog.setBreakType("电力故障"); + breakLog.setBreakState("1"); + + } + + HashSet breakHash = new HashSet<>(); + breakHash.add(breakLog); - } - - // * 充电状态 1：正常 0：故障 - // private int chargingStatus; - if(vehicleData.getChargingStatus()==0){ - businessBreak.setBreakCode("CD001"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("电池故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // * 运行状态 1：正常 0：故障 - if(vehicleData.getOperatingStatus()==0){ - businessBreak.setBreakCode("DW001"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("行驶故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // * SOC 状态 1：正常 0：故障 - if(vehicleData.getSocStatus()==0){ - businessBreak.setBreakCode("SOC001"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("电池故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // 可充电储能装置工作状态 1：正常 0：故障; - if(vehicleData.getChargingEnergyStorageStatus()==0){ - businessBreak.setBreakCode("CDC001"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("电池故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // 驱动电机状态 1：正常 0：故障 - if(vehicleData.getDriveMotorStatus()==0){ - businessBreak.setBreakCode("DJ001"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("电机故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // 定位是否有效 1：有效 0：无效 - if(vehicleData.getPositionStatus()==0){ - businessBreak.setBreakCode("SOC001"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("定位故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // * EAS(汽车防盗系统)状态 1：正常 0：故障 - if(vehicleData.getEasStatus()==0){ - businessBreak.setBreakCode("EAS001"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("EAS故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // * PTC(电动加热器)状态 1：正常 0：故障 - if(vehicleData.getPtcStatus()==0){ - businessBreak.setBreakCode("PTC001"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("加热故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // * EPS(电动助力系统)状态 1：正常 0：故障 - if(vehicleData.getEpsStatus()==0){ - businessBreak.setBreakCode("EPS001"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("电动助力故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // * ABS(防抱死)状态 1：正常 0：故障 - if(vehicleData.getAbsStatus()==0){ - businessBreak.setBreakCode("ABS001"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("ABS故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // * MCU(电机/逆变器)状态 1：正常 0：故障 - if(vehicleData.getMcuStatus()==0){ - businessBreak.setBreakCode("MCU001"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("MCU故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // * 动力电池加热状态 1：正常 0：故障 - if(vehicleData.getHeatingStatus()==0){ - businessBreak.setBreakCode("DC002"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("电池故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // * 动力电池当前状态 1：正常 0：故障 - if(vehicleData.getBatteryStatus()==0){ - businessBreak.setBreakCode("DC003"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("电池故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // * 动力电池保温状态 1：正常 0：故障 - if(vehicleData.getBatteryInsulationStatus()==0){ - businessBreak.setBreakCode("DC004"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("电池故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // * DCDC(电力交换系统) 状态 1：正常 0：故障 - if(vehicleData.getDcdcStatus()==0){ - businessBreak.setBreakCode("DCDC005"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("电力故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - // * CHG(充电机)状态 1：正常 0：故障 - if(vehicleData.getChgStatus()==0){ - businessBreak.setBreakCode("CDJ005"); - businessBreak.setBreakDate(new Date()); - businessBreak.setBreakType("电力故障"); - businessBreak.setBreakState("1"); - remoteBreakService.add(businessBreak); - } - - - - -// String key = "breakdown"; - String value = JSON.toJSONString(businessBreak); - redisService.setCacheObject("breakdown:gz:"+vehicleData.getVin(),value); - long expireTime = 30; - redisService.expire("breakdown:gz:"+vehicleData.getVin(), expireTime, TimeUnit.MINUTES); + redisService.setCacheSet("breakdown:gz:："+vehicleData.getVin(),breakHash); + Set breakLogsFromRedis = redisService.getCacheSet("breakdown:gz:：" + vehicleData.getVin()); + if(breakLogsFromRedis !=null && !breakLogsFromRedis.isEmpty()){ + // 将Redis中的数据遍历，逐条插入数据库 + for (BreakLog breakLogs : breakLogsFromRedis) { + remoteBreakService.logAdd(breakLogs); } + }else { + log.info("没有找到对应VIN的故障记录在Redis中，无需同步到数据库"); + } + + long expireTime = 30; + redisService.expire("breakdown:gz:"+vehicleData.getVin(), expireTime, TimeUnit.MINUTES); + + } log.info("故障事件结束"); 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 deleted file mode 100644 index 1db4d72..0000000 --- a/zhilian-modules/zhilian-resolver/src/main/resources/mapper/resolver/MalfunctionMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - 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}); - - From 08acad4531bc4d035b70ba9c069c3e7864d24ec1 Mon Sep 17 00:00:00 2001 From: JangCan <2862008188@qq.com> Date: Thu, 11 Apr 2024 10:28:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feat=20=E6=95=85=E9=9A=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=AD=98=E5=82=A8redis,mysql=E7=9A=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/remote/RemoteBreakService.java | 6 +- .../factory/RemoteBreakFallbackFactory.java | 12 ++- .../controller/BreakLogController.java | 18 +++- .../business/mapper/BreakLogMapper.java | 9 ++ .../business/service/BreakLogService.java | 8 ++ .../service/impl/BreakLogServiceImpl.java | 13 +++ .../main/resources/mapper/BreakLogMapper.xml | 19 ++++ .../resolver/ZhiLianResolverApplication.java | 3 - .../resolverReport/ResolverMqttMsg.java | 101 ------------------ .../MalfunctionEventServiceImpl.java | 20 +++- 10 files changed, 94 insertions(+), 115 deletions(-) diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteBreakService.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteBreakService.java index 0f06ea5..084df2d 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteBreakService.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/RemoteBreakService.java @@ -8,6 +8,9 @@ import com.zhilian.common.core.constant.ServiceNameConstants; import com.zhilian.common.core.domain.Result; import lombok.extern.java.Log; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -19,5 +22,6 @@ public interface RemoteBreakService { @PostMapping("logAdd") public Result logAdd(@RequestBody BreakLog breakLog); - + @GetMapping("/checkIfBreakLogExists/{breakCode}/{breakVin}") + public ResponseEntity checkIfBreakLogExists(@PathVariable("breakCode") String breakCode, @PathVariable("breakVin") String breakVin); } diff --git a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteBreakFallbackFactory.java b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteBreakFallbackFactory.java index 3fdd31f..76eb05a 100644 --- a/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteBreakFallbackFactory.java +++ b/zhilian-common/zhilian-common-business/src/main/java/com/zhilian/business/remote/factory/RemoteBreakFallbackFactory.java @@ -6,6 +6,8 @@ import com.zhilian.business.remote.RemoteBreakService; import com.zhilian.common.core.domain.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; @Slf4j @Component @@ -15,8 +17,14 @@ public class RemoteBreakFallbackFactory implements FallbackFactory checkIfBreakLogExists(String breakCode, String breakVin) { + log.error("根据VIN和故障码查询服务调用失败"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(false); } }; // return new RemoteBreakService() { diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java index 5aac0d8..81c08d2 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/controller/BreakLogController.java @@ -5,10 +5,8 @@ import com.zhilian.business.service.BreakLogService; import com.zhilian.common.core.domain.Result; import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -69,6 +67,16 @@ public class BreakLogController { return success; } - + /** + * 根据故障码和vin判断数据库中是否有数据 + * @param breakCode + * @param breakVin + * @return + */ + @GetMapping("/checkIfBreakLogExists/{breakCode}/{breakVin}") + public ResponseEntity checkIfBreakLogExists(@PathVariable("breakCode") String breakCode,@PathVariable("breakVin") String breakVin){ + boolean exists =breakLogService.checkIfBreakLogExists(breakCode,breakVin); + return ResponseEntity.ok(exists); + } } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java index c072e45..730b1db 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/mapper/BreakLogMapper.java @@ -2,6 +2,7 @@ package com.zhilian.business.mapper; import com.zhilian.business.domain.BreakLog; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,4 +21,12 @@ public interface BreakLogMapper { int updLog(BreakLog breakLog); int logDel(Integer breakLogId); + + /** + * 根据故障码和vin判断数据库中是否有数据 + * @param breakCode + * @param breakVin + * @return + */ + BreakLog findByBreakCodeAndBreakVin(@Param("breakCode") String breakCode, @Param("breakVin") String breakVin); } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java index 1168a49..b73063c 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/BreakLogService.java @@ -18,4 +18,12 @@ public interface BreakLogService { int updLog(BreakLog breakLog); int logDel(Integer breakLogId); + + /** + * 根据故障码和vin判断数据库中是否有数据 + * @param breakCode + * @param breakVin + * @return + */ + boolean checkIfBreakLogExists(String breakCode, String breakVin); } diff --git a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java index 1a91849..34a8d32 100644 --- a/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java +++ b/zhilian-modules/zhilian-business/src/main/java/com/zhilian/business/service/impl/BreakLogServiceImpl.java @@ -80,4 +80,17 @@ public class BreakLogServiceImpl implements BreakLogService { return breakLogMapper.logDel(breakLogId); } + + /** + * 根据故障码和vin判断数据库中是否有数据 + * @param breakCode + * @param breakVin + * @return + */ + @Override + public boolean checkIfBreakLogExists(String breakCode, String breakVin) { + BreakLog breakLog =breakLogMapper.findByBreakCodeAndBreakVin(breakCode,breakVin); + return breakLog!=null; + } + } diff --git a/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml index a9919c4..a584197 100644 --- a/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml +++ b/zhilian-modules/zhilian-business/src/main/resources/mapper/BreakLogMapper.xml @@ -3,6 +3,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + INSERT INTO `zhilian-business`.`business_break_log` @@ -25,4 +38,10 @@ + + + + diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java index b7af81a..cd5f883 100644 --- a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java +++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhiLianResolverApplication.java @@ -22,9 +22,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableMyFeignClients(basePackages = {"com.zhilian.business.remote","com.zhilian.common.system.remote"}) @MapperScan({"com.zhilian.resolver.mapper", "com.zhilian.resolver.resolverReport"}) @SpringBootApplication -//com.zhilian.business.remote.factory.RemoteBreakFallbackFactory -//com.zhilian.business.remote.factory.RemoteFenceFallbackFactory -//com.zhilian.business.remote.factory.RemoteVehicleFallbackFactory public class ZhiLianResolverApplication { public static void main(String[] args) { SpringApplication.run(ZhiLianResolverApplication.class,args); diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/resolverReport/ResolverMqttMsg.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/resolverReport/ResolverMqttMsg.java index b6a5298..78b8d51 100644 --- a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/resolverReport/ResolverMqttMsg.java +++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/resolverReport/ResolverMqttMsg.java @@ -90,34 +90,11 @@ public class ResolverMqttMsg { ResolverEventService resolverEventService =SpringUtils.getBean(stringEvent); resolverEventService.execute(vehicleData); -// if(isAnyFieldZero(vehicleData)){ -// malfunctionEventService.execute(vehicleData); -// } } } log.info("字符串：{}",str); } -// private boolean isAnyFieldZero(ResolverReportData resolverReportData){ -// return resolverReportData.getChargingStatus() == 0 || -// resolverReportData.getOperatingStatus() == 0 || -// resolverReportData.getSocStatus() == 0 || -// resolverReportData.getVehicleStatus() == 0 || -// resolverReportData.getChargingEnergyStorageStatus() == 0 || -// resolverReportData.getDriveMotorStatus() == 0 || -// resolverReportData.getPositionStatus() == 0 || -// resolverReportData.getEasStatus() == 0 || -// resolverReportData.getPtcStatus() == 0 || -// resolverReportData.getEpsStatus() == 0 || -// resolverReportData.getAbsStatus() == 0 || -// resolverReportData.getMcuStatus() == 0 || -// resolverReportData.getHeatingStatus() == 0 || -// resolverReportData.getBatteryStatus() == 0 || -// resolverReportData.getBatteryInsulationStatus() == 0 || -// resolverReportData.getDcdcStatus() == 0 || -// resolverReportData.getChgStatus() == 0; -// } - @Override public void deliveryComplete(IMqttDeliveryToken token) { log.info("消息已成功投递：{}",token); @@ -177,15 +154,11 @@ public class ResolverMqttMsg { String tim =str.substring(18,31); long timestamp = Long.parseLong(tim); - log.info("时间串=="+tim); Date date = new Date(timestamp); - System.out.println("时间"+date); vehicleData.setCreateTime(date); - log.info("shijian =="+vehicleData.getCreateTime()); //经度 String lt = str.substring(31,42); - log.info("经度串==：{}",lt); // 如果末尾是零，则舍去 int endIndex = lt.length() - 1; while (lt.charAt(endIndex) == '0'){ @@ -194,11 +167,9 @@ public class ResolverMqttMsg { String longitude = lt.substring(0, endIndex + 1); vehicleData.setLongitude(longitude); - log.info("经度 =="+vehicleData.getLongitude()); //维度 String latitudeIndex =str.substring(42,52); - log.info("维度串==：{}",latitudeIndex); int endIndexT = latitudeIndex.length() - 1; while (latitudeIndex.charAt(endIndexT) == '0'){ endIndexT--; @@ -206,303 +177,231 @@ public class ResolverMqttMsg { String latitude = latitudeIndex.substring(0, endIndexT + 1); vehicleData.setLatitude(latitude); - log.info("维度==:{}",vehicleData.getLatitude()); //速度speed String speed =str.substring(52,58); - log.info("速度==：{}",speed); vehicleData.setSpeed(speed); - log.info("速度==:{}",vehicleData.getSpeed()); //里程 BigDecimal mileage= new BigDecimal(str.substring(58,69)); - log.info("里程==：{}",mileage); mileage=mileage.stripTrailingZeros(); vehicleData.setMileage(mileage); - log.info("里程==:{}",vehicleData.getMileage()); //总电压 String voltage =str.substring(69,75); - log.info("总电压==：{}",voltage); while (voltage.endsWith("0")) { voltage = voltage.substring(0, voltage.length() - 1); // 去除末尾的零 } vehicleData.setVoltage(voltage); - log.info("总电压==:{}",vehicleData.getVoltage()); //总电流 String current =str.substring(75,80); - log.info("总电流==：{}",current); while (current.endsWith("0")){ current=current.substring(0,current.length()-1); } vehicleData.setCurrent(current); - log.info("总电流==：{}",vehicleData.getCurrent()); //绝缘电阻 resistance String res =str.substring(80,89); - log.info("绝缘电阻==：{}",res); String resistance = res.substring(0, 5); vehicleData.setResistance(resistance); - log.info("绝缘电阻==：{}",vehicleData.getResistance()); //档位 String gear =str.substring(89,90); - log.info("档位==：{}",gear); vehicleData.setGear(gear); - log.info("档位==：{}",vehicleData.getGear()); //accelerationPedal 加速踏板行程值 String accelerationPedal =str.substring(90,91); - log.info("加速踏板行程值==：{}",accelerationPedal); vehicleData.setAccelerationPedal(accelerationPedal); - log.info("加速踏板行程值==：{}",vehicleData.getAccelerationPedal()); //brakePedal 制动踏板行程值 String brakePedal =str.substring(92,93); - log.info("制动踏板行程值==：{}",brakePedal); vehicleData.setBrakePedal(brakePedal); - log.info("制动踏板行程值==：{}",vehicleData.getBrakePedal()); //fuelConsumptionRate 燃料消耗率 String fuelConsumptionRate =str.substring(94,99); - log.info("燃料消耗率==：{}",fuelConsumptionRate); vehicleData.setFuelConsumptionRate(fuelConsumptionRate); - log.info("燃料消耗率==：{}",vehicleData.getFuelConsumptionRate()); //motorControllerTemperature 电机控制器温度 String motorControllerTemperature =str.substring(99,105); while (motorControllerTemperature.endsWith("0")){ motorControllerTemperature=motorControllerTemperature.substring(0,motorControllerTemperature.length()-1); } - log.info("电机控制器温度==：{}",motorControllerTemperature); vehicleData.setMotorControllerTemperature(motorControllerTemperature); - log.info("电机控制器温度==：{}",vehicleData.getMotorControllerTemperature()); //motorSpeed 电机转速 String motorSpeed =str.substring(105,110); - log.info("电机转速==：{}",motorSpeed); vehicleData.setMotorSpeed(motorSpeed); - log.info("电机转速==：{}",vehicleData.getMotorSpeed()); //motorTorque 电机转矩 String motorTorque =str.substring(110,114); - log.info("电机转矩==：{}",motorTorque); while (motorTorque.endsWith("0")){ motorTorque=motorTorque.substring(0,motorTorque.length()-1); } vehicleData.setMotorTorque(motorTorque); - log.info("电机转矩==：{}",vehicleData.getMotorTorque()); //motorTemperature 电机温度 String motorTemperature =str.substring(114,120); - log.info("电机温度==：{}",motorTemperature); while (motorTemperature.endsWith("0")){ motorTemperature=motorTemperature.substring(0,motorTemperature.length()-1); } vehicleData.setMotorTemperature(motorTemperature); - log.info("电机温度==：{}",vehicleData.getMotorTemperature()); //motorVoltage 电机电压 String motorVoltage =str.substring(120,125); - log.info("电机电压==：{}",motorVoltage); while (motorVoltage.endsWith("0")){ motorVoltage=motorVoltage.substring(0,motorVoltage.length()-1); } vehicleData.setMotorVoltage(motorVoltage); - log.info("电机电压==：{}",vehicleData.getMotorVoltage()); //motorCurrent 电机电流 String motorCurrent =str.substring(125,133); - log.info("电机电流==：{}",motorCurrent); while (motorCurrent.endsWith("0")){ motorCurrent=motorCurrent.substring(0,motorCurrent.length()-1); } vehicleData.setMotorCurrent(motorCurrent); - log.info("电机电流==：{}",vehicleData.getMotorCurrent()); //remainingBattery 动力电池剩余电量SOC BigDecimal remainingBattery = new BigDecimal(str.substring(133,138)); - log.info("动力电池剩余电量SOC==：{}",remainingBattery); vehicleData.setRemainingBattery(remainingBattery); - log.info("动力电池剩余电量SOC==：{}",vehicleData.getRemainingBattery()); //maximumFeedbackPower 当前状态允许的最大反馈功率 String maximumFeedbackPower =str.substring(139,144); - log.info("当前状态允许的最大反馈功率==：{}",maximumFeedbackPower); while (maximumFeedbackPower.endsWith("0")){ maximumFeedbackPower=maximumFeedbackPower.substring(0,maximumFeedbackPower.length()-1); } vehicleData.setMaximumFeedbackPower(maximumFeedbackPower); - log.info("当前状态允许的最大反馈功率==:{}",vehicleData.getMaximumFeedbackPower()); //maximumDischargePower 当前状态允许最大放电功率 String maximumDischargePower =str.substring(145,151); - log.info("当前状态允许最大放电功率:{}",maximumDischargePower); while (maximumDischargePower.endsWith("0")){ maximumDischargePower=maximumDischargePower.substring(0,maximumDischargePower.length()-1); } vehicleData.setMaximumDischargePower(maximumDischargePower); - log.info("当前状态允许最大放电功率：{}",vehicleData.getMaximumDischargePower()); //selfCheckCounter BMS自检计数器 String selfCheckCounter =str.substring(151,153); String selfCheckCounterReplace = selfCheckCounter.replace("0", ""); - log.info("BMS自检计数器==：{}",selfCheckCounter); vehicleData.setSelfCheckCounter(selfCheckCounterReplace); - log.info("BMS自检计数器==：{}",vehicleData.getSelfCheckCounter()); //totalBatteryCurrent 动力电池充放电电流 String totalBatteryCurrent =str.substring(153,158); - log.info("BMS自检计数器==：{}",totalBatteryCurrent); while (totalBatteryCurrent.endsWith("0")){ totalBatteryCurrent=totalBatteryCurrent.substring(0,totalBatteryCurrent.length()-1); } vehicleData.setTotalBatteryCurrent(totalBatteryCurrent); - log.info("BMS自检计数器==：{}",vehicleData.getTotalBatteryCurrent()); //totalBatteryVoltage 动力电池负载端总电压V3 String totalBatteryVoltage =str.substring(158,164); - log.info("动力电池负载端总电压V3==：{}",totalBatteryVoltage); while (totalBatteryVoltage.endsWith("0")){ totalBatteryVoltage=totalBatteryVoltage.substring(0,totalBatteryVoltage.length()-1); } vehicleData.setTotalBatteryVoltage(totalBatteryVoltage); - log.info("动力电池负载端总电压V3==：{}",vehicleData.getTotalBatteryVoltage()); //singleBatteryMaxVoltage 单次最大电压 String singleBatteryMaxVoltage =str.substring(164,168); - log.info("单次最大电压==：{}",singleBatteryMaxVoltage); while (singleBatteryMaxVoltage.endsWith("0")){ singleBatteryMaxVoltage=singleBatteryMaxVoltage.substring(0,singleBatteryMaxVoltage.length()-1); } vehicleData.setSingleBatteryMaxVoltage(singleBatteryMaxVoltage); - log.info("单次最大电压==：{}",vehicleData.getSingleBatteryMaxVoltage()); //singleBatteryMinVoltage 单体电池最低电压 String singleBatteryMinVoltage =str.substring(168,172); - log.info("单体电池最低电压==：{}",singleBatteryMinVoltage); while (singleBatteryMinVoltage.endsWith("0")){ singleBatteryMinVoltage=singleBatteryMinVoltage.substring(0,singleBatteryMinVoltage.length()-1); } vehicleData.setSingleBatteryMinVoltage(singleBatteryMinVoltage); - log.info("单体电池最低电压==：{}",vehicleData.getSingleBatteryMinVoltage()); //singleBatteryMaxTemperature 单体电池最高温度 String singleBatteryMaxTemperature =str.substring(172,178); - log.info("单体电池最高温度==：{}",singleBatteryMaxTemperature); while (singleBatteryMaxTemperature.endsWith("0")){ singleBatteryMaxTemperature=singleBatteryMaxTemperature.substring(0,singleBatteryMaxTemperature.length()-1); } vehicleData.setSingleBatteryMaxTemperature(singleBatteryMaxTemperature); - log.info("单体电池最高温度==：{}",vehicleData.getSingleBatteryMaxTemperature()); //singleBatteryMinTemperature 单体电池最低温度 String singleBatteryMinTemperature =str.substring(178,184); - log.info("单体电池最低温度==：{}",singleBatteryMinTemperature); while (singleBatteryMinTemperature.endsWith("0")){ singleBatteryMinTemperature=singleBatteryMinTemperature.substring(0,singleBatteryMinTemperature.length()-1); } vehicleData.setSingleBatteryMinTemperature(singleBatteryMinTemperature); - log.info("单体电池最低温度==：{}",vehicleData.getSingleBatteryMinTemperature()); //availableBatteryCapacity 可用电池容量 String availableBatteryCapacity =str.substring(184,190); - log.info("可用电池容量==：{}",availableBatteryCapacity); while (availableBatteryCapacity.endsWith("0")){ availableBatteryCapacity=availableBatteryCapacity.substring(0,availableBatteryCapacity.length()-1); } vehicleData.setAvailableBatteryCapacity(availableBatteryCapacity); - log.info("可用电池容量==：{}",vehicleData.getAvailableBatteryCapacity()); //vehicleStatus 车辆状态 int vehicleStatus = Integer.parseInt(str.substring(190,191)); vehicleData.setVehicleStatus(vehicleStatus); - log.info("车辆状态==：{}",vehicleData.getVehicleStatus()); //chargingStatus 充电状态 int chargingStatus = Integer.parseInt(str.substring(191,192)); vehicleData.setChargingStatus(chargingStatus); - log.info("充电状态==：{}",vehicleData.getChargingStatus()); //operatingStatus 运行状态 int operatingStatus = Integer.parseInt(str.substring(192,193)); vehicleData.setOperatingStatus(operatingStatus); - log.info("运行状态==：{}",vehicleData.getOperatingStatus()); //socStatus SOC int socStatus = Integer.parseInt(str.substring(193,194)); vehicleData.setSocStatus(socStatus); - log.info("SOC==：{}",vehicleData.getSocStatus()); //chargingEnergyStorageStatus 可充电储能装置工作状态 int chargingEnergyStorageStatus = Integer.parseInt(str.substring(194,195)); vehicleData.setChargingEnergyStorageStatus(chargingEnergyStorageStatus); - log.info("可充电储能装置工作状态==：{}",vehicleData.getChargingEnergyStorageStatus()); //driveMotorStatus 驱动电机状态 int driveMotorStatus = Integer.parseInt(str.substring(195,196)); vehicleData.setDriveMotorStatus(driveMotorStatus); - log.info("驱动电机状态==：{}",vehicleData.getDriveMotorStatus()); //positionStatus 定位是否有效 int positionStatus = Integer.parseInt(str.substring(196,197)); vehicleData.setPositionStatus(positionStatus); - log.info("定位是否有效==：{}",vehicleData.getPositionStatus()); //easStatus EAS(汽车防盗系统)状态 int easStatus = Integer.parseInt(str.substring(197,198)); vehicleData.setEasStatus(easStatus); - log.info("EAS(汽车防盗系统)状态==：{}",vehicleData.getEasStatus()); //ptcStatus PTC(电动加热器)状态 int ptcStatus = Integer.parseInt(str.substring(198,199)); vehicleData.setPtcStatus(ptcStatus); - log.info("PTC(电动加热器)状态==：{}",vehicleData.getPtcStatus()); //epsStatus int epsStatus = Integer.parseInt(str.substring(199,200)); vehicleData.setEpsStatus(epsStatus); - log.info("车辆状态==：{}",vehicleData.getEpsStatus()); //absStatus EPS(电动助力系统)状态 int absStatus = Integer.parseInt(str.substring(200,201)); vehicleData.setAbsStatus(absStatus); - log.info("EPS(电动助力系统)状态==：{}",vehicleData.getAbsStatus()); //mcuStatus MCU(电机/逆变器)状态 int mcuStatus = Integer.parseInt(str.substring(201,202)); vehicleData.setMcuStatus(mcuStatus); - log.info("MCU(电机/逆变器)状态==：{}",vehicleData.getMcuStatus()); //heatingStatus 动力电池加热状态 int heatingStatus = Integer.parseInt(str.substring(202,203)); vehicleData.setHeatingStatus(heatingStatus); - log.info("动力电池加热状态==：{}",vehicleData.getHeatingStatus()); //batteryStatus 动力电池当前状态 int batteryStatus = Integer.parseInt(str.substring(203,204)); vehicleData.setBatteryStatus(batteryStatus); - log.info("动力电池当前状态==：{}",vehicleData.getBatteryStatus()); //batteryInsulationStatus 动力电池保温状态 int batteryInsulationStatus = Integer.parseInt(str.substring(204,205)); vehicleData.setBatteryInsulationStatus(batteryInsulationStatus); - log.info("动力电池保温状态==：{}",vehicleData.getBatteryInsulationStatus()); //dcdcStatus DCDC(电力交换系统)状态 int dcdcStatus = Integer.parseInt(str.substring(205,206)); vehicleData.setDcdcStatus(dcdcStatus); - log.info("DCDC(电力交换系统)状态==：{}",vehicleData.getDcdcStatus()); //chgStatus CHG(充电机)状态 int chgStatus = Integer.parseInt(str.substring(206,207)); vehicleData.setChgStatus(chgStatus); - log.info("CHG(充电机)状态 ==：{}",vehicleData.getChgStatus()); - - log.info("车辆数据解析完成:{}",vehicleData); vehicleDataList.add(vehicleData); 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 ac5137b..3759b16 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 @@ -8,10 +8,12 @@ import com.zhilian.resolver.service.ResolverEventService; import com.zhilian.resolver.service.ResolverReportInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import java.util.Date; import java.util.HashSet; +import java.util.Optional; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -39,6 +41,9 @@ public class MalfunctionEventServiceImpl implements ResolverEventService { @Autowired private ResolverReportInfoService resolverReportInfoService; + /** + * 远程调用 BreakLog服务 + */ @Autowired private RemoteBreakService remoteBreakService; @@ -180,9 +185,10 @@ public class MalfunctionEventServiceImpl implements ResolverEventService { Set breakLogsFromRedis = redisService.getCacheSet("breakdown:gz:：" + vehicleData.getVin()); if(breakLogsFromRedis !=null && !breakLogsFromRedis.isEmpty()){ - // 将Redis中的数据遍历，逐条插入数据库 - for (BreakLog breakLogs : breakLogsFromRedis) { - remoteBreakService.logAdd(breakLogs); + // 检查第一条故障记录是否已存在于数据库中 + BreakLog firstBreakLog = breakLogsFromRedis.iterator().next(); + if (!isInDatabase(firstBreakLog)) { + remoteBreakService.logAdd(firstBreakLog); } }else { log.info("没有找到对应VIN的故障记录在Redis中，无需同步到数据库"); @@ -221,4 +227,12 @@ public class MalfunctionEventServiceImpl implements ResolverEventService { public String getEventName() { return "malfunction"; } + + private boolean isInDatabase(BreakLog breakLog) { + // 查询数据库，判断是否已存在相同的故障记录 + // 故障记录的唯一标识是breakCode和breakVin + ResponseEntity existingBreakLog = remoteBreakService.checkIfBreakLogExists(breakLog.getBreakCode(), breakLog.getBreakVin()); + return existingBreakLog != null && existingBreakLog.getBody(); + + } }