From 7ca3d4dede9efd3bc933df70fce6323def4d554a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=89=E5=AE=89=E5=90=9B?= <2746727141@qq.com> Date: Mon, 8 Apr 2024 20:00:17 +0800 Subject: [PATCH] =?UTF-8?q?feat=20commit=20=E5=9B=B4=E6=A0=8F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=BA=8B=E4=BB=B6=E4=BC=AA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zhilian-auth/src/main/resources/bootstrap.yml | 2 -- .../common/redis/service/RedisService.java | 5 ++++ .../src/main/resources/bootstrap.yml | 2 -- .../src/main/resources/bootstrap.yml | 2 -- .../src/main/resources/bootstrap.yml | 2 -- .../src/main/resources/bootstrap.yml | 2 -- .../src/main/resources/bootstrap.yml | 2 -- .../src/main/resources/bootstrap.yml | 2 -- .../online/ZhiLianOnlineApplication.java | 4 --- .../zhilian/online/config/MqttxConfig.java | 28 +++++++++++++++++ .../src/main/resources/bootstrap.yml | 2 -- .../java/com/zhilian/online/TestKafka.java | 30 ------------------- .../GeofenceEventServiceImpl.java | 3 +- .../src/main/resources/bootstrap.yml | 2 -- 14 files changed, 34 insertions(+), 54 deletions(-) delete mode 100644 zhilian-modules/zhilian-online/src/test/java/com/zhilian/online/TestKafka.java diff --git a/zhilian-auth/src/main/resources/bootstrap.yml b/zhilian-auth/src/main/resources/bootstrap.yml index f0725a8..94f1a14 100644 --- a/zhilian-auth/src/main/resources/bootstrap.yml +++ b/zhilian-auth/src/main/resources/bootstrap.yml @@ -15,11 +15,9 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/service/RedisService.java b/zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/service/RedisService.java index 1b21a4e..5d0996f 100644 --- a/zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/service/RedisService.java +++ b/zhilian-common/zhilian-common-redis/src/main/java/com/zhilian/common/redis/service/RedisService.java @@ -389,4 +389,9 @@ public class RedisService { public Collection keys(final String pattern) { return redisTemplate.keys(pattern); } + + public void deleteCacheSet(String s) { + SetOperations setOperations = redisTemplate.opsForSet(); + setOperations.remove(s); + } } diff --git a/zhilian-gateway/src/main/resources/bootstrap.yml b/zhilian-gateway/src/main/resources/bootstrap.yml index a670f31..5d8eb06 100644 --- a/zhilian-gateway/src/main/resources/bootstrap.yml +++ b/zhilian-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,9 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-business/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-business/src/main/resources/bootstrap.yml index 1105c2a..2339518 100644 --- a/zhilian-modules/zhilian-business/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-business/src/main/resources/bootstrap.yml @@ -15,11 +15,9 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml index 9522161..415c871 100644 --- a/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-file/src/main/resources/bootstrap.yml @@ -15,11 +15,9 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml index b9c8fb0..e6ae61a 100644 --- a/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,9 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml index 510d6bb..1833882 100644 --- a/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-job/src/main/resources/bootstrap.yml @@ -15,11 +15,9 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-manager/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-manager/src/main/resources/bootstrap.yml index 9fc2b73..28c6815 100644 --- a/zhilian-modules/zhilian-manager/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-manager/src/main/resources/bootstrap.yml @@ -15,11 +15,9 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/ZhiLianOnlineApplication.java b/zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/ZhiLianOnlineApplication.java index 67c0c70..8bd0e3a 100644 --- a/zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/ZhiLianOnlineApplication.java +++ b/zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/ZhiLianOnlineApplication.java @@ -3,12 +3,8 @@ package com.zhilian.online; import com.zhilian.common.security.annotation.EnableCustomConfig; import com.zhilian.common.security.annotation.EnableMyFeignClients; import com.zhilian.common.swagger.annotation.EnableCustomSwagger2; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.kafka.core.KafkaTemplate; /** * @version: diff --git a/zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/config/MqttxConfig.java b/zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/config/MqttxConfig.java index 4581512..15948f0 100644 --- a/zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/config/MqttxConfig.java +++ b/zhilian-modules/zhilian-online/src/main/java/com/zhilian/online/config/MqttxConfig.java @@ -14,8 +14,10 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; +import java.util.HashSet; import java.util.List; import java.util.Properties; +import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; @@ -138,6 +140,32 @@ public class MqttxConfig { public void messageArrived(String s, MqttMessage mqttMessage) throws Exception { log.info("消息到达,接受消息主题{},接受消息Qos{},接受消息内容{}", topic, mqttMessage.getQos(), new String(mqttMessage.getPayload())); + HashSet strings = new HashSet<>(); + strings.add("malfunction"); + strings.add("event-storage"); + strings.add("geofence"); + + redisService.setCacheSet("vehicle-event:" + "VIN123456789DIJE4",strings); + Set cacheSet = redisService.getCacheSet("vehicle-event:" + "VIN123456789DIJE4"); + + if (redisService.hasKey("vehicle-event:" + "VIN123456789DIJE4")){ + //有事件 + Set cacheSet1 = redisService.getCacheSet("vehicle-event:" + "VIN123456789DIJE4"); + Set events = cacheSet1.stream().map(item -> { + return String.valueOf(item); + }).collect(Collectors.toSet()); + if (events.contains("geofence")){ + //包含围栏事件 + + }else { + //不包含围栏事件 + redisService.setCacheSet("vehicle-event:" + "VIN123456789DIJE4","geofence"); + redisService.deleteCacheSet("vehicle-event:" + "VIN123456789DIJE4"); + events.add("geofence"); + redisService.setCacheSet("vehicle-event:" + "VIN123456789DIJE4",events); + } + } + //将接受到的车辆报文存储到kafka中 executorService.execute(() -> { executorTask(mqttMessage); diff --git a/zhilian-modules/zhilian-online/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-online/src/main/resources/bootstrap.yml index 452f88f..b1662f9 100644 --- a/zhilian-modules/zhilian-online/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-online/src/main/resources/bootstrap.yml @@ -15,11 +15,9 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zhilian-modules/zhilian-online/src/test/java/com/zhilian/online/TestKafka.java b/zhilian-modules/zhilian-online/src/test/java/com/zhilian/online/TestKafka.java deleted file mode 100644 index 8d98274..0000000 --- a/zhilian-modules/zhilian-online/src/test/java/com/zhilian/online/TestKafka.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.zhilian.online; - -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.kafka.core.KafkaTemplate; -import org.springframework.stereotype.Component; - -/** - * @BelongsProject: smart-cloud-server - * @BelongsPackage: com.zhilian.online - * @Author: LiYuan - * @CreateTime: 2024-04-06 20:02 - * @Description: TODO - * @Version: 1.0 - */ -@Component -public class TestKafka { - - @Autowired - private KafkaTemplate kafkaTemplate; - - @Test - public void testSend(){ - kafkaTemplate.send("topic1","hello world!"); - } - - -} diff --git a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/eventGeofence/GeofenceEventServiceImpl.java b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/eventGeofence/GeofenceEventServiceImpl.java index f90dc91..c60ae48 100644 --- a/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/eventGeofence/GeofenceEventServiceImpl.java +++ b/zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/eventGeofence/GeofenceEventServiceImpl.java @@ -1,7 +1,6 @@ package com.zhilian.resolver.service.impl.eventGeofence; -import com.zhilian.business.domain.Fence; -import com.zhilian.business.domain.vo.FenceVo; +import com.zhilian.common.business.domain.vo.FenceVo; import com.zhilian.common.resolver.domain.ResolverReportData; import com.zhilian.resolver.service.ResolverEventService; import lombok.extern.slf4j.Slf4j; diff --git a/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml b/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml index 930724a..a4a540d 100644 --- a/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml +++ b/zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml @@ -19,11 +19,9 @@ spring: discovery: # 服务注册地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe config: # 配置中心地址 server-addr: 10.10.25.2:8848 - namespace: 9d9e22dc-ff70-42c5-adac-fa69e6d62dbe # 配置文件格式 file-extension: yml # 共享配置