lijiayao
|
adc2b87792
|
feat: 电子围栏报警
|
2024-04-08 14:01:55 +08:00 |
|
lijiayao
|
de71107fe0
|
Merge branch 'server_five_fufanrui' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
# Conflicts:
# couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/service/RedisService.java
|
2024-04-08 11:27:14 +08:00 |
|
lijiayao
|
5c65c974c6
|
feat: 电子围栏报警
|
2024-04-08 11:26:11 +08:00 |
 ffr
|
d41ac8c2fd
|
fufanruiCommit
|
2024-04-08 11:20:08 +08:00 |
|
ffr
|
e270770029
|
fufanruiCommit
|
2024-04-08 10:55:33 +08:00 |
|
lijiayao
|
4ad3cfbe8e
|
Merge branch 'server_five_dongxiaodong' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
|
2024-04-08 10:01:23 +08:00 |
|
ffr
|
663111d885
|
upd
|
2024-04-08 09:59:48 +08:00 |
dongxiaodong
|
f104a50c27
|
Merge remote-tracking branch 'origin/server_five' into server_five_dongxiaodong
# Conflicts:
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-08 09:21:25 +08:00 |
|
dongxiaodong
|
0eba9f5cfe
|
存储数据
|
2024-04-08 09:15:52 +08:00 |
|
lijiayao
|
1c6cebb2cc
|
feat: 电子围栏报警
|
2024-04-07 22:37:47 +08:00 |
|
lijiayao
|
8bbaadea94
|
feat: 电子围栏报警
|
2024-04-07 22:32:02 +08:00 |
 liuyunhu
|
78afcf9ecc
|
4.7提交修改bug
|
2024-04-07 22:29:32 +08:00 |
|
lijiayao
|
b4ad3e4f47
|
feat: 电子围栏报警
|
2024-04-07 21:41:38 +08:00 |
|
lijiayao
|
c4eb443372
|
Merge branch 'server_five_liuyunhu' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
# Conflicts:
# couplet-common/couplet-common-business/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
|
2024-04-07 15:54:38 +08:00 |
|
lijiayao
|
b3bc515135
|
Merge branch 'server_five_fufanrui' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
|
2024-04-07 15:54:11 +08:00 |
|
lijiayao
|
0569099b02
|
feat: 电子围栏报警
|
2024-04-07 15:53:49 +08:00 |
|
ffr
|
57c31b68c3
|
ffffff
|
2024-04-07 14:35:44 +08:00 |
|
liuyunhu
|
0774e29edd
|
1
|
2024-04-07 11:06:13 +08:00 |
|
ffr
|
43f51881ca
|
ffffff
|
2024-04-07 11:05:59 +08:00 |
|
lijiayao
|
e5c4c0b9a4
|
perf: 优化
|
2024-04-06 21:56:29 +08:00 |
|
dongxiaodong
|
165583d024
|
kafka代码
|
2024-04-06 21:34:23 +08:00 |
|
dongxiaodong
|
d8e65c8da3
|
kafka代码
|
2024-04-06 20:08:09 +08:00 |
|
lijiayao
|
7aa223c8e4
|
Merge branch 'server_five_liuyunhu' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
|
2024-04-06 16:30:45 +08:00 |
|
dongxiaodong
|
6798b04fc4
|
kafka代码
|
2024-04-06 16:29:50 +08:00 |
|
liuyunhu
|
73342572cc
|
将远程调用的内容加 自动配置
|
2024-04-06 14:51:05 +08:00 |
|
lijiayao
|
957d3976b9
|
fix: 代码丢失找回
|
2024-04-06 14:09:42 +08:00 |
|
lijiayao
|
a042d30eec
|
Merge branch 'server_five_liuyunhu' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
|
2024-04-06 14:09:35 +08:00 |
|
ffr
|
fe7a832714
|
1111
|
2024-04-06 11:50:56 +08:00 |
|
liuyunhu
|
e885895016
|
VS
|
2024-04-06 11:37:22 +08:00 |
|
ffr
|
676f4fa8f3
|
1111
|
2024-04-06 11:03:16 +08:00 |
|
liuyunhu
|
64caa2296c
|
11
|
2024-04-06 10:56:05 +08:00 |
|
lijiayao
|
d2a29b0016
|
fix: 代码丢失找回
|
2024-04-06 10:15:12 +08:00 |
|
lijiayao
|
5c2021d6f2
|
Merge branch 'server_five_liuyunhu' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
# Conflicts:
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
# couplet-modules/couplet-business/src/main/java/com/couplet/business/server/CoupletBusinessApplication.java
# couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleController.java
# couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleMapper.java
# couplet-modules/couplet-business/src/main/resources/bootstrap.yml
# couplet-modules/couplet-business/src/main/resources/mapper/business/VehicleMapper.xml
# couplet-modules/couplet-modules-mq/pom.xml
# couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/CoupletMqApplatcaion.java
# couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/service/MqConsumer.java
|
2024-04-06 10:04:53 +08:00 |
|
lijiayao
|
8de32c8223
|
Merge branch 'server_five_dongxiaodong' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
# Conflicts:
# couplet-auth/src/main/resources/bootstrap.yml
# couplet-gateway/src/main/resources/bootstrap.yml
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/contents/StateConstant.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/BreakdownServiceImpl.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/RealTimeDataServiceImpl.java
# couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/controller/MqController.java
# couplet-modules/couplet-system/src/main/resources/bootstrap.yml
|
2024-04-06 10:02:18 +08:00 |
|
dongxiaodong
|
1b88d35574
|
修改故障类
|
2024-04-06 09:06:07 +08:00 |
|
ffr
|
2f2547e2b8
|
upd commit
|
2024-04-05 20:08:18 +08:00 |
|
liuyunhu
|
ca46bfe024
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
|
2024-04-05 19:01:21 +08:00 |
|
liuyunhu
|
9419a2f0a6
|
11
|
2024-04-05 19:01:11 +08:00 |
|
dongxiaodong
|
71f1bc84e2
|
判断异常
|
2024-04-05 18:01:10 +08:00 |
|
dongxiaodong
|
371c80d110
|
判断异常
|
2024-04-05 11:37:29 +08:00 |
|
ffr
|
4a6124d181
|
upd commit
|
2024-04-05 10:10:12 +08:00 |
|
ffr
|
73546a7a5a
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui
# Conflicts:
# couplet-auth/src/main/resources/bootstrap.yml
# couplet-gateway/src/main/resources/bootstrap.yml
# couplet-modules/couplet-system/src/main/resources/bootstrap.yml
|
2024-04-05 08:54:23 +08:00 |
|
dongxiaodong
|
976f35f212
|
Merge branch 'server_five_xiaoyao' into server_five_dongxiaodong
# Conflicts:
# couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/constant/ServiceNameConstants.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml
|
2024-04-05 08:40:48 +08:00 |
|
dongxiaodong
|
f81f05ae1c
|
判断异常
|
2024-04-05 08:38:19 +08:00 |
|
lijiayao
|
9e489bd4ec
|
feat: 事件系统
|
2024-04-05 08:36:56 +08:00 |
|
lijiayao
|
ed31af73b5
|
Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao
# Conflicts:
# couplet-auth/src/main/resources/bootstrap.yml
# couplet-gateway/src/main/resources/bootstrap.yml
# couplet-modules/couplet-system/src/main/resources/bootstrap.yml
|
2024-04-04 15:05:23 +08:00 |
|
lijiayao
|
041aaa4654
|
feat: 事件系统
|
2024-04-04 15:04:25 +08:00 |
|
dongxiaodong
|
846073f528
|
删除没用的文件
|
2024-04-04 14:45:07 +08:00 |
|
ffr
|
0c71aec748
|
车辆管理
|
2024-04-04 14:37:20 +08:00 |
|
lijiayao
|
9e8106ab46
|
refactor: 修改框架
|
2024-04-04 09:48:53 +08:00 |