lijiayao
|
0b3ed78d08
|
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/CoupletMsgApplication.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/java/com/couplet/online/utils/MqttMonitor.java
# couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-09 17:10:47 +08:00 |
|
lijiayao
|
bc8558576f
|
修改bug
|
2024-04-09 17:07:26 +08:00 |
 liuyunhu
|
036db4cd79
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
# Conflicts:
# couplet-auth/src/main/resources/bootstrap.yml
# couplet-gateway/src/main/resources/bootstrap.yml
# couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
# couplet-modules/couplet-business/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-modules-mq/src/main/resources/bootstrap.yml
# couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java
|
2024-04-09 11:36:09 +08:00 |
|
liuyunhu
|
4101e76188
|
huhuhu
|
2024-04-09 11:34:58 +08:00 |
|
lijiayao
|
33978cf155
|
Merge branch 'server_five_dongxiaodong' 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-modules-mq/src/main/java/com/couplet/mq/controller/KafkaTest.java
|
2024-04-09 10:49:27 +08:00 |
|
lijiayao
|
a8fff6ef70
|
feat: 优化代码
|
2024-04-09 10:47:42 +08:00 |
dongxiaodong
|
54a091e3b6
|
优化判断语句
|
2024-04-09 09:57:28 +08:00 |
 ffr
|
31e78c3c3c
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui
# Conflicts:
# couplet-modules/couplet-business/pom.xml
# couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleDetectionServiceImpl.java
# couplet-modules/couplet-business/src/main/resources/bootstrap.yml
# couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
|
2024-04-08 21:55:12 +08:00 |
|
ffr
|
4488018bce
|
commit upd ffr
|
2024-04-08 21:53:13 +08:00 |
|
lijiayao
|
bcb03022d1
|
feat: 优化代码
|
2024-04-08 21:24:32 +08:00 |
|
lijiayao
|
e52228b381
|
Merge branch 'server_five_dongxiaodong' 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-modules-onLine/src/main/resources/bootstrap.yml
|
2024-04-08 20:42:01 +08:00 |
|
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 |
|
liuyunhu
|
9327ecae1f
|
huhuhu
|
2024-04-08 19:51:32 +08:00 |
|
liuyunhu
|
be2e99af0c
|
车辆管理模块 加注释 增删改，触发刷新缓存 增加缓存时间
|
2024-04-08 14:44:03 +08:00 |
|
liuyunhu
|
e91a4cb6d4
|
车辆管理模块 增删改，触发刷新缓存：set存车辆和对应电子围栏的数据
|
2024-04-08 13:21:23 +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
|
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 |
|
liuyunhu
|
4e021d316b
|
111111
|
2024-04-07 15:53:55 +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
|
de9f2e6a24
|
fix: 代码丢失找回
|
2024-04-06 20:08:16 +08:00 |
|
ffr
|
404f434d62
|
ffffff
|
2024-04-06 20:07:00 +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 |
|
liuyunhu
|
78f59d7392
|
优化
|
2024-04-06 16:30:00 +08:00 |
|
dongxiaodong
|
6798b04fc4
|
kafka代码
|
2024-04-06 16:29:50 +08:00 |
|
liuyunhu
|
812b8d47f8
|
Kafka demo
|
2024-04-06 14:25:44 +08:00 |
|
liuyunhu
|
858acc75ee
|
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/java/com/couplet/business/server/mapper/SysTroubleMapper.java
# couplet-modules/couplet-business/src/main/resources/mapper/business/SysTroubleMapper.xml
# couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/service/MqConsumer.java
|
2024-04-06 11:38:24 +08:00 |
|
liuyunhu
|
e885895016
|
VS
|
2024-04-06 11:37:22 +08:00 |
|
lijiayao
|
5a20331f8d
|
fix: 代码丢失找回
|
2024-04-06 11:36:04 +08:00 |
|
liuyunhu
|
64caa2296c
|
11
|
2024-04-06 10:56:05 +08:00 |
|
lijiayao
|
e5761fb11f
|
fix: 代码丢失找回
|
2024-04-06 10:24:27 +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
|
1b88d35574
|
修改故障类
|
2024-04-06 09:06:07 +08:00 |
|
ffr
|
2f2547e2b8
|
upd commit
|
2024-04-05 20:08:18 +08:00 |
|
liuyunhu
|
9419a2f0a6
|
11
|
2024-04-05 19:01:11 +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 |
|
liuyunhu
|
562deda30a
|
修改远程调用 配置，有的变量没改导致调用不通
|
2024-04-04 09:43:08 +08:00 |
|
lijiayao
|
a9977b44a9
|
新增
|
2024-04-02 21:25:33 +08:00 |
|
dongxiaodong
|
8d5e46108f
|
Merge branch 'server_five_liuyunhu' into server_five_dongxiaodong
# Conflicts:
# couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/service/MqttListen.java
# couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml
# couplet-modules/pom.xml
|
2024-04-02 15:22:18 +08:00 |
|
dongxiaodong
|
6c16191d90
|
dxd测试
|
2024-04-02 15:20:18 +08:00 |