group-four
/
cloud-car
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev

dev.vehiclegateway
Number7 2024-10-04 16:58:38 +08:00
parent dc26138929 8c90364eaa
commit 30782882c3
8 changed files with 121 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cloud-common/cloud-common-kafka/pom.xml
View File

@ -19,21 +19,22 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<!-- <dependency>-->
<!-- <groupId>org.apache.kafka</groupId>-->
<!-- <artifactId>kafka-clients</artifactId>-->
<!-- <version>3.0.0</version>-->
<!-- </dependency>-->
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>2.8.0</version>
</dependency>
</dependencies>

12
cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/consumer/RabbitMQConsumerUtil.java
View File

@ -35,21 +35,11 @@ public class RabbitMQConsumerUtil {
// 获取到消息 开始消费
log.info("消息消费者接收到消息，消息内容：{}", JSONObject.toJSONString(data));
Long add = redisService.redisTemplate.opsForSet().add(data, message.getMessageProperties().getMessageId());
if (add != 1) {
return;
}
/**
* -----------------------------------以下为异步业务操作----------------------------
*/
/**
* ------------------------------------------------------------------------------
*/
// 消费消息成功之后需要确认
// long deliveryTag 消息投递序号 自增的数字 在整个队列中唯一 拿到这个序号就相当于拿到这条消息
// boolean multiple 是否批量确认 true 批量 确认小于等于当前投递序号的消息 false 单个确认
@ -76,7 +66,6 @@ public class RabbitMQConsumerUtil {
}
}
/**
* 普通消费者
* @param data 数据类型
@ -96,7 +85,6 @@ public class RabbitMQConsumerUtil {
return;
}
/**
* -----------------------------------以下为异步业务操作----------------------------
*/

2
cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/producer/RabbitMQProducerUtil.java
View File

@ -23,7 +23,6 @@ public class RabbitMQProducerUtil {
//rabbit
private final RabbitTemplate rabbitTemplate;
/**
* 简单模型
*
@ -73,7 +72,6 @@ public class RabbitMQProducerUtil {
/**
* Publish/Subscribe 发布订阅者模型
* 多个消费者，多个消费者可以同时接收到消息 有交换机 类型 fanout
*
* @param exchange 交换机名称
* @param obj 发送的消息Object
* @param msg 响应的内容

11
cloud-modules/cloud-modules-template/pom.xml
View File

@ -17,11 +17,12 @@
<dependencies>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-kafka</artifactId>
<version>3.6.3</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.muyu</groupId>-->
<!-- <artifactId>cloud-common-kafka</artifactId>-->
<!-- <version>3.6.3</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.muyu.server</groupId>

51
cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java
View File

@ -3,10 +3,9 @@ import cn.hutool.json.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.muyu.common.domain.MessageTemplateType;
import com.muyu.common.domain.SysCar;
import com.muyu.common.kafka.config.KafkaProducerConfig;
import com.muyu.common.redis.service.RedisService;
import lombok.extern.log4j.Log4j2;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.eclipse.paho.client.mqttv3.*;
import org.springframework.beans.factory.annotation.Autowired;
@ -36,19 +35,13 @@ public class MqttConfigure {
@Autowired
private RedisTemplate redisTemplate;
@Autowired
private KafkaProducer kafkaProducer;
@Autowired
private SysCarService service;
@Autowired
private MessageTemplateTypeService messageTemplateTypeService;
// @Autowired
// private KafkaProducer kafkaProducer;
@PostConstruct
public void MQTTMonitoring(){
String topic = "vehicle";
String topic = "car";
int qos = 2;
String broker = "tcp://47.101.53.251:1883";
String clientId = "lxy";
@ -76,7 +69,7 @@ public class MqttConfigure {
JSONObject jsonObject = new JSONObject(messageContent);
// 从JSON对象中获取"msg"字段的值
String msgValue = jsonObject.getStr("msg");
// messageParsing(msgValue);
messageParsing(msgValue);
log.info("接收到的值为:"+msgValue);
}
//交付完成
@ -113,7 +106,14 @@ public class MqttConfigure {
String carVin = result.substring(0, 18 - 1);
log.info("carVin码为:" + carVin);
//根据VIN码获取车辆信息
SysCar carByVin = service.findCarByVin(carVin);
SysCar carByVin = null;
List<SysCar> carList = redisService.getCacheList("carList");
for (SysCar sysCar : carList) {
if(sysCar.getCarVin().equals(carVin)){
carByVin=sysCar;
}
}
// SysCar carByVin = service.findCarByVin(carVin);
log.info("车辆信息为:" + carByVin);
//对应车辆所对应的报文模版
Integer templateId = carByVin.getTemplateId();
@ -128,12 +128,19 @@ public class MqttConfigure {
templateTypeList = list.stream().map(o -> JSON.parseObject(o.toString(), MessageTemplateType.class))
.toList();
} else {
List<MessageTemplateType> templateTypeList1 = messageTemplateTypeService.findTemplateById(templateId);
List<MessageTemplateType> templateTypeList1=null;
List<MessageTemplateType> templateTypeList2 = redisService.getCacheList("templateTypeList");
for (MessageTemplateType messageTemplateType : templateTypeList2) {
if(messageTemplateType.getTemplateId()==templateId){
templateTypeList1.add(messageTemplateType);
}
}
// List<MessageTemplateType> templateTypeList1 = messageTemplateTypeService.findTemplateById(templateId);
templateTypeList = templateTypeList1;
templateTypeList.forEach(
templateType ->
redisTemplate.opsForList().rightPush(
redisKey, com.alibaba.fastjson.JSON.toJSONString(templateType)
redisKey, JSON.toJSONString(templateType)
)
);
}
@ -146,18 +153,18 @@ public class MqttConfigure {
//将每个解析后的字段都存入到JSON对象中
jsonObject.put(messageTemplateType.getMessageField(), result.substring(startIndex, endIndex));
}
log.info("解析后的报文是:" + jsonObject);
sendKafka(jsonObject);
// sendKafka(jsonObject);
log.info("发送kafka成功");
return jsonObject;
}
public void sendKafka(JSONObject jsonObject){
ProducerRecord<String, String> stringStringProducerRecord = new ProducerRecord<>("four_car", jsonObject.toString());
kafkaProducer.send(stringStringProducerRecord);
log.info("kafka发送成功");
}
// //kafka发送消息
// public void sendKafka(JSONObject jsonObject){
// ProducerRecord<String, String> stringStringProducerRecord = new ProducerRecord<>("four_car", jsonObject.toString());
// kafkaProducer.send(stringStringProducerRecord);
// log.info("kafka发送成功");
// }
}

10
cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/controller/KafkaController.java 100644
View File

@ -0,0 +1,10 @@
package com.muyu.template.controller;
/**
* @author liuxinyue
* @Package：com.muyu.template.controller
* @name：KafkaController
* @Date：2024/10/4 16:11
*/
public class KafkaController {
}

62
cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/test.java 100644
View File

@ -0,0 +1,62 @@
package com.muyu.template;
import com.muyu.common.domain.SysCar;
import com.muyu.common.domain.Template;
import com.muyu.common.domain.WarnRule;
import com.muyu.common.domain.WarnStrategy;
import com.muyu.common.redis.service.RedisService;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
* @author liuxinyue
* @Package：com.muyu.template
* @name：test
* @Date：2024/10/4 9:42
*/
public class test {
@Resource
private RedisService redisService;
public void main(String[] args) {
//车类型
Long carTypeId=null;
//查找车对应的类型
List<SysCar> carList = redisService.getCacheList("car");
for (SysCar sysCar : carList) {
if(sysCar.getCarVin().equals("")){
//获取到车的类型ID
carTypeId = sysCar.getCarTypeId();
}
}
//查找车类型对应的策略
List<WarnStrategy> warnStrategyList = null;
//该车绑定的报文模版
Long templateId=null;
//获取到车的类型之后 查找对应的策略
List<WarnStrategy> warnStrategy = redisService.getCacheList("warnStrategy");
for (WarnStrategy strategy : warnStrategy) {
if(strategy.getCarTypeId().equals(carTypeId)){
templateId=strategy.getTemplateId();
warnStrategyList.add(strategy);
}
}
//根据ID取出对应的报文模版
List<Template> templateList = redisService.getCacheList("template");
//获取策略对应的规则列表
List<WarnRule> warnRule = redisService.getCacheList("warnRule");
List<WarnRule> warnRuleList = null;
}
}

13
cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarController.java
View File

@ -1,12 +1,13 @@
package com.muyu.server.controller;
import com.alibaba.fastjson2.JSONObject;
import com.muyu.cache.SysCarCacheService;
import com.muyu.common.core.domain.Result;
import com.muyu.common.domain.SysCar;
import com.muyu.common.domain.req.SysCarReq;
import com.muyu.common.domain.resp.SysCarFaultLogVo;
import com.muyu.common.kafka.config.KafkaProducerConfig;
import com.muyu.common.redis.service.RedisService;
import com.muyu.common.domain.resp.SysCarVo;
import com.muyu.server.service.SysCarService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -36,9 +37,9 @@ public class SysCarController {
@Autowired
private RabbitTemplate rabbitTemplate;
@Autowired
private KafkaProducer kafkaProducer;
private SysCarCacheService sysCarCacheService;
/**
@ -104,10 +105,10 @@ public class SysCarController {
@PostMapping("/findCarByVin")
@Operation(summary = "根据VIN码查询车信息",description = "根据VIN码查询车信息")
public Result<SysCar> findCarByVin(@RequestParam("carVin") String carVin){
List<SysCarVo> carList = sysCarCacheService.get("carList");
log.info("从redis取出的数据为:"+carList);
return Result.success(sysCarService.findCarByVin(carVin));
}
}