five-groups
/
five-groups-couplet
4
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Compare commits

base: five-groups:c4eb443372ae1566e58a9d0f4a43ae2e0368e90e
Branches Tags
five-groups:server_five_fufanrui
five-groups:server_five_dongxiaodong
five-groups:server_five
five-groups:server_five_liuyunhu
..
compare: five-groups:0569099b0242d7a7a4c1cc804ef99e602866f99c
Branches Tags
five-groups:server_five_fufanrui
five-groups:server_five_dongxiaodong
five-groups:server_five
five-groups:server_five_liuyunhu

No commits in common. "c4eb443372ae1566e58a9d0f4a43ae2e0368e90e" and "0569099b0242d7a7a4c1cc804ef99e602866f99c" have entirely different histories.
c4eb443372 ... 0569099b02

16 changed files with 34 additions and 137 deletions
Show Stats Expand all files Collapse all files

2
couplet-common/couplet-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@ -1,2 +1,2 @@
com.couplet.remote.factory.RemoteVehicleFallbackFactory
com.couplet.remote.factory.RemoteTroubleFallbackFactory
com.couplet.remote.factory.RemoteVehicleFallbackFactory

4
couplet-common/couplet-common-redis/pom.xml
View File

@ -28,10 +28,6 @@
<groupId>com.couplet</groupId>
<artifactId>couplet-common-core</artifactId>
</dependency>
<dependency>
<groupId>com.couplet</groupId>
<artifactId>couplet-common-business</artifactId>
</dependency>
</dependencies>
</project>

7
couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/service/RedisService.java
View File

@ -1,6 +1,5 @@
package com.couplet.common.redis.service;
import com.couplet.common.domain.CoupletVehicleData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.*;
import org.springframework.stereotype.Component;
@ -20,12 +19,6 @@ public class RedisService {
@Resource
public RedisTemplate redisTemplate;
public List<CoupletVehicleData> getList () {
return redisTemplate.opsForList().range("coupletMsgData", 0, -1);
}
/**
* 缓存基本的对象，Integer、String、实体类等
*

4
couplet-modules/couplet-business/src/main/java/com/couplet/business/server/CoupletBusinessApplication.java
View File

@ -15,10 +15,10 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@EnableCustomConfig
@EnableCustomSwagger2
@EnableMyFeignClients(basePackages = ("com.couplet"))
@SpringBootApplication(scanBasePackages = {"com.couplet", "com.couplet.mq.remote"})
@SpringBootApplication(scanBasePackages = {"com.couplet"})
@EnableScheduling
public class CoupletBusinessApplication {
public static void main(String[] args) {
public static void main (String[] args) {
SpringApplication.run(CoupletBusinessApplication.class, args);
}

11
couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleDetectionController.java
View File

@ -5,7 +5,6 @@ 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;
import com.couplet.common.security.utils.SecurityUtils;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
@ -32,8 +31,6 @@ public class VehicleDetectionController {
private VehicleDetectionService vehicleDetectionService;
@Autowired
private RabbitTemplate rabbitTemplate;
@Autowired
private RedisService redisService;
private final String REDIS_LIST_KEY = "coupletMsgData";
/*
* @param :
@ -68,11 +65,7 @@ public class VehicleDetectionController {
@PostMapping("realData")
public Result<List<CoupletVehicleData>> realData(){
List<CoupletVehicleData> list = redisService.getList();
Result<List<CoupletVehicleData>> success = Result.success(list);
return success;
}
}

1
couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/EmployeeService.java
View File

@ -3,7 +3,6 @@ package com.couplet.business.server.service;
import com.couplet.common.core.domain.Result;
import com.couplet.common.core.web.page.TableDataInfo;
import com.couplet.common.system.domain.SysUser;
import org.springframework.stereotype.Component;
import java.util.List;

32
couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java
View File

@ -16,7 +16,6 @@ import com.couplet.common.domain.VehicleType;
import com.couplet.common.domain.request.VehicleEditParams;
import com.couplet.common.domain.request.VehicleInsertParams;
import com.couplet.common.domain.request.VehicleListParams;
import com.couplet.mq.remote.RemoteFenceService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -37,10 +36,6 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
@Autowired
private VehicleMapper vehicleMapper;
//远程发送mq
@Autowired
private RemoteFenceService remoteFenceService;
//车辆类型服务
@Autowired
private VehicleTypeService vehicleTypeService;
@ -171,19 +166,6 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
//删除绑定之后，再添加新的绑定
vehicleAndLogoService.vehicleBindLogo(editParams.getVehicleId(), editParams.getLogoIds());
//mq
List<Long> logoList = getBindLogoById(editParams.getVehicleId());
if (0 != logoList.size()) {
String ids = "";
for (Long l : logoList) {
ids = "," + l;
}
ids = ids.substring(1);
remoteFenceService.vehicleQueue(editParams.getVehicleId() + "-" + ids);
}
result = "编辑成功！";
return result;
@ -252,17 +234,6 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
int i = vehicleAndLogoService.vehicleBindLogo(vehicle.getVehicleId(), insertParams.getLogoIds());
List<Long> logoList = getBindLogoById(vehicle.getVehicleId());
if (0 != logoList.size()) {
String ids = "";
for (Long l : logoList) {
ids = "," + l;
}
ids = ids.substring(1);
remoteFenceService.vehicleQueue(vehicle.getVehicleId() + "-" + ids);
}
result = "新增成功！";
return result;
@ -285,7 +256,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
/*
* @param userId:
* @return List<Vehicle>
* @return List<Vehicle>
* @author 付凡芮
* @description 根据登入人id查询管理车辆
*
@ -333,5 +304,4 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
return this.list(queryWrapper);
}
}

43
couplet-modules/couplet-business/src/main/java/com/couplet/business/server/time/Timer.java
View File

@ -3,6 +3,7 @@ package com.couplet.business.server.time;
import com.couplet.business.server.service.VehicleService;
import com.couplet.common.domain.Vehicle;
import com.couplet.common.domain.request.VehicleListParams;
import com.couplet.common.redis.service.RedisService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
@ -28,44 +29,32 @@ public class Timer {
private VehicleService vehicleService;
@Scheduled(cron = "0/1 * * * * *")
public void aa() {
System.out.println("********************************************************");
}
//判断车辆是否下线
@Scheduled(cron = "0/1 * * * * *")
public void downLine() {
@Scheduled(cron = "* * * * * *")
public void outLine() {
log.info("定时器启动");
//先查询车辆列表
List<Vehicle> list = vehicleService.list(new VehicleListParams(null, null, null, null));
for (Vehicle vehicle : list) {
//只针对已经上线的车辆
if (redis.hasKey(vehicle.getVin())) {
//如果vin的缓存 时间还剩一秒，则判断为已经下线
if (redis.getExpire(vehicle.getVin()) <= 3) {
log.info(vehicle.getVin() + "的车辆已经下线");
list.forEach(vehicle -> {
try {
//只针对已经上线的车辆
if (redis.hasKey(vehicle.getVin())) {
//执行修改下线状态的方法
Integer i = vehicleService.onOrOutLineByVIN(vehicle.getVin(), 0);
//如果vin的缓存 时间还剩一秒，则判断为已经下线
if (redis.getExpire(vehicle.getVin()) <= 3) {
log.info(vehicle.getVin() + "的车辆已经下线");
// if (0 == 1) {
// log.error("下线状态修改失败");
// }
//执行修改下线状态的方法
Integer i = vehicleService.onOrOutLineByVIN(vehicle.getVin(), 0);
if (0 == i) {
log.error("下线状态修改失败");
} else {
log.info("下线状态修改成功");
}
}
log.info("下线状态修改成功");
}
} catch (Exception e) {
log.error(e.getMessage());
}
});
}
}

1
couplet-modules/couplet-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 100644
View File

@ -0,0 +1 @@
com.couplet.business.server.time.Timer

2
couplet-modules/couplet-business/src/main/resources/bootstrap.yml
View File

@ -16,11 +16,9 @@ spring:
discovery:
# 服务注册地址
server-addr: 121.89.211.230:8848
namespace: 172469
config:
# 配置中心地址
server-addr: 121.89.211.230:8848
namespace: 172469
# 配置文件格式
file-extension: yml
# 共享配置

36
couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/config/RabbitMQConfig.java
View File

@ -27,18 +27,15 @@ public class RabbitMQConfig implements RabbitTemplate.ConfirmCallback, RabbitTem
@Value("queueName")
public String queueName;
//队列名
public static final String finByVinQueueName = "finByVinQueueName";
public static final String FENCE_QUEUE = "fenceQueue";
public static final String vehicleQueue = "vehicleQueue";
public static final String finByVinQueueName="finByVinQueueName";
public static final String FENCE_QUEUE ="fenceQueue";
//交换机
public static final String VinExchangeName = "vinExchangeName";
public static final String FENCE_EXCHANGE = "fenceExchange";
public static final String vehicleQueueExchange = "vehicleQueueExchange";
public static final String VinExchangeName="vinExchangeName";
public static final String FENCE_EXCHANGE="fenceExchange";
//路由键
public static final String VinRoutingKey = "vinRoutingKey";
public static final String FENCE_ROUTINGKEY = "fenceRoutingKey";
public static final String VehicleQueue_ROUTINGKEY = "VehicleQueueRoutingKey";
public static final String VinRoutingKey="vinRoutingKey";
public static final String FENCE_ROUTINGKEY="fenceRoutingKey";
//队列名
@ -77,23 +74,15 @@ public class RabbitMQConfig implements RabbitTemplate.ConfirmCallback, RabbitTem
public Queue queue() {
return new Queue(queueName, true);
}
@Bean("fenceQueue")
public Queue queue2() {
return new Queue(FENCE_QUEUE, true);
}
@Bean("finByVinQueueName")
public Queue finByVinQueueName() {
return new Queue(finByVinQueueName, true);
}
//当增删改车辆的时候，发送当前车辆的id到"vehicleQueue"队列
@Bean("vehicleQueue")
public Queue vehicleQueue() {
return new Queue("vehicleQueue", true);
}
/*
* @Author: LiuYunHu
* @Date: 2024/3/29 21:26
@ -111,16 +100,11 @@ public class RabbitMQConfig implements RabbitTemplate.ConfirmCallback, RabbitTem
return new DirectExchange(FENCE_EXCHANGE);
}
@Bean("vinExchangeName")
@Bean("vinExchangeName")
public DirectExchange vinExchangeName() {
return new DirectExchange(VinExchangeName);
}
@Bean("vehicleQueueExchange")
public DirectExchange vehicleQueueExchange() {
return new DirectExchange("vehicleQueueExchange");
}
/*
* @Author: LiuYunHu
@ -168,17 +152,11 @@ public class RabbitMQConfig implements RabbitTemplate.ConfirmCallback, RabbitTem
public Binding binding2() {
return BindingBuilder.bind(queue2()).to(directExchange2()).with(FENCE_ROUTINGKEY);
}
@Bean("vinRoutingKey")
public Binding binding3() {
return BindingBuilder.bind(finByVinQueueName()).to(vinExchangeName()).with(VinRoutingKey);
}
@Bean("VehicleQueueRoutingKey")
public Binding binding4() {
return BindingBuilder.bind(vehicleQueue()).to(vehicleQueueExchange()).with(VehicleQueue_ROUTINGKEY);
}
/*
* @Author: LiuYunHu
* @Date: 2024/3/29 21:28

9
couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/controller/MqController.java
View File

@ -90,13 +90,4 @@ public class MqController {
}, new CorrelationData(IdUtils.randomUUID())
);
}
@GetMapping("/vehicleQueue/{msg}")
public void vehicleQueue(@PathVariable("msg") String msg){
rabbitTemplate.convertAndSend(RabbitMQConfig.vehicleQueueExchange, RabbitMQConfig.VehicleQueue_ROUTINGKEY, msg, message -> {
message.getMessageProperties().setMessageId(IdUtils.randomUUID());
return message;
}, new CorrelationData(IdUtils.randomUUID())
);
}
}

5
couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/remote/RemoteFenceService.java
View File

@ -4,8 +4,6 @@ import com.couplet.common.core.constant.ServiceNameConstants;
import com.couplet.common.domain.request.FenceUpdateRequest;
import com.couplet.mq.remote.factory.RemoteFenceFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -18,7 +16,4 @@ public interface RemoteFenceService {
@PostMapping("/mq/fenceQueue")
public void fenceQueue(@RequestBody FenceUpdateRequest teRequest);
@GetMapping("/mq/vehicleQueue/{msg}")
public void vehicleQueue(@PathVariable("msg") String msg);
}

5
couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/remote/factory/RemoteFenceFallbackFactory.java
View File

@ -25,11 +25,6 @@ public class RemoteFenceFallbackFactory implements FallbackFactory<RemoteFenceSe
public void fenceQueue(FenceUpdateRequest fenceUpdateRequest) {
error("调用失败...."+cause.getMessage());
}
@Override
public void vehicleQueue(String msg) {
log.error("调取失败："+cause.getMessage());
}
};
}
}

7
couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java
View File

@ -1,7 +1,6 @@
package com.couplet.online.utils;
import com.couplet.common.domain.Vehicle;
import com.couplet.common.redis.service.RedisService;
import com.couplet.remote.RemoteVehicleService;
import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.producer.KafkaProducer;
@ -73,7 +72,7 @@ public class MqttMonitor {
//redis
@Autowired
private RedisService redis;
private StringRedisTemplate redis;
//Kafka生产者配置
@ -188,7 +187,7 @@ public class MqttMonitor {
//如果不存在这个车
if (0 == vehicles.size() || null == vehicles) {
if (0 == vehicles.size()) {
//将不属于自己系统的车辆存入缓存，便于提前进行拒绝提示
// redis.setCacheObject("不存在的车辆VIN" + start17, start17);
log.error("未找到vin码为" + start17 + "的车辆信息");
@ -198,7 +197,7 @@ public class MqttMonitor {
log.info("远程调用查询到的车辆数据：" + vehicle);
//上线车辆存入redis 6秒 用于判断车辆是否下线，还要写定时器，定时查询
redis.setCacheObject(start17, start17, 6L, TimeUnit.SECONDS);
redis.opsForValue().set(start17, start17, 6L, TimeUnit.SECONDS);
log.info("vin码为" + start17 + "的车辆属于本系统，允许上线！");

2
couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
View File

@ -36,7 +36,7 @@ mqtt:
# broker: mqtt://115.159.47.13:1883
username:
password:
clientId: fluxMq
clientId: fluxmq
qos: 0
topic: test