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
9bb39ec32a
fix():解决故障规则报错
2024-10-07 20:12:05 +08:00
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
xinzirun
a9bfdc1670
Merge remote-tracking branch 'origin/dev' into dev
2024-10-07 19:48:57 +08:00
xinzirun
111129e777
fix(): 修复故障规则
2024-10-07 19:48:11 +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
293e58809c
1.feat(): 添加:
...
2.fix(): 修复了: 之前添加的封装的缓存
更新时间10071938
2024-10-07 19:38:31 +08:00
a2f2d2ec52
fix():故障规则重构
2024-10-07 19:31:18 +08:00
xinzirun
7fa71097fd
fix(): 解决配置冲突问题
2024-10-07 19:31:18 +08:00
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
19f67a389c
fix(): 解决配置冲突问题
2024-10-07 09:45:59 +08:00
xinzirun
a1894bb013
feat(): 新增车辆上线消费者和识别故障监听器
2024-10-07 09:02:38 +08:00
xinzirun
ca8bd65148
fix(): 优化时间处理流程，修复bug
2024-10-07 09:01:57 +08:00
xinzirun
8888b7430c
fix(): 修改故障规则命名
2024-10-07 09:00:43 +08:00
688527037d
1.feat(): 添加: 电子围栏的redis
...
2.fix(): 修复了: 暂无
更新时间10060935
2024-10-06 09:35:54 +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
3fb0158cfa
feax:()添加企业表的同时将数据同步进去 企业列表展示
2024-10-05 20:41:45 +08:00
46689d02e1
feax:()添加企业表的同时将数据同步进去 企业列表展示
2024-10-04 11:09:33 +08:00
xinzirun
576befa0ee
fix(): 修改nacos命名空间配置
2024-10-02 16:50:55 +08:00
xinzirun
6f95055a6b
feat(): 新增rabbitmq公共模块代码
2024-10-02 16:49:39 +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
xinzirun
c67d648a8a
Merge branch 'dev.eventProcessing' into dev
...
# Conflicts:
# cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml
# cloud-modules/pom.xml
2024-09-30 18:10:51 +08:00
xinzirun
5203c69a90
fix(): 修改nacos命名空间
2024-09-30 18:04:49 +08:00
0c7795ea71
feax:()添加企业的时候添加一个单独的库和表
2024-09-30 16:41:06 +08:00
b9f3cac204
1.feat(): 添加 redis缓存
...
2.fix(): 更新公共路径
更新时间09301533
2024-09-30 15:33:37 +08:00
a7b8987be4
1.将MyBatis编写方式更改成MyBatisPlus
...
2.后台测试成功
更新时间09292247
2024-09-29 22:47:40 +08:00
LQS
497de4ade9
Merge remote-tracking branch 'origin/dev.analysis' into dev
2024-09-29 18:05:15 +08:00
LQS
7e02675028
feat(新增kafka、redis常量类):完善MQTT接收之后解析报文传递kafka
2024-09-29 17:32:46 +08:00
22675757b3
feat():启动创建ECS服务器模块,停止删除ECS服务器模块
2024-09-29 16:33:04 +08:00
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
5979dbea8f
fix():修复远调降级处理影响启动类无法运行问题
2024-09-29 11:10:37 +08:00
782f31446b
feat():项目启动添加ecs实例，停止删除ecs实例
2024-09-29 10:25:30 +08:00
xinzirun
47567ff055
feat(): 新增IoTDB配置类、基础业务类
2024-09-29 00:55:53 +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
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
cd46940e70
feax:()修改代码规范(注释)
2024-09-28 20:12:04 +08:00
LQS
b70a552b6a
fate():MQTT链接测试
2024-09-28 17:04:31 +08:00
13bf016452
feax:()修改代码规范(注释)
2024-09-28 16:51:13 +08:00
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
2d25fd9a04
feax:()修改代码规范(注释)
2024-09-28 16:36:58 +08:00
LQS
crj
xinzirun
微醺
liuyibo