Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_dongxiaodong
# Conflicts: # couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java # couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml # couplet-modules/couplet-file/src/main/resources/bootstrap.yml # couplet-modules/couplet-gen/src/main/resources/bootstrap.yml # couplet-modules/couplet-job/src/main/resources/bootstrap.yml # couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml # couplet-visual/couplet-monitor/src/main/resources/bootstrap.ymlserver_five_dongxiaodong
dongxiaodong
commit
aee28d568e
|
|
@ -17,9 +17,11 @@ spring:
|
|||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 172469
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 172469
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import org.springframework.stereotype.Component;
|
|||
* @Date: 2024/4/7
|
||||
* @Description: 事件内容
|
||||
*/
|
||||
|
||||
public interface AnalyzeEventContents {
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.couplet.analyze.common.event;
|
||||
|
||||
import com.couplet.common.domain.request.RealTimeDataRequest;
|
||||
import com.couplet.common.redis.service.RedisService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
|
|
@ -38,6 +39,12 @@ public class AnalyzeEventCache {
|
|||
public void removeEvent(String vin,String eventName){
|
||||
redisService.deleteSet(encode(vin), eventName);
|
||||
}
|
||||
/**
|
||||
* 查询事件
|
||||
*/
|
||||
public void queryEvent(String vin, final RealTimeDataRequest eventName){
|
||||
redisService.setCacheObject(encode(vin), eventName);
|
||||
}
|
||||
/**
|
||||
* 获取事件集合
|
||||
*
|
||||
|
|
@ -47,4 +54,5 @@ public class AnalyzeEventCache {
|
|||
return redisService.getCacheSet(encode(vin));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,9 +15,11 @@ spring:
|
|||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 172469
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: 172469
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
|||
|
|
@ -1,203 +1,203 @@
|
|||
package com.couplet.analyze.msg.consumer;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.couplet.analyze.msg.domain.CoupletMsgData;
|
||||
import com.couplet.analyze.msg.utils.MsgUtils;
|
||||
import com.couplet.common.domain.CoupletTroubleCode;
|
||||
import com.couplet.common.redis.service.RedisService;
|
||||
import com.couplet.remote.RemoteTroubleService;
|
||||
import com.rabbitmq.client.Channel;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.amqp.rabbit.annotation.Queue;
|
||||
import org.springframework.amqp.rabbit.annotation.RabbitListener;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.amqp.core.Message;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
/**
|
||||
* @author DongXiaoDong
|
||||
* @version 1.0
|
||||
* @date 2024/4/6 15:37
|
||||
* @description
|
||||
*/
|
||||
@Component
|
||||
@Slf4j
|
||||
public class CodeConsumer {
|
||||
//package com.couplet.analyze.msg.consumer;
|
||||
//
|
||||
//import com.alibaba.fastjson.JSONObject;
|
||||
//import com.couplet.analyze.msg.domain.CoupletMsgData;
|
||||
//import com.couplet.analyze.msg.utils.MsgUtils;
|
||||
//import com.couplet.common.domain.CoupletTroubleCode;
|
||||
//import com.couplet.common.redis.service.RedisService;
|
||||
//import com.couplet.remote.RemoteTroubleService;
|
||||
//import com.rabbitmq.client.Channel;
|
||||
//import lombok.extern.slf4j.Slf4j;
|
||||
//import org.springframework.amqp.rabbit.annotation.Queue;
|
||||
//import org.springframework.amqp.rabbit.annotation.RabbitListener;
|
||||
//import org.springframework.beans.factory.annotation.Autowired;
|
||||
//import org.springframework.data.redis.core.RedisTemplate;
|
||||
//import org.springframework.amqp.core.Message;
|
||||
//import org.springframework.stereotype.Component;
|
||||
//
|
||||
//import java.util.Date;
|
||||
//import java.util.concurrent.CompletableFuture;
|
||||
//
|
||||
///**
|
||||
// * @author DongXiaoDong
|
||||
// * @version 1.0
|
||||
// * @date 2024/4/6 15:37
|
||||
// * @description
|
||||
// */
|
||||
//@Component
|
||||
//@Slf4j
|
||||
//public class CodeConsumer {
|
||||
//// @Autowired
|
||||
//// private RedisTemplate<String, String> redisTemplate;
|
||||
//
|
||||
// @Autowired
|
||||
// private RedisTemplate<String, String> redisTemplate;
|
||||
|
||||
@Autowired
|
||||
private RedisService redisService;
|
||||
@Autowired
|
||||
private RemoteTroubleService remoteTroubleService;
|
||||
|
||||
@RabbitListener(queuesToDeclare = {@Queue("couplet-code-queue")})
|
||||
public void sendLogQueueConsumer(Message message, CoupletMsgData msgData, Channel channel) {
|
||||
log.info("日志队列：{}，接收到的消息：{}，开始消费...","couplet-code-queue", JSONObject.toJSONString(msgData));
|
||||
long start = System.currentTimeMillis();
|
||||
|
||||
String messageId = message.getMessageProperties().getMessageId();
|
||||
|
||||
try {
|
||||
boolean addToSetIfNotExists = redisService.addToSetIfNotExists("couplet-code-queue", messageId);
|
||||
if (addToSetIfNotExists) {
|
||||
//异步保存记录
|
||||
CompletableFuture.runAsync(() -> {
|
||||
CoupletTroubleCode troubleCode = new CoupletTroubleCode();
|
||||
troubleCode.setTroubleStartTime(new Date());
|
||||
troubleCode.setTroubleVin(msgData.getVin());
|
||||
// 随机生成故障码
|
||||
String faultCode = MsgUtils.generateGTA();
|
||||
troubleCode.setTroubleCode(faultCode);
|
||||
|
||||
switch (msgData.getVehicleStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("190");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getChargingStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("191");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getOperatingStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("192");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getSocStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("193");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getChargingEnergyStorageStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("194");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getDriveMotorStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("195");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getPositionStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("196");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getEasStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("197");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getPtcStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("198");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getEpsStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("199");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getAbsStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("200");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getMcuStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("201");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getHeatingStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("202");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getBatteryStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("203");
|
||||
troubleCode.setProcessingState(0);
|
||||
break;
|
||||
default:
|
||||
switch (msgData.getBatteryInsulationStatus()) {
|
||||
case 0:
|
||||
troubleCode.setTroublePosition("204");
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
// private RedisService redisService;
|
||||
// @Autowired
|
||||
// private RemoteTroubleService remoteTroubleService;
|
||||
//
|
||||
// @RabbitListener(queuesToDeclare = {@Queue("couplet-code-queue")})
|
||||
// public void sendLogQueueConsumer(Message message, CoupletMsgData msgData, Channel channel) {
|
||||
// log.info("日志队列：{}，接收到的消息：{}，开始消费...","couplet-code-queue", JSONObject.toJSONString(msgData));
|
||||
// long start = System.currentTimeMillis();
|
||||
//
|
||||
// String messageId = message.getMessageProperties().getMessageId();
|
||||
//
|
||||
// try {
|
||||
// boolean addToSetIfNotExists = redisService.addToSetIfNotExists("couplet-code-queue", messageId);
|
||||
// if (addToSetIfNotExists) {
|
||||
// //异步保存记录
|
||||
// CompletableFuture.runAsync(() -> {
|
||||
// CoupletTroubleCode troubleCode = new CoupletTroubleCode();
|
||||
// troubleCode.setTroubleStartTime(new Date());
|
||||
// troubleCode.setTroubleVin(msgData.getVin());
|
||||
// // 随机生成故障码
|
||||
// String faultCode = MsgUtils.generateGTA();
|
||||
// troubleCode.setTroubleCode(faultCode);
|
||||
//
|
||||
// switch (msgData.getVehicleStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("190");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getChargingStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("191");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getOperatingStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("192");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getSocStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("193");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getChargingEnergyStorageStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("194");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getDriveMotorStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("195");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getPositionStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("196");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getEasStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("197");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getPtcStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("198");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getEpsStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("199");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getAbsStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("200");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getMcuStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("201");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getHeatingStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("202");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getBatteryStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("203");
|
||||
// troubleCode.setProcessingState(0);
|
||||
// break;
|
||||
// default:
|
||||
// switch (msgData.getBatteryInsulationStatus()) {
|
||||
// case 0:
|
||||
// troubleCode.setTroublePosition("204");
|
||||
// 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);
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@ import com.couplet.analyze.msg.domain.CoupletMsgData;
|
|||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Author: LiJiaYao
|
||||
* @Date: 2024/4/2
|
||||
|
|
@ -23,6 +21,6 @@ public interface IncidentMapper {
|
|||
* 查询是否存在该vin
|
||||
*/
|
||||
// CoupletMsgData queryByIncident(RealTimeDataRequest realTimeDataRequest);
|
||||
CoupletMsgData queryByIncident(@Param("vin") String vin, @Param("createTime") Date createTime);
|
||||
CoupletMsgData queryByIncident(String vin);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package com.couplet.analyze.msg.model;
|
||||
|
||||
import com.couplet.analyze.common.event.AnalyzeEventCache;
|
||||
import com.couplet.analyze.common.contents.AnalyzeEventContents;
|
||||
import com.couplet.analyze.common.event.AnalyzeEventCache;
|
||||
import com.couplet.analyze.common.event.AnalyzeEventCache;
|
||||
import com.couplet.analyze.msg.domain.CoupletMsgData;
|
||||
import com.couplet.analyze.msg.service.IncidentService;
|
||||
|
|
|
|||
|
|
@ -13,14 +13,16 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* @Author: LiJiaYao
|
||||
* @Date: 2024/4/2
|
||||
* @Description: 电子围栏事件服务实现类
|
||||
*/
|
||||
@Service("electronic-fence")
|
||||
@Service("electronic_fence")
|
||||
@Log4j2
|
||||
public class ElectronicFenceServiceImpl implements IncidentService {
|
||||
|
||||
|
|
@ -39,56 +41,44 @@ public class ElectronicFenceServiceImpl implements IncidentService {
|
|||
|
||||
log.info("电子围栏事件开始.......");
|
||||
|
||||
String fenceKey="fence";
|
||||
|
||||
// redisService.getCacheSet()
|
||||
ArrayList<Fence> fences = new ArrayList<>();
|
||||
String fenceKey = "车辆vin和电子围栏:" + coupletMsgData.getVin();
|
||||
if (redisService.hasKey(fenceKey)) {
|
||||
Set<Fence> cacheSet = redisService.getCacheSet(fenceKey);
|
||||
log.info("电子围栏事件redis存在.......");
|
||||
// redisService.getCacheObject();
|
||||
// for (String s : fence) {
|
||||
// Fence parseObject = JSON.parseObject(s, Fence.class);
|
||||
// fences.add(parseObject);
|
||||
// }
|
||||
// jingdu;
|
||||
// longitude;
|
||||
// weidu;
|
||||
// latitude;
|
||||
for (Fence data : fences) {
|
||||
|
||||
String fenceLongitudeLatitude = data.getFenceLongitudeLatitude();
|
||||
for (Fence fence : cacheSet) {
|
||||
String fenceLongitudeLatitude = fence.getFenceLongitudeLatitude();
|
||||
/**
|
||||
* 先通过；号切割
|
||||
* 先通过；后切割
|
||||
*/
|
||||
String[] split = fenceLongitudeLatitude.split(";");
|
||||
for (String s : split) {
|
||||
|
||||
String[] strings = s.split(",");
|
||||
if (strings.length == 2){
|
||||
if (strings.length == 2) {
|
||||
// 经度
|
||||
Double trim = Double.valueOf(strings[0].trim());
|
||||
// 纬度
|
||||
Double trim1 = Double.valueOf(strings[1].trim());
|
||||
boolean a = trim <= Double.valueOf(coupletMsgData.getLongitude());
|
||||
boolean a = trim <= Double.valueOf(coupletMsgData.getLongitude());
|
||||
boolean b = trim1 <= Double.valueOf(coupletMsgData.getLatitude());
|
||||
if (a && b){
|
||||
if (a && b) {
|
||||
log.info("电子围栏报警啦!!!!您的车驶出范围啦!!!");
|
||||
}else {
|
||||
} else {
|
||||
log.info("电子围栏报警啦!!!!正常啦!!!");
|
||||
}
|
||||
log.info("经度是:"+trim);
|
||||
log.info("纬度是:"+trim1);
|
||||
}else {
|
||||
throw new RuntimeException("电子围栏经纬度格式错误"+strings);
|
||||
log.info("经度是:" + trim);
|
||||
log.info("纬度是:" + trim1);
|
||||
} else {
|
||||
throw new RuntimeException("电子围栏经纬度格式错误" + strings);
|
||||
}
|
||||
}
|
||||
}
|
||||
// log.info("更改的电子围栏内容是:"+fence);
|
||||
log.info("电子围栏事件结束.......");
|
||||
}
|
||||
|
||||
log.info("电子围栏事件结束.......");
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -4,23 +4,21 @@ import com.couplet.analyze.msg.domain.CoupletMsgData;
|
|||
import com.couplet.analyze.msg.mapper.IncidentMapper;
|
||||
import com.couplet.analyze.msg.service.IncidentService;
|
||||
import com.couplet.analyze.msg.service.impl.realTimeData.RealTimeJudge;
|
||||
import com.couplet.common.core.utils.StringUtils;
|
||||
import com.couplet.common.domain.request.RealTimeDataRequest;
|
||||
import com.couplet.common.redis.service.RedisService;
|
||||
import com.couplet.remote.RemoteRealTimeService;
|
||||
import lombok.extern.log4j.Log4j2;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* @Author: LiJiaYao
|
||||
* @Date: 2024/4/2
|
||||
* @Description: 实时数据事件
|
||||
*/
|
||||
@Service("real-time-data")
|
||||
@Service("real_time_data")
|
||||
@Log4j2
|
||||
public class RealTimeDataServiceImpl implements IncidentService {
|
||||
|
||||
|
|
@ -32,8 +30,6 @@ public class RealTimeDataServiceImpl implements IncidentService {
|
|||
|
||||
@Autowired
|
||||
private RedisService redisService;
|
||||
@Autowired
|
||||
private RemoteRealTimeService remoteRealTimeService;
|
||||
|
||||
/**
|
||||
* 实时数据事件
|
||||
|
|
@ -46,17 +42,20 @@ public class RealTimeDataServiceImpl implements IncidentService {
|
|||
log.info("实时数据事件开始.....");
|
||||
|
||||
RealTimeDataRequest cacheObject = redisService.getCacheObject("vin:" + coupletMsgData.getVin());
|
||||
|
||||
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());
|
||||
//判断数据是否一致，
|
||||
if (RealTimeJudge.addRealTime(cacheObject)) {
|
||||
log.info("[{}]有缓存数据，值为：[{}]，且缓存数据与实时数据一致，开始传输实时数据", coupletMsgData.getVin(), cacheObject);
|
||||
CoupletMsgData query = incidentMapper.queryByIncident(coupletMsgData.getVin());
|
||||
redisService.setCacheObject("vin:query:" + cacheObject.getVin(), query);
|
||||
redisService.expire("vin:"+cacheObject.getVin(),10, TimeUnit.MINUTES);
|
||||
} else {
|
||||
log.info("[{}]有缓存数据，值为：[{}]，且缓存数据与实时数据不一致，开始传输实时数据", coupletMsgData.getVin(), cacheObject);
|
||||
}
|
||||
}
|
||||
|
||||
log.info("[{}]开始传输实时数据", coupletMsgData.getVin());
|
||||
|
||||
log.info("实时数据事件结束.....");
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
|
|||
* @Date: 2024/4/2
|
||||
* @Description: 事件存储服务
|
||||
*/
|
||||
@Service("stored-event")
|
||||
@Service("stored_event")
|
||||
@Log4j2
|
||||
public class StoredEventServiceImpl implements IncidentService {
|
||||
@Autowired
|
||||
|
|
|
|||
|
|
@ -72,7 +72,11 @@
|
|||
</insert>
|
||||
<select id="queryByIncident" resultType="com.couplet.analyze.msg.domain.CoupletMsgData"
|
||||
parameterType="com.couplet.common.domain.request.RealTimeDataRequest">
|
||||
SELECT * FROM couplet_msg_data WHERE vin=#{vin} and create_time = #{createTime}
|
||||
SELECT *
|
||||
FROM couplet_msg_data
|
||||
WHERE vin = #{vin}
|
||||
ORDER BY create_time DESC
|
||||
LIMIT 1;
|
||||
</select>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -101,6 +101,10 @@
|
|||
<groupId>com.couplet</groupId>
|
||||
<artifactId>couplet-modules-mq</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.couplet</groupId>
|
||||
<artifactId>couplet-common-event</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
|
|||
|
|
@ -28,4 +28,6 @@ public interface FenAndLogoMapper extends BaseMapper<Fence> {
|
|||
* @param aLong
|
||||
*/
|
||||
List<Fence> queryByFenceAndLogoIds(FenceAndLogeRequest aLong);
|
||||
|
||||
List<Fence> findFencesByLogoId(@Param("logoId") Long logoId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,4 +28,9 @@ public interface FenAndLogoService extends IService<Fence> {
|
|||
*/
|
||||
List<Fence> queryByFenceAndLogoIds(FenceAndLogeRequest request);
|
||||
|
||||
/*
|
||||
* 通过标识id查询围栏id
|
||||
* */
|
||||
List<Fence> findFencesByLogoId(Long logoId);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,4 +47,14 @@ public class FenAndLogoServiceImpl extends ServiceImpl<FenAndLogoMapper, Fence>
|
|||
|
||||
return fenAndLogoMapper.queryByFenceAndLogoIds(request);
|
||||
}
|
||||
|
||||
/*
|
||||
* 通过标识id查询围栏信息
|
||||
* */
|
||||
@Override
|
||||
public List<Fence> findFencesByLogoId(Long logoId) {
|
||||
|
||||
|
||||
return fenAndLogoMapper.findFencesByLogoId(logoId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import com.couplet.common.domain.request.FenceRequest;
|
|||
import com.couplet.common.domain.request.FenceUpdateRequest;
|
||||
import com.couplet.common.redis.service.RedisService;
|
||||
import com.couplet.common.security.utils.SecurityUtils;
|
||||
import com.couplet.mq.remote.RemoteFenceService;
|
||||
//import com.couplet.mq.remote.RemoteFenceService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
|
@ -47,8 +47,8 @@ public class FenceServiceImpl extends ServiceImpl<FenceMapper, Fence> implements
|
|||
/**
|
||||
* 远程调用队列服务
|
||||
*/
|
||||
@Autowired
|
||||
private RemoteFenceService remoteFenceService;
|
||||
// @Autowired
|
||||
// private RemoteFenceService remoteFenceService;
|
||||
|
||||
@Override
|
||||
public List<Fence> pageQuery(FenceConfig fenceConfig) {
|
||||
|
|
@ -67,7 +67,7 @@ public class FenceServiceImpl extends ServiceImpl<FenceMapper, Fence> implements
|
|||
*/
|
||||
redisTemplate.opsForValue().set("changeFenceStatus", JSON.toJSONString(fenceUpdateRequest), 10, TimeUnit.MINUTES);
|
||||
|
||||
remoteFenceService.fenceQueue(fenceUpdateRequest);
|
||||
// remoteFenceService.fenceQueue(fenceUpdateRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
package com.couplet.business.server.service.impl;
|
||||
|
||||
import afu.org.checkerframework.checker.units.qual.A;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.couplet.analyze.common.event.AnalyzeEventCache;
|
||||
import com.couplet.business.server.mapper.VehicleDetectionMapper;
|
||||
import com.couplet.business.server.service.VehicleDetectionService;
|
||||
import com.couplet.business.server.service.VehicleManageService;
|
||||
|
|
@ -17,6 +19,7 @@ import org.springframework.stereotype.Service;
|
|||
import springfox.documentation.spring.web.json.Json;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* @author fufanrui
|
||||
|
|
@ -31,10 +34,14 @@ public class VehicleDetectionServiceImpl implements VehicleDetectionService{
|
|||
private VehicleDetectionMapper vehicleDetectionMapper;
|
||||
@Autowired
|
||||
private RedisService redisService;
|
||||
@Autowired
|
||||
private AnalyzeEventCache analyzeEventCache;
|
||||
|
||||
@Override
|
||||
public List<Vehicle> detectionList() {
|
||||
return vehicleDetectionMapper.detectionList();
|
||||
List<Vehicle> vehicles = vehicleDetectionMapper.detectionList();
|
||||
|
||||
return vehicles;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -43,8 +50,9 @@ public class VehicleDetectionServiceImpl implements VehicleDetectionService{
|
|||
Long userId = SecurityUtils.getUserId();
|
||||
realTimeDataRequest.setVin(vin);
|
||||
realTimeDataRequest.setUserId(userId);
|
||||
// analyzeEventCache.queryEvent("查询实时数据"+vin,realTimeDataRequest);
|
||||
// redisService.expire("查询实时数据"+vin,4,TimeUnit.MINUTES);
|
||||
redisService.setVinAndUserId(realTimeDataRequest);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ public class VehicleManageServiceImpl implements VehicleManageService {
|
|||
|
||||
/*
|
||||
* @param middle:
|
||||
* @return Result
|
||||
* @return Result
|
||||
* @author 付凡芮
|
||||
* @description 添加车辆
|
||||
* @date
|
||||
|
|
|
|||
|
|
@ -4,14 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.couplet.business.server.mapper.VehicleMapper;
|
||||
import com.couplet.business.server.service.FenAndLogoService;
|
||||
import com.couplet.business.server.service.VehicleAndLogoService;
|
||||
import com.couplet.business.server.service.VehicleService;
|
||||
import com.couplet.business.server.service.VehicleTypeService;
|
||||
import com.couplet.common.core.domain.Result;
|
||||
import com.couplet.common.core.utils.StringUtils;
|
||||
import com.couplet.common.core.utils.uuid.UUID;
|
||||
import com.couplet.common.domain.Fence;
|
||||
import com.couplet.common.domain.Vehicle;
|
||||
import com.couplet.common.domain.VehicleMiddle;
|
||||
import com.couplet.common.domain.VehicleType;
|
||||
import com.couplet.common.domain.request.VehicleEditParams;
|
||||
import com.couplet.common.domain.request.VehicleInsertParams;
|
||||
|
|
@ -21,8 +22,11 @@ import lombok.extern.slf4j.Slf4j;
|
|||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* @ProjectName: five-groups-couplet
|
||||
|
|
@ -52,6 +56,9 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
|
|||
@Autowired
|
||||
private VehicleAndLogoService vehicleAndLogoService;
|
||||
|
||||
@Autowired
|
||||
private FenAndLogoService fenAndLogoService;
|
||||
|
||||
/*
|
||||
* @Author: LiuYunHu
|
||||
* @Date: 2024/3/26 22:11
|
||||
|
|
@ -119,6 +126,9 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
|
|||
Result.error(result);
|
||||
}
|
||||
|
||||
//刷新set缓存
|
||||
reCache();
|
||||
|
||||
result = "删除成功！";
|
||||
|
||||
return result;
|
||||
|
|
@ -132,6 +142,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
|
|||
* @Return: java.lang.String
|
||||
**/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public String editById(VehicleEditParams editParams) {
|
||||
String result = "";
|
||||
|
||||
|
|
@ -175,16 +186,8 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
|
|||
vehicleAndLogoService.vehicleBindLogo(editParams.getVehicleId(), editParams.getLogoIds());
|
||||
|
||||
|
||||
// //mq
|
||||
// List<Long> logoList = getBindLogoById(editParams.getVehicleId());
|
||||
// if (0 != logoList.size()) {
|
||||
// String ids = "";
|
||||
// for (Long l : logoList) {
|
||||
// ids = "," + l;
|
||||
// }
|
||||
// ids = ids.substring(1);
|
||||
// remoteFenceService.vehicleQueue(editParams.getVehicleId() + "-" + ids);
|
||||
// }
|
||||
//刷新set缓存
|
||||
reCache();
|
||||
|
||||
|
||||
result = "编辑成功！";
|
||||
|
|
@ -200,6 +203,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
|
|||
* @Return: java.lang.String
|
||||
**/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public String insert(VehicleInsertParams insertParams) {
|
||||
String result = "";
|
||||
|
||||
|
|
@ -254,16 +258,9 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
|
|||
//执行添加电子围栏
|
||||
int i = vehicleAndLogoService.vehicleBindLogo(vehicle.getVehicleId(), insertParams.getLogoIds());
|
||||
|
||||
//
|
||||
// List<Long> logoList = getBindLogoById(vehicle.getVehicleId());
|
||||
// if (0 != logoList.size()) {
|
||||
// String ids = "";
|
||||
// for (Long l : logoList) {
|
||||
// ids = "," + l;
|
||||
// }
|
||||
// ids = ids.substring(1);
|
||||
// remoteFenceService.vehicleQueue(vehicle.getVehicleId() + "-" + ids);
|
||||
// }
|
||||
|
||||
//刷新set缓存
|
||||
reCache();
|
||||
|
||||
|
||||
result = "新增成功！";
|
||||
|
|
@ -304,14 +301,19 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
|
|||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public List<Vehicle> vehicleAll() {
|
||||
return vehicleMapper.vehicleAll();
|
||||
}
|
||||
|
||||
|
||||
//通过vin修改车辆上下线的状态
|
||||
/*
|
||||
* @Author: LiuYunHu
|
||||
* @Date: 2024/4/8 14:11
|
||||
* @Description: 通过vin修改车辆上下线的状态
|
||||
* @Param: [vin, status]
|
||||
* @Return: java.lang.Integer
|
||||
**/
|
||||
@Override
|
||||
public Integer onOrOutLineByVIN(String vin, int status) {
|
||||
|
||||
|
|
@ -320,9 +322,16 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
|
|||
|
||||
@Override
|
||||
public Integer addVehicle(Long userId, List<Long> vehicleIds) {
|
||||
return vehicleMapper.addVehicle(userId,vehicleIds);
|
||||
return vehicleMapper.addVehicle(userId, vehicleIds);
|
||||
}
|
||||
|
||||
/*
|
||||
* @Author: LiuYunHu
|
||||
* @Date: 2024/4/8 14:11
|
||||
* @Description: 通过vin查询车辆，因为是plus，所以是List
|
||||
* @Param: [vin]
|
||||
* @Return: java.util.List<com.couplet.common.domain.Vehicle>
|
||||
**/
|
||||
@Override
|
||||
public List<Vehicle> findByVIN(String vin) {
|
||||
|
||||
|
|
@ -338,32 +347,31 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
|
|||
}
|
||||
|
||||
|
||||
|
||||
@Scheduled(cron = "0/1 * * * * *")
|
||||
public void aa() {
|
||||
System.out.println("********************************************************");
|
||||
}
|
||||
|
||||
//判断车辆是否下线
|
||||
/*
|
||||
* @Author: LiuYunHu
|
||||
* @Date: 2024/4/8 14:12
|
||||
* @Description: 定时执行，查询缓存中下线的车辆，修改其状态
|
||||
* @Param: []
|
||||
* @Return: void
|
||||
**/
|
||||
@Scheduled(cron = "0/1 * * * * *")
|
||||
public void downLine() {
|
||||
log.info("定时器启动");
|
||||
//先查询车辆列表
|
||||
List<Vehicle> list = this.list(new VehicleListParams(null, null, null, null));
|
||||
|
||||
|
||||
list.forEach(vehicle -> {
|
||||
try {
|
||||
//只针对已经上线的车辆
|
||||
if (redis.hasKey(vehicle.getVin())) {
|
||||
if (redis.hasKey("已上线的车辆vin:" + vehicle.getVin())) {
|
||||
|
||||
//如果vin的缓存 时间还剩一秒，则判断为已经下线
|
||||
if (redis.getExpire(vehicle.getVin()) <= 3) {
|
||||
if (redis.getExpire("已上线的车辆vin:" + vehicle.getVin()) <= 3) {
|
||||
log.info(vehicle.getVin() + "的车辆已经下线");
|
||||
|
||||
//执行修改下线状态的方法
|
||||
// Integer i = this.onOrOutLineByVIN(vehicle.getVin() + "," + 0);
|
||||
Integer i = this.onOrOutLineByVIN(vehicle.getVin() , 0);
|
||||
Integer i = this.onOrOutLineByVIN(vehicle.getVin(), 0);
|
||||
|
||||
if (0 == i) {
|
||||
log.error("下线状态修改失败");
|
||||
|
|
@ -380,4 +388,47 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
|
|||
|
||||
}
|
||||
|
||||
/*
|
||||
* @Author: LiuYunHu
|
||||
* @Date: 2024/4/8 14:14
|
||||
* @Description: 刷新缓存中 的数据 车辆绑定标识的缓存
|
||||
* @Param: []
|
||||
* @Return: void
|
||||
**/
|
||||
@Scheduled(cron = "0/3 * * * * *")
|
||||
public void reCache() {
|
||||
//刷新缓存执行开始
|
||||
|
||||
//先获取所有车辆的信息
|
||||
List<Vehicle> list = list(new VehicleListParams());
|
||||
|
||||
list.forEach(vehicle -> {
|
||||
//通过车辆的id获取对应的标识集合
|
||||
List<Long> bindLogoById = getBindLogoById(vehicle.getVehicleId());
|
||||
|
||||
//遍历标识集合
|
||||
bindLogoById.forEach(logoId -> {
|
||||
|
||||
//存标识id 的set
|
||||
HashSet<Long> logos = new HashSet<>();
|
||||
logos.add(logoId);
|
||||
//存入redis
|
||||
redis.setCacheSet("车辆vin和标识:" + vehicle.getVin(), logos);
|
||||
redis.expire("车辆vin和标识:" + vehicle.getVin(), 2, TimeUnit.MINUTES);
|
||||
|
||||
|
||||
//通过标识id获取标识绑定的电子围栏集合
|
||||
List<Fence> fences = fenAndLogoService.findFencesByLogoId(logoId);
|
||||
//遍历电子围栏集合
|
||||
fences.forEach(fence -> {
|
||||
HashSet<Fence> fanceSet = new HashSet<>();
|
||||
fanceSet.add(fence);
|
||||
//存入redis
|
||||
redis.setCacheSet("车辆vin和电子围栏:" + vehicle.getVin(), fanceSet);
|
||||
redis.expire("车辆vin和电子围栏:" + vehicle.getVin(), 2, TimeUnit.MINUTES);
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,11 +16,9 @@ spring:
|
|||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
# 共享配置
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@
|
|||
<result property="fenceDescription" column="fence_description"/>
|
||||
<result property="fenceLongitudeLatitude" column="fence_longitude_latitude"/>
|
||||
<result property="fenceState" column="fence_state"/>
|
||||
<result property="createName" column="create_name" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="isDelete" column="is_delete" />
|
||||
<result property="maintainerName" column="maintainer_name" />
|
||||
<result property="fenceCondition" column="fence_condition" />
|
||||
<result property="createName" column="create_name"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="isDelete" column="is_delete"/>
|
||||
<result property="maintainerName" column="maintainer_name"/>
|
||||
<result property="fenceCondition" column="fence_condition"/>
|
||||
</resultMap>
|
||||
<resultMap id="logoMap" type="com.couplet.common.domain.Logo">
|
||||
<id property="logoId" column="logo_id"/>
|
||||
<result property="logoName" column="logo_name" />
|
||||
<result property="logoName" column="logo_name"/>
|
||||
</resultMap>
|
||||
|
||||
<insert id="addBach">
|
||||
|
|
@ -36,11 +36,19 @@
|
|||
fence_longitude_latitude,
|
||||
logo_name
|
||||
FROM couplet_fences_and_logo a
|
||||
INNER JOIN couplet_fence_info f on a.fences_id=f.fence_id
|
||||
INNER JOIN couplet_logo_info l on l.logo_id=a.logo_id
|
||||
left JOIN couplet_vehicle_and_logo c on l.logo_id=c.logo_id
|
||||
WHERE l.logo_id=#{logoIds} and c.vehicle_id=#{id}
|
||||
INNER JOIN couplet_fence_info f on a.fences_id = f.fence_id
|
||||
INNER JOIN couplet_logo_info l on l.logo_id = a.logo_id
|
||||
left JOIN couplet_vehicle_and_logo c on l.logo_id = c.logo_id
|
||||
WHERE l.logo_id = #{logoIds}
|
||||
and c.vehicle_id = #{id}
|
||||
|
||||
</select>
|
||||
<select id="findFencesByLogoId" resultType="com.couplet.common.domain.Fence">
|
||||
SELECT fi.*
|
||||
FROM `couplet_fences_and_logo` fal
|
||||
right JOIN couplet_fence_info fi on fal.fences_id = fi.fence_id
|
||||
WHERE fal.logo_id = #{logoId}
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -35,15 +35,15 @@ logging:
|
|||
com.couplet.system.mapper: DEBUG
|
||||
|
||||
# 订阅端配置
|
||||
mqtt:
|
||||
server:
|
||||
broker: tcp://8.130.181.16:1883
|
||||
# broker: tcp://115.159.47.13:1883
|
||||
username:
|
||||
password:
|
||||
clientid: mqttx
|
||||
qos: 0
|
||||
topic: test
|
||||
#mqtt:
|
||||
# server:
|
||||
# broker: tcp://8.130.181.16:1883
|
||||
## broker: tcp://115.159.47.13:1883
|
||||
# username:
|
||||
# password:
|
||||
# clientid: mqttx
|
||||
# qos: 0
|
||||
# topic: test
|
||||
|
||||
# RabbitMQ配置
|
||||
mq:
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
<artifactId>couplet-modules-online</artifactId>
|
||||
|
||||
<!-- <properties>-->
|
||||
<!-- <maven.compiler.source>17</maven.compiler.source>-->
|
||||
<!-- <maven.compiler.target>17</maven.compiler.target>-->
|
||||
<!-- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
|
||||
<!-- </properties>-->
|
||||
<!-- <properties>-->
|
||||
<!-- <maven.compiler.source>17</maven.compiler.source>-->
|
||||
<!-- <maven.compiler.target>17</maven.compiler.target>-->
|
||||
<!-- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
|
||||
<!-- </properties>-->
|
||||
|
||||
<description>
|
||||
couplet-modules-online车辆上线的模块
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
<version>1.2.5</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 注入车辆服务，调用接口-->
|
||||
<!-- 注入车辆服务，调用接口-->
|
||||
<dependency>
|
||||
<groupId>com.couplet</groupId>
|
||||
<artifactId>couplet-common-business</artifactId>
|
||||
|
|
@ -99,10 +99,6 @@
|
|||
|
||||
|
||||
<!-- Kafka依赖-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.springframework.kafka</groupId>-->
|
||||
<!-- <artifactId>spring-kafka</artifactId>-->
|
||||
<!-- </dependency>-->
|
||||
<dependency>
|
||||
<groupId>org.apache.kafka</groupId>
|
||||
<artifactId>kafka-clients</artifactId>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ import org.eclipse.paho.client.mqttv3.*;
|
|||
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
|
|
@ -184,7 +183,7 @@ public class MqttMonitor {
|
|||
|
||||
//调取接口，通过vin查询车辆
|
||||
List<Vehicle> vehicles = remoteVehicleService.findByVIN(start17).getData();
|
||||
System.out.println("**************" + vehicles);
|
||||
// System.out.println("**************" + vehicles);
|
||||
|
||||
|
||||
//如果不存在这个车
|
||||
|
|
@ -198,7 +197,7 @@ public class MqttMonitor {
|
|||
log.info("远程调用查询到的车辆数据：" + vehicle);
|
||||
|
||||
//上线车辆存入redis 6秒 用于判断车辆是否下线，还要写定时器，定时查询
|
||||
redis.setCacheObject(start17, start17, 6L, TimeUnit.SECONDS);
|
||||
redis.setCacheObject("已上线的车辆vin:"+start17, start17, 6L, TimeUnit.SECONDS);
|
||||
|
||||
|
||||
log.info("vin码为" + start17 + "的车辆属于本系统，允许上线！");
|
||||
|
|
@ -207,7 +206,7 @@ public class MqttMonitor {
|
|||
Integer i = remoteVehicleService.onOrOutLineByVIN(start17 + "," + 1);
|
||||
//上线成功
|
||||
if (0 != i) {
|
||||
log.info("上线成功！");
|
||||
// log.info("上线成功！");
|
||||
try {
|
||||
produceMessage(message);
|
||||
} catch (Exception e) {
|
||||
|
|
@ -239,7 +238,7 @@ public class MqttMonitor {
|
|||
//发送消息
|
||||
kafkaProducer.send(new ProducerRecord<>(TOPIC_NAME, message));
|
||||
|
||||
System.out.println("发送消息：" + message);
|
||||
// System.out.println("发送消息：" + message);
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error("消息发送失败：" + e.getMessage());
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ spring:
|
|||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
|
||||
config:
|
||||
# 配置中心地址
|
||||
server-addr: 121.89.211.230:8848
|
||||
|
|
@ -24,7 +23,6 @@ spring:
|
|||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
|
||||
main:
|
||||
allow-bean-definition-overriding: true
|
||||
logging:
|
||||
|
|
|
|||
Loading…
Reference in New Issue