From c42adb48cc340229ec55088280e1c13c46cb646b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=85=BE?= <3467447354@qq.com> Date: Tue, 8 Oct 2024 11:54:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BD=A6=E8=BE=86=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF=E6=97=B6=E7=9A=84=E6=95=85=E9=9A=9C=E7=A0=81=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改CarOnlineConsumer类，实现车辆上线时从VehicleCacheFaultCodeAddService获取故障码缓存并存入本地缓存 - 新增IdentifyingFailuresListener类，用于监听ES保存事件，根据车辆VIN查询并处理故障码 - 调整IotDBController类，注释掉未使用的批量插入记录方法 - 更新相关依赖配置，引入cloud-modules-enterprise-cache等依赖 --- cloud-common/cloud-common-cache/pom.xml | 1 + cloud-modules/cloud-Saas-Service/pom.xml | 6 --- .../cloud-modules-car-gateway/pom.xml | 6 --- cloud-modules/cloud-modules-carData/pom.xml | 5 ++- .../carData/consumer/CarOnlineConsumer.java | 13 ++++++ .../carData/controller/IotDBController.java | 16 ++++--- .../listener/IdentifyingFailuresListener.java | 45 +++++++++++++++++++ .../cloud-modules-enterprise-cache/pom.xml | 10 ++--- .../cloud-modules-enterprise-server/pom.xml | 1 - pom.xml | 14 ++++++ 10 files changed, 93 insertions(+), 24 deletions(-) create mode 100644 cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/listener/IdentifyingFailuresListener.java diff --git a/cloud-common/cloud-common-cache/pom.xml b/cloud-common/cloud-common-cache/pom.xml index 7cc9002..31997ae 100644 --- a/cloud-common/cloud-common-cache/pom.xml +++ b/cloud-common/cloud-common-cache/pom.xml @@ -29,3 +29,4 @@ + diff --git a/cloud-modules/cloud-Saas-Service/pom.xml b/cloud-modules/cloud-Saas-Service/pom.xml index 4f22a33..f5f0d4c 100644 --- a/cloud-modules/cloud-Saas-Service/pom.xml +++ b/cloud-modules/cloud-Saas-Service/pom.xml @@ -58,12 +58,6 @@ com.muyu cloud-common-api-doc - - - com.muyu - cloud-electronic-common - 3.6.3 - com.github.pagehelper pagehelper diff --git a/cloud-modules/cloud-modules-car-gateway/pom.xml b/cloud-modules/cloud-modules-car-gateway/pom.xml index c602346..a2c7444 100644 --- a/cloud-modules/cloud-modules-car-gateway/pom.xml +++ b/cloud-modules/cloud-modules-car-gateway/pom.xml @@ -86,12 +86,6 @@ cloud-common-core - - com.muyu - cloud-modules-car - 3.6.3 - - com.aliyun ecs20140526 diff --git a/cloud-modules/cloud-modules-carData/pom.xml b/cloud-modules/cloud-modules-carData/pom.xml index 5388022..3d58982 100644 --- a/cloud-modules/cloud-modules-carData/pom.xml +++ b/cloud-modules/cloud-modules-carData/pom.xml @@ -19,7 +19,10 @@ UTF-8 - + + com.muyu + cloud-modules-enterprise-cache + com.alibaba.cloud diff --git a/cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/consumer/CarOnlineConsumer.java b/cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/consumer/CarOnlineConsumer.java index b27827b..188c326 100644 --- a/cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/consumer/CarOnlineConsumer.java +++ b/cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/consumer/CarOnlineConsumer.java @@ -1,6 +1,10 @@ package com.muyu.carData.consumer; import com.muyu.carData.util.CacheUtil; +import com.muyu.domain.FaultCodeCache; +import com.muyu.enterprise.cache.car.VehicleCacheCarInformationAddService; +import com.muyu.enterprise.cache.car.VehicleCacheCarInformationFenceRespService; +import com.muyu.enterprise.cache.faultCode.VehicleCacheFaultCodeAddService; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.annotation.Exchange; import org.springframework.amqp.rabbit.annotation.Queue; @@ -23,11 +27,20 @@ public class CarOnlineConsumer { @Autowired private CacheUtil cacheUtil; + @Autowired + private VehicleCacheFaultCodeAddService vehicleCacheCarInformationAddService; + + + + @RabbitListener(bindings = @QueueBinding( value = @Queue(value = "CAR_ONLINE",durable = "true"), exchange = @Exchange(value = "ONLINE_EXCHANGE",type = "fanout") )) public void online(String vin){ log.info("车辆vin:{},已上线,开始消费",vin); + FaultCodeCache faultCodeCache = vehicleCacheCarInformationAddService + .get(vehicleCacheCarInformationAddService.keyPre()+vin); + cacheUtil.put(vin,faultCodeCache); } } diff --git a/cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/controller/IotDBController.java b/cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/controller/IotDBController.java index 0becba4..54eab75 100644 --- a/cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/controller/IotDBController.java +++ b/cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/controller/IotDBController.java @@ -1,3 +1,4 @@ +/* package com.muyu.carData.controller; import com.muyu.carData.config.lotdbconfig.IotDBSessionConfig; @@ -17,13 +18,15 @@ import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; import java.util.List; +*/ /** * @Author：张腾 * @Package：com.muyu.carData.testcontroller * @Project：cloud-server-8 * @name：IotDBController * @Date：2024/9/28 23:58 - */ + *//* + @RequestMapping("/iotdb") @RestController @Log4j2 @@ -33,14 +36,16 @@ public class IotDBController { @Autowired private IotDBSessionConfig iotDBSessionConfig; - /** + */ +/** * 批量插入数据 * @param insertSize 每次插入的条数 * @param count 插入的总条数 * @return * @throws IoTDBConnectionException * @throws StatementExecutionException - */ + *//* + @GetMapping("/insertData/{insertSize}/{count}") public String insert(@PathVariable(name = "insertSize") int insertSize,@PathVariable(name = "count") int count) throws IoTDBConnectionException, StatementExecutionException { Session session = iotDBSessionConfig.iotSession(); @@ -82,7 +87,7 @@ public class IotDBController { } -/* @GetMapping("/batchInsertRecords/{num}") + @GetMapping("/batchInsertRecords/{num}") public String batchInsertRecords(@PathVariable Integer num){ String deviceId = "root.yang"; @@ -109,5 +114,6 @@ public class IotDBController { for (int i = 0; i < num; i++) { deviceIds.add() } - }*/ + } } +*/ diff --git a/cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/listener/IdentifyingFailuresListener.java b/cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/listener/IdentifyingFailuresListener.java new file mode 100644 index 0000000..4f55d2d --- /dev/null +++ b/cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/listener/IdentifyingFailuresListener.java @@ -0,0 +1,45 @@ +package com.muyu.carData.listener; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.muyu.carData.event.EsSaveEvent; +import com.muyu.carData.event.EventListener; +import com.muyu.carData.util.CacheUtil; +import com.muyu.domain.FaultCodeCache; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** 判断故障信息 + * @Author：张腾 + * @Package：com.muyu.carData.listener + * @Project：cloud-server-8 + * @name：IdentifyingFailuresListener + * @Date：2024/10/8 11:22 + */ +@Component +@Slf4j +public class IdentifyingFailuresListener implements EventListener { + + + @Autowired + private CacheUtil cacheUtil; + + @Override + public void onEvent(EsSaveEvent event) { + log.info("规则预警事件开始..."); + JSONObject data = event.getData(); + String vin = (String) data.get("vin"); + String str = cacheUtil.get(vin).toString(); + FaultCodeCache faultCodeCache = JSON.parseObject(str, FaultCodeCache.class); + faultCodeCache.getFaultCode().forEach(faultCode -> { + + }); + log.info("规则预警事件结束..."); + } + + @Override + public void onApplicationEvent(EsSaveEvent event) { + onEvent(event); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/pom.xml index b1476a0..5131db1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/pom.xml @@ -20,16 +20,16 @@ - - com.muyu - cloud-common-cache - 3.6.3 - com.muyu cloud-modules-enterprise-common 1.0.0 + + + com.muyu + cloud-common-cache + com.muyu cloud-auth diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml index 2780ae1..b5aa433 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml @@ -107,7 +107,6 @@ com.muyu cloud-modules-enterprise-cache - 3.6.3 diff --git a/pom.xml b/pom.xml index 58f348a..4b83d60 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,8 @@ 4.1.0 2.4.1 3.6.3 + 3.6.3 + 3.6.3 @@ -110,6 +112,12 @@ ${javax.annotation.version} + + com.muyu + cloud-common-cache + ${common.cache} + + cn.hutool hutool-all @@ -149,6 +157,12 @@ ${commons.io.version} + + com.muyu + cloud-modules-enterprise-cache + ${enterprise.version} + + org.apache.poi