dongxiaodong
|
aee28d568e
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_dongxiaodong
# Conflicts:
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
# couplet-modules/couplet-file/src/main/resources/bootstrap.yml
# couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
# couplet-modules/couplet-job/src/main/resources/bootstrap.yml
# couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml
# couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
|
2024-04-08 20:08:38 +08:00 |
|
dongxiaodong
|
c4f1beed8b
|
优化判断语句
|
2024-04-08 20:07:06 +08:00 |
lijiayao
|
0960e8f9fb
|
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/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
# couplet-modules/couplet-business/src/main/resources/bootstrap.yml
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
# couplet-modules/couplet-system/src/main/resources/bootstrap.yml
|
2024-04-08 19:52:27 +08:00 |
|
lijiayao
|
05b2baf32e
|
feat: 优化代码
|
2024-04-08 19:50:45 +08:00 |
 liuyunhu
|
be2e99af0c
|
车辆管理模块 加注释 增删改，触发刷新缓存 增加缓存时间
|
2024-04-08 14:44:03 +08:00 |
|
liuyunhu
|
1b9c777a87
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
# Conflicts:
# couplet-modules/couplet-business/src/main/resources/bootstrap.yml
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-08 14:05:30 +08:00 |
|
dongxiaodong
|
599d89b6e4
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_dongxiaodong
# Conflicts:
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/consumer/CodeConsumer.java
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-08 14:03:21 +08:00 |
|
lijiayao
|
adc2b87792
|
feat: 电子围栏报警
|
2024-04-08 14:01:55 +08:00 |
|
dongxiaodong
|
adab59900a
|
优化判断语句
|
2024-04-08 14:01:18 +08:00 |
|
liuyunhu
|
b44d92b599
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
# Conflicts:
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-08 13:22:41 +08:00 |
|
liuyunhu
|
e91a4cb6d4
|
车辆管理模块 增删改，触发刷新缓存：set存车辆和对应电子围栏的数据
|
2024-04-08 13:21:23 +08:00 |
|
lijiayao
|
5c65c974c6
|
feat: 电子围栏报警
|
2024-04-08 11:26:11 +08:00 |
|
lijiayao
|
366d97e8d2
|
feat: 电子围栏报警
|
2024-04-08 10:02:19 +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 |
|
lijiayao
|
325b13df58
|
feat: 电子围栏报警
|
2024-04-08 10:00:10 +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
|
16d72968d4
|
feat: 电子围栏报警
|
2024-04-07 22:37:13 +08:00 |
|
lijiayao
|
8bbaadea94
|
feat: 电子围栏报警
|
2024-04-07 22:32:02 +08:00 |
|
lijiayao
|
b4ad3e4f47
|
feat: 电子围栏报警
|
2024-04-07 21:41:38 +08:00 |
|
lijiayao
|
0569099b02
|
feat: 电子围栏报警
|
2024-04-07 15:53:49 +08:00 |
|
lijiayao
|
e5c4c0b9a4
|
perf: 优化
|
2024-04-06 21:56:29 +08:00 |
|
lijiayao
|
8803a91628
|
Merge remote-tracking branch 'origin/server_five_dongxiaodong' into server_five
# Conflicts:
# couplet-modules/couplet-business/src/main/resources/bootstrap.yml
|
2024-04-06 21:54:44 +08:00 |
|
dongxiaodong
|
65c64098ab
|
删除文件
|
2024-04-06 21:39:26 +08:00 |
|
dongxiaodong
|
165583d024
|
kafka代码
|
2024-04-06 21:34:23 +08:00 |
|
lijiayao
|
de9f2e6a24
|
fix: 代码丢失找回
|
2024-04-06 20:08:16 +08:00 |
|
dongxiaodong
|
d8e65c8da3
|
kafka代码
|
2024-04-06 20:08:09 +08:00 |
|
dongxiaodong
|
6798b04fc4
|
kafka代码
|
2024-04-06 16:29:50 +08:00 |
|
dongxiaodong
|
10b15a6f99
|
修改故障类
|
2024-04-06 11:08:41 +08:00 |
|
lijiayao
|
5184d57407
|
fix: 代码丢失找回
|
2024-04-06 10:55:51 +08:00 |
|
lijiayao
|
ba33f9abb6
|
fix: 代码丢失找回
|
2024-04-06 10:47:14 +08:00 |
|
lijiayao
|
d2a29b0016
|
fix: 代码丢失找回
|
2024-04-06 10:15:12 +08:00 |
|
lijiayao
|
e8c0690352
|
Merge branch 'server_five_xiaoyao' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five
# Conflicts:
# 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
|
2024-04-06 10:10:11 +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
|
1db40b4db2
|
修改故障类
|
2024-04-06 09:11:03 +08:00 |
|
dongxiaodong
|
1b88d35574
|
修改故障类
|
2024-04-06 09:06:07 +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 |
|
lijiayao
|
e5352e3778
|
Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao
# Conflicts:
# 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
|
2024-04-05 10:12:45 +08:00 |
 ffr
|
4a6124d181
|
upd commit
|
2024-04-05 10:10:12 +08:00 |
|
lijiayao
|
0b9423d817
|
feat: 事件系统
|
2024-04-05 09:49:04 +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
|
041aaa4654
|
feat: 事件系统
|
2024-04-04 15:04:25 +08:00 |
|
dongxiaodong
|
846073f528
|
删除没用的文件
|
2024-04-04 14:45:07 +08:00 |
|
lijiayao
|
9e8106ab46
|
refactor: 修改框架
|
2024-04-04 09:48:53 +08:00 |