Commit Graph

40 Commits (628b8d1fab737d1654bb7e5ae68e37ef5b3d21dc)

Author SHA1 Message Date
张腾 e986ab4a17 Merge branch 'dev' into dev.carData
# Conflicts:
#	cloud-modules/cloud-Saas-Service/pom.xml
#	cloud-modules/cloud-modules-carData/src/main/java/com/muyu/carData/consumer/CarOnlineConsumer.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/pom.xml
2024-10-09 14:28:40 +08:00
WeiRan 2a85b2bb67 Merge remote-tracking branch 'origin/dev' into dev 2024-10-09 14:22:16 +08:00
WeiRan e172137feb Merge branch 'dev.wei' into dev 2024-10-09 14:20:08 +08:00
WeiRan 82a7117e22 fix():修改路径冲突导致的报错 2024-10-09 14:19:39 +08:00
Yueng b2a2a2bcb7 Merge branch 'dev' of https://gitea.qinmian.online/a_bazu/cloud-server-8 into dev
# Conflicts:
#	cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/gateway/service/impl/VehicleInformationServiceImpl.java
#	cloud-modules/cloud-modules-car-gateway/src/main/java/com/muyu/car/instance/GenerateInstance.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmPermissionServiceImpl.java
2024-10-09 14:00:59 +08:00
Yueng f7143fede7 find()更新缓存 2024-10-09 13:57:18 +08:00
WeiRan 2e7169d5ed Merge branch 'dev.wei' into dev 2024-10-08 22:41:35 +08:00
WeiRan 3e73a8598a feat():完善企业权限分配功能 2024-10-08 22:40:43 +08:00
Yueng 36c1f661b6 find()故障规则创建时查询列表添加新的缓存 2024-10-08 19:05:12 +08:00
张腾 c42adb48cc 优化车辆上线时的故障码缓存逻辑
- 修改CarOnlineConsumer类,实现车辆上线时从VehicleCacheFaultCodeAddService获取故障码缓存并存入本地缓存
- 新增IdentifyingFailuresListener类,用于监听ES保存事件,根据车辆VIN查询并处理故障码
- 调整IotDBController类,注释掉未使用的批量插入记录方法
- 更新相关依赖配置,引入cloud-modules-enterprise-cache等依赖
2024-10-08 11:54:54 +08:00
Yueng 54f0aee961 Merge remote-tracking branch 'origin/dev.yang' into dev
# Conflicts:
#	cloud-auth/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
2024-10-08 01:45:18 +08:00
Yueng 015d7c0896 fine()添加故障缓存 2024-10-08 01:42:44 +08:00
WeiRan 748d4be165 Merge branch 'dev.wei' into dev 2024-10-07 23:48:17 +08:00
WeiRan df1c9ad9e8 feat():修改企业入驻 2024-10-07 23:44:14 +08:00
yuan 4ae60743fa Merge branch 'refs/heads/dev.cargateway' into dev
# Conflicts:
#	cloud-auth/src/main/resources/bootstrap.yml
#	cloud-gateway/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
#	cloud-modules/pom.xml
#	cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
2024-10-07 22:38:04 +08:00
Aaaaaaaa 9486710ae8 美化代码和注释
删除了 CarMessageServiceImpl 中未使用的 RedisTemplate 注释。
2024-10-07 21:54:32 +08:00
WeiRan 7063af945e feat():完成saas切换登录切换数据源 2024-10-06 20:17:45 +08:00
Yueng bb56bc2393 fine()添加故障缓存 2024-10-06 19:02:37 +08:00
Yueng 6e4b268730 fine()添加车辆缓存 2024-10-06 10:57:31 +08:00
yuan 43c74b9978 feat():redis存储创建的实例信息 2024-10-04 14:28:38 +08:00
Aaaaaaaa 217ffd81ab Merge branch 'master' into xxy 2024-10-02 10:00:30 +08:00
Aaaaaaaa 057ad3ded5 Merge branch 'master' into xxy 2024-10-02 09:31:55 +08:00
Aaaaaaaa 735e7f56e0 协议解析:完成解析方法实现kafka的投产,并拆入自己的模块 2024-09-30 20:58:08 +08:00
Aaaaaaaa 0d82041676 Merge branch 'xxy' into dev 2024-09-30 10:12:22 +08:00
Aaaaaaaa 7a88f1da14 修改报错 2024-09-30 10:11:40 +08:00
WeiRan 4aebd67ebc 更新 2024-09-29 22:46:04 +08:00
WeiRan 207125c795 Merge branch 'master' of https://gitea.qinmian.online/a_bazu/cloud-server-8 into dev
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java
2024-09-29 22:23:10 +08:00
WeiRan 3bf6f0d929 更新 2024-09-29 22:18:34 +08:00
Yueng f07d95abeb fine()代码修改 2024-09-29 22:17:00 +08:00
WeiRan f27b14dc33 更新 2024-09-29 17:51:53 +08:00
Yueng aedee04643 fine()配置类提交 2024-09-29 17:16:32 +08:00
WeiRan 1627aa3dab 修改bug 2024-09-29 16:53:08 +08:00
WeiRan 8d7ad9cdb9 修改pom配置 2024-09-29 10:19:55 +08:00
Yueng 13bb25f4da fine()配置类提交 2024-09-29 10:14:43 +08:00
Yueng 5688271d2c fine()修改mybatis plus 2024-09-29 00:10:46 +08:00
WeiRan 83312b8e37 修改代码,mybatis->mybatis-plus 2024-09-28 22:33:22 +08:00
WeiRan fa36d029af 所有注释补全 2024-09-28 19:28:54 +08:00
WeiRan 07a60444aa 所有注释补全 2024-09-28 17:41:48 +08:00
Yueng 60b63b758e fine()修改mybatis plus 2024-09-28 17:35:25 +08:00
Yueng ac21236123 fine()sass模块初始化 2024-09-28 12:28:53 +08:00