Commit Graph

77 Commits (3202af6ebbc3e9d7012a44c05cc6871a8a8a08eb)

Author SHA1 Message Date
LQS 3202af6ebb feat(): 完善mqtt的投递 2024-10-07 20:30:44 +08:00
LQS 514c94b398 feat():修改日志打印方式 2024-09-29 17:45:01 +08:00
LQS 7e02675028 feat(新增kafka、redis常量类):完善MQTT接收之后解析报文传递kafka 2024-09-29 17:32:46 +08:00
LQS e2d710fbb6 Merge remote-tracking branch 'origin/dev.vehicles' into dev 2024-09-29 12:17:44 +08:00
LQS 9f01b76182 feat():移除废模块包 2024-09-29 12:15:41 +08:00
LQS fedc3c4ea7 feat():添加依赖注释 2024-09-29 12:10:28 +08:00
LQS a18ba509d8 fix():修复依赖注入问题 2024-09-29 11:18:39 +08:00
LQS 5979dbea8f fix():修复远调降级处理影响启动类无法运行问题 2024-09-29 11:10:37 +08:00
LQS 1378aeeb06 fate():!! 2024-09-28 23:23:20 +08:00
LQS 51cfc6ab2d Merge remote-tracking branch 'origin/dev.vehicles' into dev
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java
2024-09-28 23:21:08 +08:00
LQS 681c88db28 fate():新增协议解析模块:MQTT连接,数据转换JSON数据 2024-09-28 23:11:55 +08:00
xinzirun 9c059750b6 Merge remote-tracking branch 'origin/dev.dataProcessing' into dev 2024-09-28 21:24:40 +08:00
xinzirun 38a096ea72 feat(): 新增kafka配置模块 2024-09-28 21:23:24 +08:00
微醺 a51f80aa00 1.删除多余的表
更新时间092820
2024-09-28 20:30:52 +08:00
微醺 c8fd288cc4 Merge branch 'dev.carManage' of https://gitea.qinmian.online/six-vehicle/cloud-server into dev
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessage.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessageType.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-common/src/main/java/com/muyu/enterprise/domain/CarType.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarCompanyMapper.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarCompanyService.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarService.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarCompanyServiceImpl.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java
2024-09-28 20:27:54 +08:00
微醺 26d3ffda93 1.优化代码格式
2.swagger文档
更新时间09282021
2024-09-28 20:21:08 +08:00
LQS b70a552b6a fate():MQTT链接测试 2024-09-28 17:04:31 +08:00
crj 13bf016452 feax:()修改代码规范(注释) 2024-09-28 16:51:13 +08:00
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
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