From 4488018bce42a043980076196077a9760c1a131e Mon Sep 17 00:00:00 2001 From: ffr <492210217@qq.com> Date: Mon, 8 Apr 2024 21:53:13 +0800 Subject: [PATCH] commit upd ffr --- couplet-auth/src/main/resources/bootstrap.yml | 2 ++ couplet-common/couplet-common-redis/pom.xml | 1 + .../common/redis/service/RedisService.java | 5 +---- .../src/main/resources/bootstrap.yml | 2 ++ .../analyze/msg/model/ModelsKafkaMessage.java | 1 + .../src/main/resources/bootstrap.yml | 3 +++ couplet-modules/couplet-business/pom.xml | 4 ++++ .../controller/VehicleDetectionController.java | 13 +++++++------ .../server/service/VehicleDetectionService.java | 9 ++++++--- .../impl/VehicleDetectionServiceImpl.java | 17 ++++++++++++++++- .../src/main/resources/bootstrap.yml | 4 ++-- .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 3 +++ .../src/main/resources/bootstrap.yml | 2 ++ 16 files changed, 56 insertions(+), 16 deletions(-) diff --git a/couplet-auth/src/main/resources/bootstrap.yml b/couplet-auth/src/main/resources/bootstrap.yml index 427f682..b89bb00 100644 --- a/couplet-auth/src/main/resources/bootstrap.yml +++ b/couplet-auth/src/main/resources/bootstrap.yml @@ -17,9 +17,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-common/couplet-common-redis/pom.xml b/couplet-common/couplet-common-redis/pom.xml index 6fb7805..617dffc 100644 --- a/couplet-common/couplet-common-redis/pom.xml +++ b/couplet-common/couplet-common-redis/pom.xml @@ -33,5 +33,6 @@ couplet-common-business + diff --git a/couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/service/RedisService.java b/couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/service/RedisService.java index ec07e06..c02b7a9 100644 --- a/couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/service/RedisService.java +++ b/couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/service/RedisService.java @@ -23,9 +23,6 @@ public class RedisService { public RedisTemplate redisTemplate; - public List getList () { - return redisTemplate.opsForList().range("coupletMsgData", 0, -1); - } // ... 其他已有方法 ... @@ -309,8 +306,8 @@ public class RedisService { } public void stopViewingData(String vin) { - String key = "vin:"+vin; redisTemplate.delete(key); } + } diff --git a/couplet-gateway/src/main/resources/bootstrap.yml b/couplet-gateway/src/main/resources/bootstrap.yml index 091e68a..acd4642 100644 --- a/couplet-gateway/src/main/resources/bootstrap.yml +++ b/couplet-gateway/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java index 1c2c085..79d7dc1 100644 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java +++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java @@ -1,5 +1,6 @@ package com.couplet.analyze.msg.model; +import com.couplet.analyze.common.event.AnalyzeEventCache; import com.couplet.analyze.msg.domain.CoupletMsgData; import com.couplet.analyze.msg.service.IncidentService; import com.couplet.common.core.exception.vehicle.VehicleException; diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml index bed4d26..b36b039 100644 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml @@ -15,14 +15,17 @@ 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 # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + main: allow-bean-definition-overriding: true rabbitmq: diff --git a/couplet-modules/couplet-business/pom.xml b/couplet-modules/couplet-business/pom.xml index a5aea00..1810119 100644 --- a/couplet-modules/couplet-business/pom.xml +++ b/couplet-modules/couplet-business/pom.xml @@ -101,6 +101,10 @@ com.couplet couplet-modules-mq + + com.couplet + couplet-analyze-msg + diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleDetectionController.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleDetectionController.java index 15894bd..cf1919a 100644 --- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleDetectionController.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleDetectionController.java @@ -1,5 +1,6 @@ package com.couplet.business.server.controller; +import com.couplet.analyze.msg.domain.CoupletMsgData; import com.couplet.business.server.service.VehicleDetectionService; import com.couplet.common.core.domain.Result; import com.couplet.common.domain.CoupletVehicleData; @@ -58,21 +59,21 @@ public class VehicleDetectionController { public void monitorinData(@PathVariable String vin){ vehicleDetectionService.monitorinData(vin); } - /* * @param : - * @return Result> + * @return Result> * @author 付凡芮 * @description 查看事实数据列表 * @date */ - @PostMapping("realData") - public Result> realData(){ - List list = redisService.getList(); - Result> success = Result.success(list); + @PostMapping("/monitorinDataList/{vin}") + public Result> monitorinDataList(@PathVariable String vin){ + List monitorinDataList = vehicleDetectionService.monitorinDataList(vin); + Result> success = Result.success(monitorinDataList); return success; } + /* * @param vin: * @return void diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleDetectionService.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleDetectionService.java index 9537c17..f894f8b 100644 --- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleDetectionService.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleDetectionService.java @@ -1,6 +1,8 @@ package com.couplet.business.server.service; +import com.couplet.analyze.msg.domain.CoupletMsgData; import com.couplet.common.core.domain.Result; +import com.couplet.common.domain.CoupletVehicleData; import com.couplet.common.domain.Vehicle; import java.util.List; @@ -9,8 +11,9 @@ public interface VehicleDetectionService { List detectionList(); - void monitorinData(String vin); - - void stopViewingData(String vin); + + List monitorinDataList(String vin); + + void monitorinData(String vin); } diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleDetectionServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleDetectionServiceImpl.java index 08020a3..32188ff 100644 --- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleDetectionServiceImpl.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleDetectionServiceImpl.java @@ -1,10 +1,12 @@ package com.couplet.business.server.service.impl; import com.alibaba.fastjson.JSON; +import com.couplet.analyze.msg.domain.CoupletMsgData; import com.couplet.business.server.mapper.VehicleDetectionMapper; import com.couplet.business.server.service.VehicleDetectionService; import com.couplet.business.server.service.VehicleManageService; import com.couplet.common.core.domain.Result; +import com.couplet.common.domain.CoupletVehicleData; import com.couplet.common.domain.Vehicle; import com.couplet.common.domain.request.RealTimeDataRequest; import com.couplet.common.redis.service.RedisService; @@ -12,10 +14,12 @@ import com.couplet.common.security.utils.SecurityUtils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.mysql.cj.xdevapi.JsonString; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import springfox.documentation.spring.web.json.Json; +import java.util.ArrayList; import java.util.List; /** @@ -25,6 +29,7 @@ import java.util.List; * @date 2024/4/4 10:23 */ @Service +@Slf4j public class VehicleDetectionServiceImpl implements VehicleDetectionService{ @Autowired @@ -37,6 +42,16 @@ public class VehicleDetectionServiceImpl implements VehicleDetectionService{ return vehicleDetectionMapper.detectionList(); } + @Override + public List monitorinDataList(String vin) { + String key = "vin:query:" + vin; + log.info("key为:"+key); + CoupletMsgData coupletMsgData = redisService.getCacheObject(key); + ArrayList coupletMsgDataArrayList = new ArrayList<>(); + coupletMsgDataArrayList.add(coupletMsgData); + return coupletMsgDataArrayList; + } + @Override public void monitorinData(String vin) { RealTimeDataRequest realTimeDataRequest = new RealTimeDataRequest(); @@ -44,7 +59,6 @@ public class VehicleDetectionServiceImpl implements VehicleDetectionService{ realTimeDataRequest.setVin(vin); realTimeDataRequest.setUserId(userId); redisService.setVinAndUserId(realTimeDataRequest); - } @Override @@ -52,4 +66,5 @@ public class VehicleDetectionServiceImpl implements VehicleDetectionService{ redisService.stopViewingData(vin); } + } diff --git a/couplet-modules/couplet-business/src/main/resources/bootstrap.yml b/couplet-modules/couplet-business/src/main/resources/bootstrap.yml index 6c75304..ff5fb2c 100644 --- a/couplet-modules/couplet-business/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-business/src/main/resources/bootstrap.yml @@ -16,11 +16,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml index fa968e9..8681657 100644 --- a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml index e3d77cd..fa5dcb3 100644 --- a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml @@ -17,9 +17,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml index bb1f871..108c695 100644 --- a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml b/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml index 00ac887..3f666b9 100644 --- a/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置 @@ -46,6 +48,7 @@ mqtt: # RabbitMQ配置 mq: queueName: queue + VinQueueName: vinQueueName exchangeName: exchange routingKey: routingKey diff --git a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml index d1064dc..94d42fc 100644 --- a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml +++ b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4 # 配置文件格式 file-extension: yml # 共享配置