five-groups
/
five-groups-couplet
4
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity
232 Commits
4 Branches
0 Tags
3.8 MiB
Commit Graph

215 Commits (deece927c5e2e926b74bdf3da39de1b500339ed2)

Author SHA1 Message Date
liuyunhu 01c11cea01 4.8增加set缓存 车辆vin 标识 2024-04-08 10:02:52 +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 d0e00acaeb Merge branch 'server_five_fufanrui' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five 2024-04-08 10:00:28 +08:00
lijiayao 325b13df58 feat: 电子围栏报警 2024-04-08 10:00:10 +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 16d72968d4 feat: 电子围栏报警 2024-04-07 22:37:13 +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
liuyunhu 4e021d316b 111111 2024-04-07 15:53:55 +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
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 b1d3443ddb 删除文件 2024-04-06 21:45:02 +08:00
dongxiaodong 65c64098ab 删除文件 2024-04-06 21:39:26 +08:00
dongxiaodong 165583d024 kafka代码 2024-04-06 21:34:23 +08:00
dongxiaodong 1e08ce9bd7 kafka代码 2024-04-06 20:50:16 +08:00
lijiayao de9f2e6a24 fix: 代码丢失找回 2024-04-06 20:08:16 +08:00
dongxiaodong d8e65c8da3 kafka代码 2024-04-06 20:08:09 +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 b655ca9c30 打印SQL执行日志 2024-04-06 14:53:29 +08:00
liuyunhu 73342572cc 将远程调用的内容加 自动配置 2024-04-06 14:51:05 +08:00
liuyunhu 812b8d47f8 Kafka demo 2024-04-06 14:25:44 +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 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
ffr 1091b79e56 Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui 2024-04-06 11:37:05 +08:00
lijiayao 5a20331f8d fix: 代码丢失找回 2024-04-06 11:36:04 +08:00
lijiayao be3fd8e7eb Merge branch 'server_five_dongxiaodong' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five 2024-04-06 11:27:15 +08:00
dongxiaodong 10b15a6f99 修改故障类 2024-04-06 11:08:41 +08:00
ffr 676f4fa8f3 1111 2024-04-06 11:03:16 +08:00
liuyunhu 9b0121446a Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu 2024-04-06 10:56:16 +08:00
liuyunhu 64caa2296c 11 2024-04-06 10:56:05 +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 a5bf87099d fix: 代码丢失找回 2024-04-06 10:28:19 +08:00
lijiayao e5761fb11f fix: 代码丢失找回 2024-04-06 10:24:27 +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
lijiayao abce267131 Merge branch 'server_five_fufanrui' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five 2024-04-06 09:59:54 +08:00
lijiayao 5bf55e27f3 fix: 代码丢失找回 2024-04-06 09:59:38 +08:00
dongxiaodong 1db40b4db2 修改故障类 2024-04-06 09:11:03 +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 9a78e4a2e2 判断异常 2024-04-05 18:39:02 +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
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
lijiayao 93ccc7535e Merge remote-tracking branch 'origin/server_five_liuyunhu' into server_five 2024-04-04 09:48:29 +08:00
liuyunhu 4da1d7c52e Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu 2024-04-04 09:43:21 +08:00
liuyunhu 562deda30a 修改远程调用 配置，有的变量没改导致调用不通 2024-04-04 09:43:08 +08:00
dongxiaodong eac6f6076d Merge branch 'server_five' into server_five_dongxiaodong 
# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelMessage.java
 2024-04-04 09:00:38 +08:00
lijiayao ad5626f0af refactor: 修改框架 2024-04-04 08:58:43 +08:00
ffr e027acc275 车辆管理 2024-04-03 11:38:59 +08:00
lijiayao 0c1cfb8f28 refactor: 修改框架 2024-04-03 11:27:17 +08:00
lijiayao 2352def47e refactor: 修改框架 2024-04-03 11:01:11 +08:00
dongxiaodong 703997bd9b dxd解析报文 2024-04-03 10:42:30 +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
lijiayao de572170ec Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao 2024-04-03 09:01:41 +08:00
lijiayao bbd9e52302 新增 2024-04-03 09:00:58 +08:00
ffr c7443b81d7 车辆管理 2024-04-03 08:38:24 +08:00
liuyunhu ffa06bc02e 虎虎虎虎 2024-04-03 08:35:23 +08:00
dongxiaodong 3947f9414e dxd解析报文 2024-04-02 21:42:16 +08:00
dongxiaodong 99dc4e832f Merge remote-tracking branch 'origin/server_five_xiaoyao' into server_five_dongxiaodong 
# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
 2024-04-02 21:38:56 +08:00
lijiayao 00369a6052 新增 2024-04-02 21:36:23 +08:00
lijiayao a9977b44a9 新增 2024-04-02 21:25:33 +08:00
dongxiaodong b644752443 dxd解析报文 2024-04-02 21:15:25 +08:00
lijiayao aaa5d4f868 Merge branch 'server_five_dongxiaodong' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_xiaoyao 2024-04-02 18:28:31 +08:00
dongxiaodong 72b634fcc1 dxd测试 2024-04-02 18:27:56 +08:00
lijiayao 8d54e991dc Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao 2024-04-02 17:05:30 +08:00
lijiayao 73c2c159e8 Merge remote-tracking branch 'origin/server_five_dongxiaodong' into server_five_xiaoyao 2024-04-02 16:57:19 +08:00
lijiayao 422ffa1f32 新增 2024-04-02 16:57:04 +08:00
dongxiaodong 0bbf40741c dxd测试 2024-04-02 16:56:39 +08:00