Commit Graph

73 Commits (b5a268749148e39978f0118ed517bad9016d1997)

Author SHA1 Message Date
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
Number7 708214b86e Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev 2024-10-02 10:05:02 +08:00
Number7 c79a39f54e fix():修改协议解析方法 2024-10-02 10:03:36 +08:00
86191 476d6ae0b7 feat():围栏和故障的缓存 2024-09-30 18:45:08 +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
袁子龙 d99edc16d1 feat:新增企业入驻 2024-09-30 16:47:31 +08:00
袁子龙 50a655d888 feat:新增企业入驻 2024-09-30 16:46:34 +08:00
Number7 e8bc92c658 Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev 2024-09-30 16:38:01 +08:00
Number7 76440e1c98 feat():增加协议解析模块 2024-09-30 16:37:24 +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
Number7 82ec79ccaf fix():修改报文基础类型方法 2024-09-30 15:47:20 +08:00
Number7 551f5f5496 Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev
# Conflicts:
#	cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java
2024-09-30 15:28:30 +08:00
Number7 8e0e492555 fix():修改报文基础类型方法 2024-09-30 15:27:28 +08:00
Number7 6545fc79ef feat():增加添加报文模版功能 2024-09-30 14:40:07 +08:00
袁子龙 78747b7d03 feat:新增企业入驻接口 2024-09-30 12:23:56 +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
袁子龙 a0ddc45e67 feat:企业入驻 2024-09-30 11:31:52 +08:00
袁子龙 051fe490d6 feat:企业入驻 2024-09-30 11:31:41 +08:00
袁子龙 31df6d32db feat:企业入驻 2024-09-30 11:31:07 +08:00
袁子龙 798f509dec feat:企业登录 2024-09-30 11:17:20 +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 7149ea8f1c Merge remote-tracking branch 'origin/dev' into dev.operation 2024-09-30 10:32:54 +08:00
Number7 1f072d4ca2 fix():修改报文接口字段问题 2024-09-30 10:29:58 +08:00
SuiXxx 8de7f88912 Merge remote-tracking branch 'origin/dev.vehiclegateway' into dev 2024-09-30 09:29:07 +08:00
SuiXxx ddf4ede829 feat():查询ESC信息 2024-09-30 09:28:12 +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 d38d77b331 Merge branch 'dev' of https://gitea.qinmian.online/group-four/cloud-car into dev 2024-09-30 09:25:55 +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
袁子龙 2488248967 refactor:修改注释 2024-09-29 16:12:34 +08:00
袁子龙 dea0f07c90 refactor:修改注释 2024-09-29 16:03:17 +08:00
SuiXxx 7d7950e925 Merge branch 'dev' of https://gitea.qinmian.online/group-four/cloud-car into dev 2024-09-29 16:03:03 +08:00
SuiXxx e3f65e7f1e Merge remote-tracking branch 'origin/dev.vehiclegateway' into dev 2024-09-29 16:01:31 +08:00
SuiXxx f4faf4d828 feat():开启关闭ESC 2024-09-29 15:38:08 +08:00
SuiXxx a0994c3e7a feat():开启关闭ESC 2024-09-29 15:36:30 +08:00
Number7 0228051467 Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev 2024-09-29 15:12:21 +08:00
Number7 dfacea67f6 修改实体类规范 2024-09-29 15:11:57 +08:00
袁子龙 688154709d refactor:修改注释 2024-09-29 14:51:02 +08:00