Commit Graph

17 Commits (0b3ed78d0896bfb96d93ec57ab89d6ee6c92da77)

Author SHA1 Message Date
liuyunhu 4101e76188 huhuhu 2024-04-09 11:34:58 +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
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 be2e99af0c 车辆管理模块 加注释 增删改,触发刷新缓存 增加缓存时间 2024-04-08 14:44:03 +08:00
liuyunhu e91a4cb6d4 车辆管理模块 增删改,触发刷新缓存:set存车辆和对应电子围栏的数据 2024-04-08 13:21:23 +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
liuyunhu 9419a2f0a6 11 2024-04-05 19:01:11 +08:00
lijiayao 0b9423d817 feat: 事件系统 2024-04-05 09:49:04 +08:00
dongxiaodong 757f51a2dd Merge branch 'server_five' into server_five_dongxiaodong
# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/CoupletMsgApplication.java
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/consumer/KafkaConsumerQuickStart.java
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/contents/KafkaContents.java
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/producer/KafkaProducerQuickStart.java
2024-04-02 14:24:20 +08:00
dongxiaodong 143176fd5a Kafka测试 2024-04-01 20:48:43 +08:00
liuyunhu f597b6cbfc 虎,车辆模块完善,前台完善,功能已完成 2024-03-31 22:10:30 +08:00
lijiayao 09c28eb1fb Merge remote-tracking branch 'origin/server_five_dongxiaodong' into server_five_xiaoyao
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
#	couplet-gateway/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/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-system/src/main/resources/bootstrap.yml
#	couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
2024-03-30 00:42:31 +08:00
liuyunhu 3a4ddc8f2e 虎,车辆模块优化、mq模块测试,无法传输参数,数据到达交换机就停了 2024-03-29 22:32:16 +08:00