Commit Graph

29 Commits (ec410198242311ea53da2553efd6e0351adb88d1)

Author SHA1 Message Date
LQS 580172aa76 Merge remote-tracking branch 'origin/dev.analysis' into dev
# Conflicts:
#	cloud-common/pom.xml
2024-10-07 20:33:09 +08:00
LQS 3202af6ebb feat(): 完善mqtt的投递 2024-10-07 20:30:44 +08:00
crj 6e0ed3b883 Merge remote-tracking branch 'origin/dev.entOperation' into dev
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultRuleController.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultRuleService.java
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultRuleServiceImpl.java
#	cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/banner.txt
2024-10-07 20:09:21 +08:00
微醺 0db37dc190 Merge branch 'dev.entBusiness' into dev
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
2024-10-07 19:40:07 +08:00
crj 222b2ad30f fix():故障规则重构 2024-10-07 18:53:10 +08:00
微醺 c0a9b1a1dd 1.feat(): 添加: swagger文档
2.fix(): 修复了: 企业表的实体类

更新时间09301928
2024-10-07 14:25:10 +08:00
xinzirun ca8bd65148 fix(): 优化时间处理流程,修复bug 2024-10-07 09:01:57 +08:00
微醺 d896e9b26d Merge branch 'dev.entBusiness' of https://gitea.qinmian.online/six-vehicle/cloud-server into dev
# Conflicts:
#	cloud-common/pom.xml
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/CloudEnterpriseApplication.java
#	cloud-modules/cloud-modules-event-process/src/main/resources/banner.txt
#	pom.xml
2024-10-06 09:22:15 +08:00
微醺 f81d701acb 1.feat(): 添加: redis缓存的的封装
2.fix(): 修复了: 暂无

更新时间09301928
2024-10-06 09:17:03 +08:00
crj 3fb0158cfa feax:()添加企业表的同时将数据同步进去 企业列表展示 2024-10-05 20:41:45 +08:00
xinzirun 147dbe2c99 fix(): 解决依赖冲突问题 2024-09-30 20:07:17 +08:00
微醺 a229006c89 1.feat(): 添加将pom文件版本号统一管理
2.fix(): 修复了项目运行时的报错:
Error creating bean with name 'com.muyu.common.cache.config.CacheAbsBasic': Failed to instantiate [com.muyu.common.cache.config.CacheAbsBasic]: Is it an abstract class?
更新时间09301928
2024-09-30 19:28:04 +08:00
crj 0c7795ea71 feax:()添加企业的时候添加一个单独的库和表 2024-09-30 16:41:06 +08:00
微醺 a7b8987be4 1.将MyBatis编写方式更改成MyBatisPlus
2.后台测试成功
更新时间09292247
2024-09-29 22:47:40 +08:00
crj 517c18f215 feax:()删除fault模块 2024-09-29 15:07:11 +08:00
LQS e2d710fbb6 Merge remote-tracking branch 'origin/dev.vehicles' into dev 2024-09-29 12:17:44 +08:00
LQS fedc3c4ea7 feat():添加依赖注释 2024-09-29 12:10:28 +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
crj 2d0f557398 feax:()修改代码规范 2024-09-28 22:14:45 +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
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
15285 2c3197fac9 feax:()修改代码规范(注释,swagger文档) 2024-09-28 12:30:55 +08:00
DongZeLiang b0672dbd60 fix(): 修改项目架构 2024-09-27 16:04:00 +08:00