Commit Graph

54 Commits (13a67257fcb537e04d2fb7e8646706369d584458)

Author SHA1 Message Date
袁子龙 13a67257fc Merge branch 'dev' of https://gitea.qinmian.online/group-four/cloud-car into dev 2024-10-10 22:24:42 +08:00
袁子龙 55ed020ac7 test:()去除无用的对象 2024-10-10 22:24:21 +08:00
袁子龙 cedad4d7b9 test:()去除重复的企业对象 2024-10-10 22:24:21 +08:00
袁子龙 c8f912393d test:()修改企业对象 2024-10-10 22:24:21 +08:00
Number7 2308d974be fix():数据预警编写修改 2024-10-10 19:53:34 +08:00
Number7 2e940349ef Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev
# Conflicts:
#	cloud-auth/src/main/resources/bootstrap.yml
#	cloud-gateway/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-event/src/main/java/com/muyu/event/consumer/MessageConsumer.java
#	cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-vehiclegateway/src/main/resources/bootstrap.yml
#	cloud-modules/saas/saas-server/src/main/java/com/muyu/server/SaasApplication.java
#	cloud-modules/saas/saas-server/src/main/resources/bootstrap.yml
2024-10-10 09:28:44 +08:00
Number7 cf286d48f9 feat():新增数据预警 2024-10-10 09:26:52 +08:00
袁子龙 efa6861d2f test:()修改企业添加 2024-10-08 11:31:17 +08:00
刘武 0ebf046e25 fix(): 代码合并 2024-10-08 10:05:09 +08:00
刘武 97994a0452 fix(): 代码合并 2024-10-07 22:38:09 +08:00
刘武 c90845d508 Merge remote-tracking branch 'origin/dev.event' into dev
# Conflicts:
#	cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/producer/RabbitMQProducerUtil.java
#	cloud-common/cloud-common-rabbit/src/main/java/com/muyu/rabbitmq/consumer/RabbitMQConsumerUtil.java
#	cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateController.java
2024-10-07 21:31:48 +08:00
刘武 c1f24c8d03 Merge remote-tracking branch 'origin/dev.business' into dev
# Conflicts:
#	cloud-common/cloud-common-kafka/pom.xml
#	cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java
#	cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarController.java
2024-10-07 20:52:29 +08:00
袁子龙 abf186e99c test:()修改企业添加 2024-10-07 19:41:03 +08:00
刘武 9499d9738e fix(): 事件基础 2024-10-07 12:06:18 +08:00
袁子龙 b9c4334cb5 style:()删除无用的测试类 2024-10-06 14:35:47 +08:00
刘武 87d104cf9b fix(): 事件基础修改 2024-10-06 10:39:59 +08:00
袁子龙 a63bde6c84 fix:()kafka读取不到的问题 2024-10-06 10:09:48 +08:00
袁子龙 e2fc097b14 test():企业入驻时创库创表修改 2024-10-04 20:59:21 +08:00
Number7 30782882c3 Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev 2024-10-04 16:58:38 +08:00
Number7 8c90364eaa feat():修改协议解析方法 2024-10-04 16:57:45 +08:00
袁子龙 dc26138929 Merge remote-tracking branch 'origin/dev.business' into dev 2024-10-04 16:55:24 +08:00
袁子龙 4399609c9e test():企业入驻时创库创表修改 2024-10-04 16:54:37 +08:00
86191 89825669dc Merge remote-tracking branch 'origin/dev.operation' into dev 2024-10-02 16:44:44 +08:00
86191 f56a0e8b7f fix():把saas缓存对象换成缓存列表 2024-10-02 16:44:00 +08:00
袁子龙 709878fbab Merge branch 'dev.business' into dev 2024-10-02 16:33:16 +08:00
86191 6dd3d73f62 fix():把saas缓存对象换成缓存列表 2024-10-02 16:23:41 +08:00
袁子龙 3393804735 fix:修复企业入驻接口调用失败问题 2024-10-02 14:12:47 +08:00
86191 b5a2687491 Merge remote-tracking branch 'origin/dev.operation' into dev
# Conflicts:
#	cloud-auth/src/main/resources/bootstrap.yml
#	cloud-gateway/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-event/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/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java
#	cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java
#	cloud-modules/saas/saas-server/src/main/resources/bootstrap.yml
2024-10-02 10:35:35 +08:00
86191 370a91773e feat():缓存各个模块对象 2024-10-02 10:33:14 +08:00
袁子龙 5589803de6 feat:新增企业入驻新增数据库 2024-10-02 10:29:40 +08:00
Number7 708214b86e Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev 2024-10-02 10:05:02 +08:00
袁子龙 4adb06459e feat:新增kafka模块依赖 2024-09-30 18:09:05 +08:00
Number7 a13ba8199a fix():修改协议解析方法 2024-09-30 17:00:05 +08:00
袁子龙 fe90a341ff Merge remote-tracking branch 'origin/dev.business' into dev 2024-09-30 16:48:27 +08:00
袁子龙 b879a1768d feat:新增企业入驻 2024-09-30 16:36:35 +08:00
刘武 370fdd9fd5 Merge branch 'dev' of https://gitea.qinmian.online/group-four/cloud-car into dev
# Conflicts:
#	cloud-common/pom.xml
2024-09-30 16:35:35 +08:00
刘武 f46db057b5 fix(): 事件基础修改,kafka注入 2024-09-30 16:34:37 +08:00
袁子龙 d6ff8ad340 feat:新增企业入驻服务校验 2024-09-30 12:19:21 +08:00
袁子龙 8bc54f4662 feat:新增企业对象 2024-09-30 12:12:52 +08:00
袁子龙 e6639bc7f9 feat:新增长度限制 2024-09-30 11:37:41 +08:00
袁子龙 f93af8b4a6 Merge remote-tracking branch 'origin/dev.business' into dev
# Conflicts:
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/CarType.java
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/DataType.java
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplate.java
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplateType.java
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCar.java
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarLog.java
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/Template.java
#	cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/MqttConfigure.java
#	cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java
2024-09-30 11:00:49 +08:00
袁子龙 1272d0e0b7 refactor:修改注释 2024-09-30 10:59:09 +08:00
86191 a6521e46c9 feat():围栏和故障的缓存 2024-09-30 09:26:57 +08:00
86191 83ab8a27a7 feat():围栏和故障的缓存 2024-09-30 09:26:07 +08:00
86191 bc3053d834 feat():围栏和故障的缓存 2024-09-30 09:25:37 +08:00
86191 4ecdbe3881 feat():围栏和故障的缓存 2024-09-30 09:24:09 +08:00
86191 d586c26468 Merge branch 'master' of https://gitea.qinmian.online/group-four/cloud-car
# Conflicts:
#	cloud-common/pom.xml
2024-09-30 09:23:34 +08:00
86191 7b36e4b359 feat():围栏和故障的缓存 2024-09-30 09:22:46 +08:00
刘武 cc99d65102 fix(): 事件基础修改,kafka注入 2024-09-30 09:17:02 +08:00
袁子龙 29cb1ffadb refactor:修改注释 2024-09-29 22:03:51 +08:00