diff --git a/cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/RabbitListenerConfigurer.java b/cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/RabbitListenerConfigurer.java index 51cb359..ca1f236 100644 --- a/cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/RabbitListenerConfigurer.java +++ b/cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/RabbitListenerConfigurer.java @@ -1,16 +1,22 @@ package com.muyu.common.rabbit; +import org.springframework.amqp.core.Binding; +import org.springframework.amqp.core.BindingBuilder; +import org.springframework.amqp.core.DirectExchange; +import org.springframework.amqp.core.Queue; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistrar; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; import org.springframework.messaging.converter.MappingJackson2MessageConverter; import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory; @Configuration public class RabbitListenerConfigurer implements org.springframework.amqp.rabbit.annotation.RabbitListenerConfigurer { + static { System.setProperty("spring.amqp.deserialization.trust.all", "true"); } 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 3f7ef17..ade9af7 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 @@ -3,14 +3,8 @@ package com.muyu.carData.consumer; import com.muyu.carData.util.CacheUtil; import com.muyu.enterprise.cache.faultCode.VehicleCacheFaultCodeAddService; import lombok.extern.log4j.Log4j2; -import org.springframework.amqp.core.Binding; -import org.springframework.amqp.core.BindingBuilder; -import org.springframework.amqp.core.DirectExchange; -import org.springframework.amqp.core.Queue; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; /**车辆上线消费者 @@ -31,21 +25,24 @@ public class CarOnlineConsumer { private VehicleCacheFaultCodeAddService vehicleCacheCarInformationAddService; + @RabbitListener(queues = "myQueue",containerFactory = "rabbitListenerContainerFactory") + public void consumeMessage(String message) { + // 处理接收到的消息 + log.info("接收到消息======>>" + message); + } - - /** - * 创建网关路由交换机 - * @return - */ +/* @Bean public DirectExchange initVehicleGatewayExchange(){ return new DirectExchange(VehicleGatewayConstants.VEHICLE_GETAWAY_EXCHANGE); - } + }*/ - @Bean + + + /*@Bean @Primary public Queue initQueue(){ - return new Queue("test", true); + return new Queue("gateway", true); } @Bean @@ -56,8 +53,8 @@ public class CarOnlineConsumer { .with(VehicleGatewayConstants.VEHICLE_GETAWAY_ROUTING_KEY); } - @RabbitListener(queues = "test") - public void msg(String msg){ - log.info(msg); - } + @RabbitListener(queues = "gateway") + public void msg(@RequestBody WebHookConnection webHookConnection){ + log.info("消费者接收到车辆上线信息:{}",webHookConnection); + }*/ } 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 index 4f55d2d..b8feff3 100644 --- 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 @@ -32,9 +32,6 @@ public class IdentifyingFailuresListener implements EventListener { 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("规则预警事件结束..."); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationAddService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationAddService.java index 92b94de..489dd43 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationAddService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationAddService.java @@ -1,11 +1,8 @@ package com.muyu.enterprise.cache.car; import com.muyu.common.cache.CacheAbsBasic; -import com.muyu.domain.CarInformation; import com.muyu.domain.req.CarInformationAddReq; -import java.util.List; - /** * 添加车辆信息 * @Author：yang diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java index 7c5dc67..9bbcecc 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java @@ -1,9 +1,8 @@ package com.muyu.enterprise.cache.car; import com.muyu.common.cache.CacheAbsBasic; -import com.muyu.domain.CarInformation; -import com.muyu.domain.resp.CarFenceGroupResp; import com.muyu.domain.resp.CarInformationResp; +import org.springframework.stereotype.Service; import java.util.List; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java index d28ebbf..f678a72 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java @@ -1,7 +1,6 @@ package com.muyu.enterprise.cache.car; import com.muyu.common.cache.CacheAbsBasic; -import com.muyu.domain.req.CarInformationAddReq; import com.muyu.domain.req.CarInformationUpdReq; /** 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 b5aa433..4003da2 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 @@ -44,11 +44,6 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - - com.muyu - cloud-modules-carData - 3.6.3 - com.alibaba.cloud @@ -99,11 +94,6 @@ pagehelper 6.0.0 - - com.muyu - cloud-modules-carData - 3.6.3 - com.muyu cloud-modules-enterprise-cache diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java index 26560ce..e6ff881 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java @@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -23,12 +24,12 @@ import java.util.List; */ @RequestMapping("/carFenceClazz") @RestController -@AllArgsConstructor @Tag(name = "查询数据",description = "从围栏信息表中查询数据") @Log4j2 public class CarFenceClazzController { - private final CarFenceClazzService carFenceClazzService; + @Autowired + private CarFenceClazzService carFenceClazzService; /** * 查询围栏类型信息 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java index 7e009cb..e4c4a21 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java @@ -1,22 +1,21 @@ package com.muyu.server.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageInfo; - import com.muyu.common.core.domain.Result; -import com.muyu.domain.CarFenceType; import com.muyu.domain.CarInformation; import com.muyu.domain.req.CarInformationAddReq; import com.muyu.domain.req.CarInformationListReq; import com.muyu.domain.req.CarInformationUpdReq; import com.muyu.domain.resp.CarInformationResp; -import com.muyu.enterprise.cache.car.*; +import com.muyu.enterprise.cache.car.VehicleCacheCarInformationAddService; +import com.muyu.enterprise.cache.car.VehicleCacheCarInformationService; +import com.muyu.enterprise.cache.car.VehicleCacheCarInformationUpdService; import com.muyu.server.service.CarInformationService; import com.muyu.server.util.ObtainRootLogin; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; -import org.springframework.util.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -34,8 +33,11 @@ import java.util.List; public class CarInformationController { @Resource private CarInformationService carInformationService; + @Autowired private VehicleCacheCarInformationService vehicleCacheCarInformationService; + @Autowired private VehicleCacheCarInformationAddService vehicleCacheCarInformationAddService; + @Autowired private VehicleCacheCarInformationUpdService vehicleCacheCarInformationUpdService; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java index 98d4dbb..0a89b1c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java @@ -1,31 +1,24 @@ package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.muyu.common.core.utils.StringUtils; -import com.muyu.domain.*; +import com.muyu.domain.FaultCode; +import com.muyu.domain.FaultLabel; import com.muyu.domain.req.FaultCodeAddReq; import com.muyu.domain.req.FaultCodeListReq; import com.muyu.domain.req.FaultCodeUpdReq; import com.muyu.domain.resp.FaultCodeListResp; import com.muyu.domain.resp.FaultCodeTotalListResp; -import com.muyu.domain.resp.FaultConditionListResp; -import com.muyu.domain.resp.FaultConditionResp; -import com.muyu.enterprise.cache.car.VehicleCacheCarInformationService; -import com.muyu.enterprise.cache.fault.VehicleCacheFaultService; import com.muyu.server.mapper.FaultCodeMapper; import com.muyu.server.service.CarFenceService; import com.muyu.server.service.CarInformationService; import com.muyu.server.service.FaultCodeService; import com.muyu.server.service.FaultLabelService; -import com.muyu.server.util.ObtainRootLogin; import lombok.AllArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; /**