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 |
|
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 |
|
dongxiaodong
|
adab59900a
|
优化判断语句
|
2024-04-08 14:01:18 +08:00 |
 liuyunhu
|
e91a4cb6d4
|
车辆管理模块 增删改，触发刷新缓存：set存车辆和对应电子围栏的数据
|
2024-04-08 13:21:23 +08:00 |
|
lijiayao
|
5c65c974c6
|
feat: 电子围栏报警
|
2024-04-08 11:26:11 +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 |
|
liuyunhu
|
4e021d316b
|
111111
|
2024-04-07 15:53:55 +08:00 |
|
liuyunhu
|
0774e29edd
|
1
|
2024-04-07 11:06:13 +08:00 |
|
lijiayao
|
de9f2e6a24
|
fix: 代码丢失找回
|
2024-04-06 20:08:16 +08:00 |
|
liuyunhu
|
78f59d7392
|
优化
|
2024-04-06 16:30:00 +08:00 |
|
liuyunhu
|
64caa2296c
|
11
|
2024-04-06 10:56:05 +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 |
|
liuyunhu
|
9419a2f0a6
|
11
|
2024-04-05 19:01:11 +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
|
2352def47e
|
refactor: 修改框架
|
2024-04-03 11:01:11 +08:00 |
|
lijiayao
|
6ab26976d6
|
Merge remote-tracking branch 'origin/server_five_liuyunhu' into server_five_xiaoyao
# Conflicts:
# couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/constant/ServiceNameConstants.java
# couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java
# couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleService.java
# couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java
|
2024-04-03 09:03:51 +08:00 |
|
liuyunhu
|
ffa06bc02e
|
虎虎虎虎
|
2024-04-03 08:35:23 +08:00 |
|
dongxiaodong
|
3947f9414e
|
dxd解析报文
|
2024-04-02 21:42:16 +08:00 |
|
liuyunhu
|
08aec277e6
|
虎虎虎虎
|
2024-04-02 14:46:36 +08:00 |
|
liuyunhu
|
c3aee00eff
|
虎虎虎虎
|
2024-04-02 09:07:40 +08:00 |