Commit Graph

169 Commits (dev)

Author SHA1 Message Date
微醺 0737d44efa 1.feat(): 添加:
2.fix(): 修复了: 添加

更新时间10121143
2024-10-12 12:06:32 +08:00
微醺 7f257959ca Merge remote-tracking branch 'origin/dev.entBusiness' into dev
# Conflicts:
#	cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/PrimaryKeyBasic.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarManageController.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java
#	cloud-modules/cloud-modules-event-process/src/main/java/com/muyu/event/process/consumer/GoOnlineConsumer.java
2024-10-12 11:53:00 +08:00
微醺 e559fbe869 1.feat(): 添加:
2.fix(): 修复了: 添加

更新时间10121143
2024-10-12 11:45:38 +08:00
微醺 bc56698b2f 1.feat(): 添加:三个入口
2.fix(): 修复了:

更新时间10121143
2024-10-12 11:43:48 +08:00
LQS 7c67737481 Merge remote-tracking branch 'origin/dev.analysis' into dev 2024-10-12 11:13:58 +08:00
LQS 1631a7cae8 feat():修复MQTT连接,接收rabbitMq数据消费,拿到数据解析投递kafka 2024-10-12 11:09:14 +08:00
xinzirun 91cb9ab991 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
2024-10-12 10:02:42 +08:00
xinzirun 874a32c41d fix(): 修改企业缓存文件未扫描问题 2024-10-12 10:02:09 +08:00
微醺 0da0c960a6 1.feat(): 添加:三个入口
2.fix(): 修复了:

更新时间10120946
2024-10-12 09:46:11 +08:00
xinzirun 407d4ec270 feat(): 添加打包配置 2024-10-12 09:31:31 +08:00
微醺 38ff70f541 1.feat(): 添加:
2.fix(): 修复了:

更新时间10112206
2024-10-11 22:06:20 +08:00
liuyibo a63d614a23 feat():合并车辆网管 2024-10-11 22:01:16 +08:00
LQS 15bcd34b07 feat():修复MQTT连接,接收rabbitMq数据消费,拿到数据解析投递kafka 2024-10-11 21:56:22 +08:00
crj e068c9abe2 fix():解决冲突 2024-10-11 20:50:49 +08:00
liuyibo 1f9b832c38 feat():添加发送mq到协议解析功能 2024-10-11 14:35:39 +08:00
LQS 2bd123b42c feat():提交合并之后代码 2024-10-10 14:37:03 +08:00
LQS 0d48eb2e34 feat():解析模块的日志记录 2024-10-10 12:28:38 +08:00
微醺 4ca2fd7e7e 1.feat(): 添加:
a.添加了自定义的一个预警类
b.添加了远调的代码,连同熔断
2.fix(): 修复了:
a.修改了redis在列表通过vin码存储
b.修改了redis的存储类型
c.优化了一些代码

更新时间10081949
2024-10-10 11:22:59 +08:00
liuyibo 80b68c2df7 build():优化车辆连接代码 2024-10-10 11:15:49 +08:00
LQS f0f6cf006f feat():修改缓存实现类结构,
手动测试添加redis缓存数据(
CarMessageValueCacheService报文数据=》key(报文模版id(templateId)),value(查询到的数据集合List);
CarVehicleCacheService车辆信息=》key(VehicleVin车辆VIN码),value(Vehicle车辆实体类数据);
CarVehicleTypeCacheService车辆类型=》key(VehicleTypeId车辆类型ID),value(查询到的集合List)
)。
之后连接MQTT接收到车辆模拟传过来的数据--》查询redis--》解析数据--》传递kafka
2024-10-09 16:19:28 +08:00
微醺 4f52c6c4ac 1.feat(): 添加:
a.添加了自定义的一个预警类
b.添加了远调的代码,连同熔断
2.fix(): 修复了:
a.修改了redis在列表通过vin码存储
b.修改了redis的存储类型
c.优化了一些代码

更新时间10081949
2024-10-08 20:22:35 +08:00
微醺 0534db9f37 Merge branch 'dev.entBusiness' into dev
# Conflicts:
#	cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarFaultCacheService.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/CarWarnCacheService.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/CloudEnterpriseApplication.java
#	pom.xml
2024-10-08 20:15:16 +08:00
微醺 4c6ce87e8c 1.feat(): 添加:
a.添加了自定义的一个预警类
b.添加了远调的代码,连同熔断
2.fix(): 修复了:
a.修改了redis在列表通过vin码存储
b.修改了redis的存储类型
c.优化了一些代码

更新时间10081949
2024-10-08 20:00:14 +08:00
LQS ff31f5abc9 feat():解析模块远调注入使用 2024-10-08 16:51:31 +08:00
xinzirun 7207dcc01c fix(): 修改nacos命名空间 2024-10-08 00:22:14 +08:00
xinzirun b74b18a615 fix(): 修复监听日志 2024-10-07 22:48:16 +08:00
LQS ec41019824 fix(): 解决企业缓存编译错误问题 2024-10-07 22:14:46 +08:00
LQS b491045ebf feat(): 新增企业远程调用模块,重构远程调用代码 2024-10-07 21:58:01 +08:00
LQS 580172aa76 Merge remote-tracking branch 'origin/dev.analysis' into dev
# Conflicts:
#	cloud-common/pom.xml
2024-10-07 20:33:09 +08:00
LQS 3202af6ebb feat(): 完善mqtt的投递 2024-10-07 20:30:44 +08:00
crj c08a1376d6 fix():整理代码格式 2024-10-07 20:14:44 +08:00
crj 9bb39ec32a fix():解决故障规则报错 2024-10-07 20:12:05 +08:00
crj 6e0ed3b883 Merge remote-tracking branch 'origin/dev.entOperation' into dev
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultRuleController.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultRuleService.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultRuleServiceImpl.java
#	cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/banner.txt
2024-10-07 20:09:21 +08:00
crj 94d04e3a35 feat():解决冲突 2024-10-07 20:00:27 +08:00
xinzirun a9bfdc1670 Merge remote-tracking branch 'origin/dev' into dev 2024-10-07 19:48:57 +08:00
xinzirun 111129e777 fix(): 修复故障规则 2024-10-07 19:48:11 +08:00
微醺 0bafed3671 1.feat(): 添加:
2.fix(): 修复了: 之前添加的封装的缓存

更新时间10071938
2024-10-07 19:43:07 +08:00
微醺 0db37dc190 Merge branch 'dev.entBusiness' into dev
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
2024-10-07 19:40:07 +08:00
微醺 293e58809c 1.feat(): 添加:
2.fix(): 修复了: 之前添加的封装的缓存

更新时间10071938
2024-10-07 19:38:31 +08:00
xinzirun 22e068cfc5 Merge branch 'dev' of https://gitea.qinmian.online/six-vehicle/cloud-server into dev 2024-10-07 19:31:57 +08:00
xinzirun 9f0f373594 fix(): 处理事件监听器执行异常问题 2024-10-07 19:31:18 +08:00
crj a2f2d2ec52 fix():故障规则重构 2024-10-07 19:31:18 +08:00
xinzirun 26c0d3d4c8 fix(): 优化上下线监听 2024-10-07 19:31:18 +08:00
xinzirun 7fa71097fd fix(): 解决配置冲突问题 2024-10-07 19:31:18 +08:00
liuyibo e018d60115 build():添加车辆连接获取车辆信息存入数据库中,发送rabbitmq消息队列 2024-10-07 19:31:17 +08:00
xinzirun 20977536e3 fix(): 处理事件监听器执行异常问题 2024-10-07 19:29:12 +08:00
crj 222b2ad30f fix():故障规则重构 2024-10-07 18:53:10 +08:00
微醺 c0a9b1a1dd 1.feat(): 添加: swagger文档
2.fix(): 修复了: 企业表的实体类

更新时间09301928
2024-10-07 14:25:10 +08:00
xinzirun eef7d19aeb fix(): 优化上下线监听 2024-10-07 13:55:46 +08:00
xinzirun 19f67a389c fix(): 解决配置冲突问题 2024-10-07 09:45:59 +08:00