代码优化结构和功能

-调整控制器类中的依赖注入方式,使用 @Autowired 注解- 简化 CarOnlineConsumer 类,移除不必要的代码
- 重构 FaultCodeServiceImpl 类,删除未使用的导入和变量
-调整 pom.xml 文件,移除重复的依赖项
-优化 RabbitListenerConfigurer 类,添加缺失的注解和配置
-调整 VehicleCacheCarInformationAddService、VehicleCacheCarInformationService 和 VehicleCacheCarInformationUpdService 类,移除未使用的代码
dev.carData
张腾 2024-10-11 21:29:35 +08:00
parent 5d4b1dbe67
commit d7a1d79a12
10 changed files with 34 additions and 53 deletions

View File

@ -1,16 +1,22 @@
package com.muyu.common.rabbit; 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.connection.ConnectionFactory;
import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistrar; import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistrar;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.messaging.converter.MappingJackson2MessageConverter; import org.springframework.messaging.converter.MappingJackson2MessageConverter;
import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory; import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory;
@Configuration @Configuration
public class RabbitListenerConfigurer implements org.springframework.amqp.rabbit.annotation.RabbitListenerConfigurer { public class RabbitListenerConfigurer implements org.springframework.amqp.rabbit.annotation.RabbitListenerConfigurer {
static { static {
System.setProperty("spring.amqp.deserialization.trust.all", "true"); System.setProperty("spring.amqp.deserialization.trust.all", "true");
} }

View File

@ -3,14 +3,8 @@ package com.muyu.carData.consumer;
import com.muyu.carData.util.CacheUtil; import com.muyu.carData.util.CacheUtil;
import com.muyu.enterprise.cache.faultCode.VehicleCacheFaultCodeAddService; import com.muyu.enterprise.cache.faultCode.VehicleCacheFaultCodeAddService;
import lombok.extern.log4j.Log4j2; 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.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/**线 /**线
@ -31,21 +25,24 @@ public class CarOnlineConsumer {
private VehicleCacheFaultCodeAddService vehicleCacheCarInformationAddService; private VehicleCacheFaultCodeAddService vehicleCacheCarInformationAddService;
@RabbitListener(queues = "myQueue",containerFactory = "rabbitListenerContainerFactory")
public void consumeMessage(String message) {
// 处理接收到的消息
log.info("接收到消息======>>" + message);
}
/*
/**
*
* @return
*/
@Bean @Bean
public DirectExchange initVehicleGatewayExchange(){ public DirectExchange initVehicleGatewayExchange(){
return new DirectExchange(VehicleGatewayConstants.VEHICLE_GETAWAY_EXCHANGE); return new DirectExchange(VehicleGatewayConstants.VEHICLE_GETAWAY_EXCHANGE);
} }*/
@Bean
/*@Bean
@Primary @Primary
public Queue initQueue(){ public Queue initQueue(){
return new Queue("test", true); return new Queue("gateway", true);
} }
@Bean @Bean
@ -56,8 +53,8 @@ public class CarOnlineConsumer {
.with(VehicleGatewayConstants.VEHICLE_GETAWAY_ROUTING_KEY); .with(VehicleGatewayConstants.VEHICLE_GETAWAY_ROUTING_KEY);
} }
@RabbitListener(queues = "test") @RabbitListener(queues = "gateway")
public void msg(String msg){ public void msg(@RequestBody WebHookConnection webHookConnection){
log.info(msg); log.info("消费者接收到车辆上线信息:{}",webHookConnection);
} }*/
} }

View File

@ -32,9 +32,6 @@ public class IdentifyingFailuresListener implements EventListener {
String vin = (String) data.get("vin"); String vin = (String) data.get("vin");
String str = cacheUtil.get(vin).toString(); String str = cacheUtil.get(vin).toString();
FaultCodeCache faultCodeCache = JSON.parseObject(str, FaultCodeCache.class); FaultCodeCache faultCodeCache = JSON.parseObject(str, FaultCodeCache.class);
faultCodeCache.getFaultCode().forEach(faultCode -> {
});
log.info("规则预警事件结束..."); log.info("规则预警事件结束...");
} }

View File

@ -1,11 +1,8 @@
package com.muyu.enterprise.cache.car; package com.muyu.enterprise.cache.car;
import com.muyu.common.cache.CacheAbsBasic; import com.muyu.common.cache.CacheAbsBasic;
import com.muyu.domain.CarInformation;
import com.muyu.domain.req.CarInformationAddReq; import com.muyu.domain.req.CarInformationAddReq;
import java.util.List;
/** /**
* *
* @Authoryang * @Authoryang

View File

@ -1,9 +1,8 @@
package com.muyu.enterprise.cache.car; package com.muyu.enterprise.cache.car;
import com.muyu.common.cache.CacheAbsBasic; import com.muyu.common.cache.CacheAbsBasic;
import com.muyu.domain.CarInformation;
import com.muyu.domain.resp.CarFenceGroupResp;
import com.muyu.domain.resp.CarInformationResp; import com.muyu.domain.resp.CarInformationResp;
import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;

View File

@ -1,7 +1,6 @@
package com.muyu.enterprise.cache.car; package com.muyu.enterprise.cache.car;
import com.muyu.common.cache.CacheAbsBasic; import com.muyu.common.cache.CacheAbsBasic;
import com.muyu.domain.req.CarInformationAddReq;
import com.muyu.domain.req.CarInformationUpdReq; import com.muyu.domain.req.CarInformationUpdReq;
/** /**

View File

@ -44,11 +44,6 @@
<groupId>com.alibaba.cloud</groupId> <groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId> <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-modules-carData</artifactId>
<version>3.6.3</version>
</dependency>
<!-- SpringCloud Alibaba Sentinel --> <!-- SpringCloud Alibaba Sentinel -->
<dependency> <dependency>
<groupId>com.alibaba.cloud</groupId> <groupId>com.alibaba.cloud</groupId>
@ -99,11 +94,6 @@
<artifactId>pagehelper</artifactId> <artifactId>pagehelper</artifactId>
<version>6.0.0</version> <version>6.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-modules-carData</artifactId>
<version>3.6.3</version>
</dependency>
<dependency> <dependency>
<groupId>com.muyu</groupId> <groupId>com.muyu</groupId>
<artifactId>cloud-modules-enterprise-cache</artifactId> <artifactId>cloud-modules-enterprise-cache</artifactId>

View File

@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2; 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.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -23,12 +24,12 @@ import java.util.List;
*/ */
@RequestMapping("/carFenceClazz") @RequestMapping("/carFenceClazz")
@RestController @RestController
@AllArgsConstructor
@Tag(name = "查询数据",description = "从围栏信息表中查询数据") @Tag(name = "查询数据",description = "从围栏信息表中查询数据")
@Log4j2 @Log4j2
public class CarFenceClazzController { public class CarFenceClazzController {
private final CarFenceClazzService carFenceClazzService; @Autowired
private CarFenceClazzService carFenceClazzService;
/** /**
* *

View File

@ -1,22 +1,21 @@
package com.muyu.server.controller; package com.muyu.server.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageInfo;
import com.muyu.common.core.domain.Result; import com.muyu.common.core.domain.Result;
import com.muyu.domain.CarFenceType;
import com.muyu.domain.CarInformation; import com.muyu.domain.CarInformation;
import com.muyu.domain.req.CarInformationAddReq; import com.muyu.domain.req.CarInformationAddReq;
import com.muyu.domain.req.CarInformationListReq; import com.muyu.domain.req.CarInformationListReq;
import com.muyu.domain.req.CarInformationUpdReq; import com.muyu.domain.req.CarInformationUpdReq;
import com.muyu.domain.resp.CarInformationResp; 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.service.CarInformationService;
import com.muyu.server.util.ObtainRootLogin; import com.muyu.server.util.ObtainRootLogin;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.log4j.Log4j2; 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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -34,8 +33,11 @@ import java.util.List;
public class CarInformationController { public class CarInformationController {
@Resource @Resource
private CarInformationService carInformationService; private CarInformationService carInformationService;
@Autowired
private VehicleCacheCarInformationService vehicleCacheCarInformationService; private VehicleCacheCarInformationService vehicleCacheCarInformationService;
@Autowired
private VehicleCacheCarInformationAddService vehicleCacheCarInformationAddService; private VehicleCacheCarInformationAddService vehicleCacheCarInformationAddService;
@Autowired
private VehicleCacheCarInformationUpdService vehicleCacheCarInformationUpdService; private VehicleCacheCarInformationUpdService vehicleCacheCarInformationUpdService;

View File

@ -1,31 +1,24 @@
package com.muyu.server.service.impl; package com.muyu.server.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.muyu.common.core.utils.StringUtils; 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.FaultCodeAddReq;
import com.muyu.domain.req.FaultCodeListReq; import com.muyu.domain.req.FaultCodeListReq;
import com.muyu.domain.req.FaultCodeUpdReq; import com.muyu.domain.req.FaultCodeUpdReq;
import com.muyu.domain.resp.FaultCodeListResp; import com.muyu.domain.resp.FaultCodeListResp;
import com.muyu.domain.resp.FaultCodeTotalListResp; 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.mapper.FaultCodeMapper;
import com.muyu.server.service.CarFenceService; import com.muyu.server.service.CarFenceService;
import com.muyu.server.service.CarInformationService; import com.muyu.server.service.CarInformationService;
import com.muyu.server.service.FaultCodeService; import com.muyu.server.service.FaultCodeService;
import com.muyu.server.service.FaultLabelService; import com.muyu.server.service.FaultLabelService;
import com.muyu.server.util.ObtainRootLogin;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**