Commit Graph

160 Commits (91cb9ab9915666050ccefe51ad227c2fab180bba)

Author SHA1 Message Date
crj 1131fbe0f1 Merge remote-tracking branch 'origin/dev.fault' into dev
# Conflicts:
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysEntServiceImpl.java
2024-09-28 16:49:27 +08:00
crj 2d25fd9a04 feax:()修改代码规范(注释) 2024-09-28 16:36:58 +08:00
LQS d054119692 fate():修改模块 2024-09-28 16:30:58 +08:00
crj af712e3937 feax:()修改代码规范(注释) 2024-09-28 15:33:46 +08:00
crj 97ab01bd2a feax:()修改代码规范(注释) 2024-09-28 15:28:08 +08:00
chenruijia 40d0dde1f9 feax:()修改代码规范(注释,swagger文档) 2024-09-28 14:58:20 +08:00
15285 2c3197fac9 feax:()修改代码规范(注释,swagger文档) 2024-09-28 12:30:55 +08:00
liuyibo e9a19e94e9 连接MQTT,接收车辆的数据 2024-09-28 12:28:19 +08:00
15285 06815c8552 feax:()解决项目架构修改后的冲突 2024-09-27 22:39:14 +08:00
xinzirun 49d6651df2 fix(): 修改nacos命名空间 2024-09-27 22:02:44 +08:00
xinzirun ec676ca227 feat(): 企业注册功能 2024-09-27 21:25:40 +08:00
xinzirun 411a454c1b fix(): 修复项目 2024-09-27 17:17:49 +08:00
DongZeLiang b0672dbd60 fix(): 修改项目架构 2024-09-27 16:04:00 +08:00
xinzirun 2fc56d44c9 Merge remote-tracking branch 'origin/dev.saas' into dev 2024-09-26 19:22:22 +08:00
xinzirun 0febb2cb21 feat(): 企业增删改功能 2024-09-26 19:21:39 +08:00
xinzirun 5012e3c895 fix(): 企业查询修复 2024-09-26 11:51:21 +08:00
xinzirun de23d2e383 Merge remote-tracking branch 'origin/dev.saas' into dev 2024-09-26 10:23:39 +08:00
xinzirun 0b297a028f feat:()添加企业管理文件 2024-09-26 10:21:37 +08:00
15285 f19b18d273 fix(): 解决代码冲突 2024-09-26 10:17:53 +08:00
15285 aa1d518628 Merge remote-tracking branch 'origin/dev.fault' into dev 2024-09-26 10:13:34 +08:00
15285 c9d25d1ebc 故障类型的编写 2024-09-26 10:06:30 +08:00
xinzirun 63cbc37084 Merge remote-tracking branch 'origin/dev.saas' into dev 2024-09-25 20:59:34 +08:00
xinzirun c123bb91c4 fix(): 修复项目冲突、异常、Bug 2024-09-25 20:59:08 +08:00
xinzirun 4476a8c1ae Merge remote-tracking branch 'origin/dev.saas' into dev 2024-09-25 20:55:27 +08:00
xinzirun a2f0c48e98 fix(): 修复项目冲突、异常、Bug 2024-09-25 20:54:56 +08:00
xinzirun 94e0bef9ab Merge remote-tracking branch 'origin/dev.saas' into dev 2024-09-25 20:51:20 +08:00
xinzirun 1f7202c496 fix(): 修复项目冲突、异常、Bug 2024-09-25 20:51:01 +08:00
xinzirun c101b474da fix(): 修复项目冲突、异常、Bug 2024-09-25 20:50:18 +08:00
xinzirun 9d3e62e0c2 Merge remote-tracking branch 'origin/dev.saas' into dev
# Conflicts:
#	cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
2024-09-25 20:48:17 +08:00
15285 5cd6840e2a 故障类型的编写 2024-09-25 20:32:18 +08:00
xinzirun 82d99ce0f2 fix(): 修复项目冲突、异常、Bug 2024-09-25 20:31:49 +08:00
xinzirun 4b19cb276a fix(): 修复项目冲突、异常、Bug 2024-09-25 10:07:48 +08:00
xinzirun b229f21145 fix(): 修复项目冲突、异常、Bug 2024-09-24 20:37:01 +08:00
15285 2ed82cdd80 故障类型的编写 2024-09-24 15:27:49 +08:00
xinzirun e9cefd3eb8 fix(): 修复项目冲突、异常、Bug 2024-09-24 15:08:55 +08:00
15285 c8cd62c1be 规则的编写 2024-09-24 14:49:04 +08:00
xinzirun 9f40bbaaf6 fix(): 修复bug 2024-09-24 14:47:01 +08:00
15285 ecf2c96c80 feat:{站内信的编写} 2024-09-23 21:03:36 +08:00
微醺 dd30d17c40 1.报文管理
2.模块管理
更新时间09231131
2024-09-23 11:31:58 +08:00
xinzirun 68f94b0f26 fix(): 修复依赖冲突问题 2024-09-23 11:28:34 +08:00
xinzirun c470ef9787 Merge branch 'master' of https://gitea.qinmian.online/six-vehicle/cloud-server 2024-09-23 11:25:41 +08:00
liuyibo 50a58d2470 Merge remote-tracking branch 'origin/master'
# 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-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
2024-09-23 11:17:34 +08:00
liuyibo 17c891ff02 feat():车辆预警策略列表,规则列表,通过策略id查询规则,通过策略表的报文id查询报文 2024-09-23 10:15:46 +08:00
xinzirun 934367b1ea fix(): 修复请求头校验 2024-09-23 08:55:52 +08:00
15285 882819a6e0 feat:{信息的状态判断,规则的添加} 2024-09-22 20:36:53 +08:00
15285 9e6ca8a8ff 站内信 2024-09-22 16:56:32 +08:00
15285 2ad4794e78 故障日志 2024-09-22 10:24:55 +08:00
xinzirun b5757fdead feat(): 新增鉴权Saas标识校验 2024-09-22 10:08:22 +08:00
xinzirun 7c49fee992 fix(): 修复命名空间冲突问题 2024-09-22 10:07:14 +08:00
xinzirun 0b97b1e2ed fix(): 修复空指针异常问题 2024-09-22 10:06:44 +08:00