Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu

# Conflicts:
#	couplet-modules/couplet-business/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
server_five_liuyunhu
liuyunhu 2024-04-08 14:05:30 +08:00
commit 1b9c777a87
14 changed files with 435 additions and 273 deletions

View File

@ -65,4 +65,9 @@ public class CoupletTroubleCode {
*/ */
@Excel(name = "故障位置") @Excel(name = "故障位置")
private String troublePosition; private String troublePosition;
/**
*
*/
private Integer processingState;
} }

View File

@ -0,0 +1,19 @@
package com.couplet.remote;
import com.couplet.common.core.constant.ServiceNameConstants;
import com.couplet.common.core.domain.Result;
import com.couplet.common.domain.CoupletTroubleCode;
import com.couplet.remote.factory.RemoteRealTimeFallbackFactory;
import com.couplet.remote.factory.RemoteTroubleFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@FeignClient(contextId = "remoteRealTimeService" ,
value = ServiceNameConstants.BUSINESS_SERVICE,
fallbackFactory = RemoteRealTimeFallbackFactory.class
)
public interface RemoteRealTimeService {
}

View File

@ -63,13 +63,6 @@ public interface RemoteVehicleService {
*/ */
@PostMapping("/vehicleAndLogo/queryByLogoIds/{vehicleId}") @PostMapping("/vehicleAndLogo/queryByLogoIds/{vehicleId}")
public Result<List<Long>> queryByLogoIds(@PathVariable("vehicleId") Long vehicleId); public Result<List<Long>> queryByLogoIds(@PathVariable("vehicleId") Long vehicleId);
/**
* id
* @param
* @return
*/
// @PostMapping("/vehicleAndLogo/queryByLogoIds/{vehicleId}")
// public Result<List<Long>> queryByLogoIds(@PathVariable("vehicleId") Long vehicleId);
@PostMapping("/list") @PostMapping("/list")
public Result list(@RequestBody VehicleListParams listParams); public Result list(@RequestBody VehicleListParams listParams);

View File

@ -0,0 +1,21 @@
package com.couplet.remote.factory;
import com.couplet.common.core.domain.Result;
import com.couplet.common.domain.CoupletTroubleCode;
import com.couplet.remote.RemoteRealTimeService;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
/**
* @Author: LiJiaYao
* @Date: 2024/4/8
* @Description:
*/
@Component
public class RemoteRealTimeFallbackFactory implements FallbackFactory<RemoteRealTimeService> {
@Override
public RemoteRealTimeService create(Throwable cause) {
return null;
}
}

View File

@ -1,5 +1,6 @@
package com.couplet.analyze.common.contents; package com.couplet.analyze.common.contents;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
@ -8,8 +9,7 @@ import org.springframework.stereotype.Component;
* @Description: * @Description:
*/ */
@Component public interface AnalyzeEventContents {
public class AnalyzeEventContents {
/** /**
* *

View File

@ -92,6 +92,8 @@
<groupId>com.couplet</groupId> <groupId>com.couplet</groupId>
<artifactId>couplet-common-event</artifactId> <artifactId>couplet-common-event</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.kafka</groupId> <groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId> <artifactId>spring-kafka</artifactId>
@ -101,6 +103,12 @@
<artifactId>couplet-common-business</artifactId> <artifactId>couplet-common-business</artifactId>
</dependency> </dependency>
<!-- RabbitMQ依赖-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -1,150 +1,203 @@
//package com.couplet.analyze.msg.consumer; package com.couplet.analyze.msg.consumer;
//
//import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
//import com.couplet.analyze.msg.domain.CoupletMsgData; import com.couplet.analyze.msg.domain.CoupletMsgData;
//import com.couplet.analyze.msg.utils.MsgUtils; import com.couplet.analyze.msg.utils.MsgUtils;
//import com.couplet.common.domain.CoupletTroubleCode; import com.couplet.common.domain.CoupletTroubleCode;
//import com.couplet.common.redis.service.RedisService; import com.couplet.common.redis.service.RedisService;
//import com.couplet.remote.RemoteTroubleService; import com.couplet.remote.RemoteTroubleService;
//import com.rabbitmq.client.Channel; import com.rabbitmq.client.Channel;
//import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
//import org.springframework.amqp.rabbit.annotation.Queue; import org.springframework.amqp.rabbit.annotation.Queue;
//import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.annotation.RabbitListener;
//import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
//import org.springframework.amqp.core.Message; import org.springframework.amqp.core.Message;
//import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
//
//import java.util.Date; import java.util.Date;
//import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
//
///** /**
// * @author DongXiaoDong * @author DongXiaoDong
// * @version 1.0 * @version 1.0
// * @date 2024/4/6 15:37 * @date 2024/4/6 15:37
// * @description * @description
// */ */
//@Component @Component
//@Slf4j @Slf4j
//public class CodeConsumer { public class CodeConsumer {
//// @Autowired
//// private RedisTemplate<String, String> redisTemplate;
//
// @Autowired // @Autowired
// private RedisService redisService; // private RedisTemplate<String, String> redisTemplate;
// @Autowired
// private RemoteTroubleService remoteTroubleService; @Autowired
// private RedisService redisService;
// @RabbitListener(queuesToDeclare = {@Queue("couplet-code-queue")}) @Autowired
// public void sendLogQueueConsumer(Message message, CoupletMsgData msgData, Channel channel) { private RemoteTroubleService remoteTroubleService;
// log.info("日志队列:{},接收到的消息:{},开始消费...","couplet-code-queue", JSONObject.toJSONString(msgData));
// long start = System.currentTimeMillis(); @RabbitListener(queuesToDeclare = {@Queue("couplet-code-queue")})
// public void sendLogQueueConsumer(Message message, CoupletMsgData msgData, Channel channel) {
// String messageId = message.getMessageProperties().getMessageId(); log.info("日志队列:{},接收到的消息:{},开始消费...","couplet-code-queue", JSONObject.toJSONString(msgData));
// long start = System.currentTimeMillis();
// try {
// boolean addToSetIfNotExists = redisService.addToSetIfNotExists("couplet-code-queue", messageId); String messageId = message.getMessageProperties().getMessageId();
// if (addToSetIfNotExists) {
// //异步保存记录 try {
// CompletableFuture.runAsync(() -> { boolean addToSetIfNotExists = redisService.addToSetIfNotExists("couplet-code-queue", messageId);
// CoupletTroubleCode troubleCode = new CoupletTroubleCode(); if (addToSetIfNotExists) {
// troubleCode.setTroubleStartTime(new Date()); //异步保存记录
// troubleCode.setTroubleVin(msgData.getVin()); CompletableFuture.runAsync(() -> {
// // 随机生成故障码 CoupletTroubleCode troubleCode = new CoupletTroubleCode();
// String faultCode = MsgUtils.generateGTA(); troubleCode.setTroubleStartTime(new Date());
// troubleCode.setTroubleCode(faultCode); troubleCode.setTroubleVin(msgData.getVin());
// // 随机生成故障码
// // 检查车辆状态若为0则设置故障位置为"190" String faultCode = MsgUtils.generateGTA();
// if(msgData.getVehicleStatus() == 0) { troubleCode.setTroubleCode(faultCode);
// troubleCode.setTroublePosition("190");
// } switch (msgData.getVehicleStatus()) {
// case 0:
// // 检查充电状态若为0则设置故障位置为"191" troubleCode.setTroublePosition("190");
// if (msgData.getChargingStatus() == 0) { troubleCode.setProcessingState(0);
// troubleCode.setTroublePosition("191"); break;
// } default:
// switch (msgData.getChargingStatus()) {
// // 检查运行状态若为0则设置故障位置为"192" case 0:
// if (msgData.getOperatingStatus() == 0) { troubleCode.setTroublePosition("191");
// troubleCode.setTroublePosition("192"); troubleCode.setProcessingState(0);
// } break;
// default:
// // 检查电池荷电状态SOC, 若为0则设置故障位置为"193" switch (msgData.getOperatingStatus()) {
// if (msgData.getSocStatus() == 0) { case 0:
// troubleCode.setTroublePosition("193"); troubleCode.setTroublePosition("192");
// } troubleCode.setProcessingState(0);
// break;
// // 检查充电能源存储状态若为0则设置故障位置为"194" default:
// if (msgData.getChargingEnergyStorageStatus() == 0) { switch (msgData.getSocStatus()) {
// troubleCode.setTroublePosition("194"); case 0:
// } troubleCode.setTroublePosition("193");
// troubleCode.setProcessingState(0);
// // 检查驱动电机状态若为0则设置故障位置为"195" break;
// if (msgData.getDriveMotorStatus() == 0) { default:
// troubleCode.setTroublePosition("195"); switch (msgData.getChargingEnergyStorageStatus()) {
// } case 0:
// troubleCode.setTroublePosition("194");
// // 检查定位状态若为0则设置故障位置为"196" troubleCode.setProcessingState(0);
// if (msgData.getPositionStatus() == 0) { break;
// troubleCode.setTroublePosition("196"); default:
// } switch (msgData.getDriveMotorStatus()) {
// case 0:
// // 检查电子驻车系统EAS状态若为0则设置故障位置为"197" troubleCode.setTroublePosition("195");
// if (msgData.getEasStatus() == 0) { troubleCode.setProcessingState(0);
// troubleCode.setTroublePosition("197"); break;
// } default:
// switch (msgData.getPositionStatus()) {
// // 检查PTC正温度系数热敏电阻状态若为0则设置故障位置为"198" case 0:
// if (msgData.getPtcStatus() == 0) { troubleCode.setTroublePosition("196");
// troubleCode.setTroublePosition("198"); troubleCode.setProcessingState(0);
// } break;
// default:
// // 检查电动助力转向系统EPS状态若为0则设置故障位置为"199" switch (msgData.getEasStatus()) {
// if (msgData.getEpsStatus() == 0) { case 0:
// troubleCode.setTroublePosition("199"); troubleCode.setTroublePosition("197");
// } troubleCode.setProcessingState(0);
// break;
// // 检查防抱死制动系统ABS状态若为0则设置故障位置为"200" default:
// if (msgData.getAbsStatus() == 0) { switch (msgData.getPtcStatus()) {
// troubleCode.setTroublePosition("200"); case 0:
// } troubleCode.setTroublePosition("198");
// troubleCode.setProcessingState(0);
// // 检查主控制器MCU状态若为0则设置故障位置为"201" break;
// if (msgData.getMcuStatus() == 0) { default:
// troubleCode.setTroublePosition("201"); switch (msgData.getEpsStatus()) {
// } case 0:
// troubleCode.setTroublePosition("199");
// // 检查加热状态若为0则设置故障位置为"202" troubleCode.setProcessingState(0);
// if (msgData.getHeatingStatus() == 0) { break;
// troubleCode.setTroublePosition("202"); default:
// } switch (msgData.getAbsStatus()) {
// case 0:
// // 检查电池状态若为0则设置故障位置为"203" troubleCode.setTroublePosition("200");
// if (msgData.getBatteryStatus() == 0) { troubleCode.setProcessingState(0);
// troubleCode.setTroublePosition("203"); break;
// } default:
// switch (msgData.getMcuStatus()) {
// // 检查电池绝缘状态若为0则设置故障位置为"204" case 0:
// if (msgData.getBatteryInsulationStatus() == 0) { troubleCode.setTroublePosition("201");
// troubleCode.setTroublePosition("204"); troubleCode.setProcessingState(0);
// } break;
// default:
// // 检查直流-直流转换器DC/DC状态若为0则设置故障位置为"205" switch (msgData.getHeatingStatus()) {
// if (msgData.getDcdcStatus() == 0) { case 0:
// troubleCode.setTroublePosition("205"); troubleCode.setTroublePosition("202");
// } troubleCode.setProcessingState(0);
// break;
// // 检查充电机CHG状态若为0则设置故障位置为"206" default:
// if (msgData.getChgStatus() == 0) { switch (msgData.getBatteryStatus()) {
// troubleCode.setTroublePosition("206"); case 0:
// } troubleCode.setTroublePosition("203");
// remoteTroubleService.newFaultData(troubleCode); troubleCode.setProcessingState(0);
// }); break;
// } default:
// long end = System.currentTimeMillis(); switch (msgData.getBatteryInsulationStatus()) {
// log.info("日志队列:{},接收到的消息:{},消费完成,耗时:{}毫秒","couplet-code-queue", JSONObject.toJSONString(msgData), (end-start)); case 0:
// } catch (Exception e) { troubleCode.setTroublePosition("204");
// throw new RuntimeException(e); troubleCode.setProcessingState(0);
// } break;
// } default:
//} switch (msgData.getDcdcStatus()) {
case 0:
troubleCode.setTroublePosition("205");
troubleCode.setProcessingState(0);
break;
default:
switch (msgData.getChgStatus()) {
case 0:
troubleCode.setTroublePosition("206");
troubleCode.setProcessingState(0);
break;
default:
// do nothing
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
remoteTroubleService.newFaultData(troubleCode);
});
}
long end = System.currentTimeMillis();
log.info("日志队列:{},接收到的消息:{},消费完成,耗时:{}毫秒","couplet-code-queue", JSONObject.toJSONString(msgData), (end-start));
} catch (Exception e) {
throw new RuntimeException(e);
}
}
}

View File

@ -2,6 +2,9 @@ package com.couplet.analyze.msg.mapper;
import com.couplet.analyze.msg.domain.CoupletMsgData; import com.couplet.analyze.msg.domain.CoupletMsgData;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
/** /**
* @Author: LiJiaYao * @Author: LiJiaYao
@ -20,6 +23,6 @@ public interface IncidentMapper {
* vin * vin
*/ */
// CoupletMsgData queryByIncident(RealTimeDataRequest realTimeDataRequest); // CoupletMsgData queryByIncident(RealTimeDataRequest realTimeDataRequest);
CoupletMsgData queryByIncident(String vin); CoupletMsgData queryByIncident(@Param("vin") String vin, @Param("createTime") Date createTime);
} }

View File

@ -1,7 +1,5 @@
package com.couplet.analyze.msg.model; package com.couplet.analyze.msg.model;
import com.couplet.analyze.common.contents.AnalyzeEventContents;
import com.couplet.analyze.common.event.AnalyzeEventCache;
import com.couplet.analyze.msg.domain.CoupletMsgData; import com.couplet.analyze.msg.domain.CoupletMsgData;
import com.couplet.analyze.msg.service.IncidentService; import com.couplet.analyze.msg.service.IncidentService;
import com.couplet.common.core.exception.vehicle.VehicleException; import com.couplet.common.core.exception.vehicle.VehicleException;
@ -10,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -35,12 +34,8 @@ public class ModelsKafkaMessage {
private static final String TOPIC_NAME = "online"; private static final String TOPIC_NAME = "online";
private static final String BOOTSTRAP_SERVERS = "39.103.133.136:9092"; private static final String BOOTSTRAP_SERVERS = "39.103.133.136:9092";
@Autowired
private AnalyzeEventContents analyzeEventContents;
@Autowired @Autowired
private AnalyzeEventCache analyzeEventCache; private AnalyzeEventCache analyzeEventCache;
// @Autowired
// private RabbitTemplate rabbitTemplate;
/** /**
* *

View File

@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
import java.util.Date; import java.util.Date;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
@ -103,6 +104,7 @@ public class BreakdownServiceImpl extends KeyExpirationEventMessageListener impl
for (CoupletMsgData member : members) { for (CoupletMsgData member : members) {
Set<String> breakdownIds = redisService.getCacheSet(member.getVin()+":"+key); Set<String> breakdownIds = redisService.getCacheSet(member.getVin()+":"+key);
if (breakdownIds.size()==0){ if (breakdownIds.size()==0){
CompletableFuture.runAsync(() -> {
CoupletTroubleCode troubleCode = new CoupletTroubleCode(); CoupletTroubleCode troubleCode = new CoupletTroubleCode();
troubleCode.setTroubleStartTime(new Date()); troubleCode.setTroubleStartTime(new Date());
troubleCode.setTroubleVin(member.getVin()); troubleCode.setTroubleVin(member.getVin());
@ -110,96 +112,149 @@ public class BreakdownServiceImpl extends KeyExpirationEventMessageListener impl
String faultCode = MsgUtils.generateGTA(); String faultCode = MsgUtils.generateGTA();
troubleCode.setTroubleCode(faultCode); troubleCode.setTroubleCode(faultCode);
// 检查车辆状态若为0则设置故障位置为"190" switch (member.getVehicleStatus()) {
if(member.getVehicleStatus() == 0) { case 0:
troubleCode.setTroublePosition("190"); troubleCode.setTroublePosition("190");
} troubleCode.setProcessingState(0);
break;
// 检查充电状态若为0则设置故障位置为"191" default:
if (member.getChargingStatus() == 0) { switch (member.getChargingStatus()) {
troubleCode.setTroublePosition("191"); case 0:
} troubleCode.setTroublePosition("191");
troubleCode.setProcessingState(0);
// 检查运行状态若为0则设置故障位置为"192" break;
if (member.getOperatingStatus() == 0) { default:
troubleCode.setTroublePosition("192"); switch (member.getOperatingStatus()) {
} case 0:
troubleCode.setTroublePosition("192");
// 检查电池荷电状态SOC, 若为0则设置故障位置为"193" troubleCode.setProcessingState(0);
if (member.getSocStatus() == 0) { break;
troubleCode.setTroublePosition("193"); default:
} switch (member.getSocStatus()) {
case 0:
// 检查充电能源存储状态若为0则设置故障位置为"194" troubleCode.setTroublePosition("193");
if (member.getChargingEnergyStorageStatus() == 0) { troubleCode.setProcessingState(0);
troubleCode.setTroublePosition("194"); break;
} default:
switch (member.getChargingEnergyStorageStatus()) {
// 检查驱动电机状态若为0则设置故障位置为"195" case 0:
if (member.getDriveMotorStatus() == 0) { troubleCode.setTroublePosition("194");
troubleCode.setTroublePosition("195"); troubleCode.setProcessingState(0);
} break;
default:
// 检查定位状态若为0则设置故障位置为"196" switch (member.getDriveMotorStatus()) {
if (member.getPositionStatus() == 0) { case 0:
troubleCode.setTroublePosition("196"); troubleCode.setTroublePosition("195");
} troubleCode.setProcessingState(0);
break;
// 检查电子驻车系统EAS状态若为0则设置故障位置为"197" default:
if (member.getEasStatus() == 0) { switch (member.getPositionStatus()) {
troubleCode.setTroublePosition("197"); case 0:
} troubleCode.setTroublePosition("196");
troubleCode.setProcessingState(0);
// 检查PTC正温度系数热敏电阻状态若为0则设置故障位置为"198" break;
if (member.getPtcStatus() == 0) { default:
troubleCode.setTroublePosition("198"); switch (member.getEasStatus()) {
} case 0:
troubleCode.setTroublePosition("197");
// 检查电动助力转向系统EPS状态若为0则设置故障位置为"199" troubleCode.setProcessingState(0);
if (member.getEpsStatus() == 0) { break;
troubleCode.setTroublePosition("199"); default:
} switch (member.getPtcStatus()) {
case 0:
// 检查防抱死制动系统ABS状态若为0则设置故障位置为"200" troubleCode.setTroublePosition("198");
if (member.getAbsStatus() == 0) { troubleCode.setProcessingState(0);
troubleCode.setTroublePosition("200"); break;
} default:
switch (member.getEpsStatus()) {
// 检查主控制器MCU状态若为0则设置故障位置为"201" case 0:
if (member.getMcuStatus() == 0) { troubleCode.setTroublePosition("199");
troubleCode.setTroublePosition("201"); troubleCode.setProcessingState(0);
} break;
default:
// 检查加热状态若为0则设置故障位置为"202" switch (member.getAbsStatus()) {
if (member.getHeatingStatus() == 0) { case 0:
troubleCode.setTroublePosition("202"); troubleCode.setTroublePosition("200");
} troubleCode.setProcessingState(0);
break;
// 检查电池状态若为0则设置故障位置为"203" default:
if (member.getBatteryStatus() == 0) { switch (member.getMcuStatus()) {
troubleCode.setTroublePosition("203"); case 0:
} troubleCode.setTroublePosition("201");
troubleCode.setProcessingState(0);
// 检查电池绝缘状态若为0则设置故障位置为"204" break;
if (member.getBatteryInsulationStatus() == 0) { default:
troubleCode.setTroublePosition("204"); switch (member.getHeatingStatus()) {
} case 0:
troubleCode.setTroublePosition("202");
// 检查直流-直流转换器DC/DC状态若为0则设置故障位置为"205" troubleCode.setProcessingState(0);
if (member.getDcdcStatus() == 0) { break;
troubleCode.setTroublePosition("205"); default:
} switch (member.getBatteryStatus()) {
case 0:
// 检查充电机CHG状态若为0则设置故障位置为"206" troubleCode.setTroublePosition("203");
if (member.getChgStatus() == 0) { troubleCode.setProcessingState(0);
troubleCode.setTroublePosition("206"); break;
} default:
switch (member.getBatteryInsulationStatus()) {
case 0:
troubleCode.setTroublePosition("204");
troubleCode.setProcessingState(0);
break;
default:
switch (member.getDcdcStatus()) {
case 0:
troubleCode.setTroublePosition("205");
troubleCode.setProcessingState(0);
break;
default:
switch (member.getChgStatus()) {
case 0:
troubleCode.setTroublePosition("206");
troubleCode.setProcessingState(0);
break;
default:
// do nothing
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
break;
}
remoteTroubleService.newFaultData(troubleCode); remoteTroubleService.newFaultData(troubleCode);
});
redisService.setCacheSet(member.getVin()+":"+key, member.getVin()+":"+member); redisService.setCacheSet(member.getVin()+":"+key, member.getVin()+":"+member);
long expireTime = 30; long expireTime = 30;
redisService.expire(member.getVin()+":"+key, expireTime, TimeUnit.MINUTES); redisService.expire(member.getVin()+":"+key, expireTime, TimeUnit.MINUTES);
} }
} }
} }

View File

@ -7,11 +7,14 @@ import com.couplet.analyze.msg.service.impl.realTimeData.RealTimeJudge;
import com.couplet.common.core.utils.StringUtils; import com.couplet.common.core.utils.StringUtils;
import com.couplet.common.domain.request.RealTimeDataRequest; import com.couplet.common.domain.request.RealTimeDataRequest;
import com.couplet.common.redis.service.RedisService; import com.couplet.common.redis.service.RedisService;
import com.couplet.remote.RemoteRealTimeService;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date;
/** /**
* @Author: LiJiaYao * @Author: LiJiaYao
* @Date: 2024/4/2 * @Date: 2024/4/2
@ -29,6 +32,8 @@ public class RealTimeDataServiceImpl implements IncidentService {
@Autowired @Autowired
private RedisService redisService; private RedisService redisService;
@Autowired
private RemoteRealTimeService remoteRealTimeService;
/** /**
* *
@ -41,11 +46,15 @@ public class RealTimeDataServiceImpl implements IncidentService {
log.info("实时数据事件开始....."); log.info("实时数据事件开始.....");
RealTimeDataRequest cacheObject = redisService.getCacheObject("vin:" + coupletMsgData.getVin()); RealTimeDataRequest cacheObject = redisService.getCacheObject("vin:" + coupletMsgData.getVin());
if (StringUtils.isArray(cacheObject)){
log.info("[{}]有缓存数据,值为:[{}]", coupletMsgData.getVin(), cacheObject);
if (RealTimeJudge.addRealTime(cacheObject)) {
log.info("[{}]有缓存数据,值为:[{}],且缓存数据与实时数据一致,开始传输实时数据", coupletMsgData.getVin(), cacheObject);
CoupletMsgData query = incidentMapper.queryByIncident(coupletMsgData.getVin(), new Date());
redisService.setCacheObject("vin:" + cacheObject.getVin(), query);
} else {
log.info("[{}]有缓存数据,值为:[{}],且缓存数据与实时数据不一致,开始传输实时数据", coupletMsgData.getVin(), cacheObject);
} }
if (RealTimeJudge.isJudge(coupletMsgData.getVin())){ if (RealTimeJudge.isJudge(coupletMsgData.getVin())) {
log.info("有实时数据,值为:[{}]开始传输实时数据", coupletMsgData.getVin()); log.info("有实时数据,值为:[{}]开始传输实时数据", coupletMsgData.getVin());
} }
log.info("[{}]开始传输实时数据", coupletMsgData.getVin()); log.info("[{}]开始传输实时数据", coupletMsgData.getVin());
@ -56,6 +65,7 @@ public class RealTimeDataServiceImpl implements IncidentService {
/** /**
* *
*
* @return * @return
*/ */
@Override @Override

View File

@ -72,7 +72,7 @@
</insert> </insert>
<select id="queryByIncident" resultType="com.couplet.analyze.msg.domain.CoupletMsgData" <select id="queryByIncident" resultType="com.couplet.analyze.msg.domain.CoupletMsgData"
parameterType="com.couplet.common.domain.request.RealTimeDataRequest"> parameterType="com.couplet.common.domain.request.RealTimeDataRequest">
SELECT * FROM couplet_msg_data WHERE vin =#{vin} SELECT * FROM couplet_msg_data WHERE vin=#{vin} and create_time = #{createTime}
</select> </select>

View File

@ -25,21 +25,21 @@ public class ParsingMsg {
String hexStringWithoutSpaces = substring.replaceAll("\\s+", ""); String hexStringWithoutSpaces = substring.replaceAll("\\s+", "");
String asciiString = hexToString(hexStringWithoutSpaces); String asciiString = hexToString(hexStringWithoutSpaces);
System.out.println("16进制解析后的数据"+asciiString); System.out.println("16进制解析后的数据"+asciiString);
//截取前17位 // //截取前17位
String substring1 = asciiString.substring(0, 17); // String substring1 = asciiString.substring(0, 17);
System.out.println("VIN"+substring1); // System.out.println("VIN"+substring1);
String substring2 = asciiString.substring(17, 30); // String substring2 = asciiString.substring(17, 30);
System.out.println("时间戳:"+substring2); // System.out.println("时间戳:"+substring2);
String substring3 = asciiString.substring(30, 40); // String substring3 = asciiString.substring(30, 40);
System.out.println("经度:" +substring3); // System.out.println("经度:" +substring3);
String substring4 = asciiString.substring(41, 50); // String substring4 = asciiString.substring(41, 50);
System.out.println("纬度:"+ substring4); // System.out.println("纬度:"+ substring4);
String substring5 = asciiString.substring(51, 56); // String substring5 = asciiString.substring(51, 56);
System.out.println("车速:"+ substring5); // System.out.println("车速:"+ substring5);
String substring6 = asciiString.substring(57, 67); // String substring6 = asciiString.substring(57, 67);
System.out.println("总里程:"+ substring6); // System.out.println("总里程:"+ substring6);
String substring7 = asciiString.substring(68, 73); // String substring7 = asciiString.substring(68, 73);
System.out.println("总电压:"+ substring7); // System.out.println("总电压:"+ substring7);
String pattern = "(.{17})(.{10})(.{9})(.{8})(.{2})"; String pattern = "(.{17})(.{10})(.{9})(.{8})(.{2})";
Pattern compile = Pattern.compile(pattern); Pattern compile = Pattern.compile(pattern);
Matcher matcher = compile.matcher(asciiString); Matcher matcher = compile.matcher(asciiString);

View File

@ -8,9 +8,9 @@
<id property="troubleId" column="trouble_id"/> <id property="troubleId" column="trouble_id"/>
<result property="troubleCode" column="trouble_code"/> <result property="troubleCode" column="trouble_code"/>
<result property="troubleVin" column="trouble_vin"/> <result property="troubleVin" column="trouble_vin"/>
<result property="troubleTag" column="trouble_tag"/>
<result property="troubleStartTime" column="trouble_start_time"/> <result property="troubleStartTime" column="trouble_start_time"/>
<result property="troubleEndTime" column="trouble_end_time"/> <result property="troubleEndTime" column="trouble_end_time"/>
<result property="processingState" column="processing_state"/>
</resultMap> </resultMap>
<sql id="selectTroubleVo"> <sql id="selectTroubleVo">
@ -19,9 +19,9 @@
</sql> </sql>
<insert id="newFaultData"> <insert id="newFaultData">
INSERT INTO `couplet-cloud`.`couplet_trouble_code` INSERT INTO `couplet-cloud`.`couplet_trouble_code`
(`trouble_code`,`trouble_vin`,`trouble_position`,`trouble_start_time`) (`trouble_code`,`trouble_vin`,`trouble_position`,`trouble_start_time`,`processing_state`)
VALUES VALUES
(#{troubleCode},#{troubleVin}, #{troublePosition},#{troubleStartTime}) (#{troubleCode},#{troubleVin}, #{troublePosition},#{troubleStartTime},#{processingState})
</insert> </insert>
<update id="cleanTroubleCode"> <update id="cleanTroubleCode">
truncate table couplet_trouble_code truncate table couplet_trouble_code