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

60 Commits (43f51881ca74974913cc68645496e6d5c8a9afdb)

Author SHA1 Message Date
ffr 43f51881ca ffffff 2024-04-07 11:05:59 +08:00
lijiayao e5c4c0b9a4 perf: 优化 2024-04-06 21:56:29 +08:00
dongxiaodong 165583d024 kafka代码 2024-04-06 21:34:23 +08:00
dongxiaodong d8e65c8da3 kafka代码 2024-04-06 20:08:09 +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
dongxiaodong 6798b04fc4 kafka代码 2024-04-06 16:29:50 +08:00
liuyunhu 73342572cc 将远程调用的内容加 自动配置 2024-04-06 14:51:05 +08:00
lijiayao 957d3976b9 fix: 代码丢失找回 2024-04-06 14:09:42 +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 e885895016 VS 2024-04-06 11:37:22 +08:00
ffr 676f4fa8f3 1111 2024-04-06 11:03:16 +08:00
liuyunhu 64caa2296c 11 2024-04-06 10:56:05 +08:00
lijiayao d2a29b0016 fix: 代码丢失找回 2024-04-06 10:15:12 +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 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
ffr 4a6124d181 upd commit 2024-04-05 10:10:12 +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
liuyunhu 562deda30a 修改远程调用 配置，有的变量没改导致调用不通 2024-04-04 09:43:08 +08:00
liuyunhu f07dc734e4 远程调用 加自动配置扫描 2024-04-04 08:50:19 +08:00
lijiayao 0c1cfb8f28 refactor: 修改框架 2024-04-03 11:27:17 +08:00
lijiayao 2352def47e refactor: 修改框架 2024-04-03 11:01:11 +08:00
ffr c7443b81d7 车辆管理 2024-04-03 08:38:24 +08:00
ffr f9ec95317c Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui 2024-04-02 10:59:00 +08:00
ffr fa79d7a83b 员工管理 2024-04-01 21:19:21 +08:00
lijiayao 313fd4aa54 Merge remote-tracking branch 'origin/server_five_yuanyonghao' into server_five_xiaoyao 
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
 2024-04-01 19:49:39 +08:00
dongxiaodong b17a7104e0 Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_dongxiaodong 
# Conflicts:
#	couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java
 2024-03-31 15:03:41 +08:00
dongxiaodong 77045a3977 3/28Dxd提交2 2024-03-31 15:01:17 +08:00
lijiayao 1910013cbb Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao 
# Conflicts:
#	couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java
#	couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java
 2024-03-31 10:22:47 +08:00
lijiayao b8e3b4dcd1 feat: 新增、删除 2024-03-31 10:21:50 +08:00
ffr 2b392ec1d1 管理企业 2024-03-31 10:17:59 +08:00
YuanYh 9b683e6129 管理企业更新 2024-03-31 10:12:18 +08:00
ffr 24c219c145 更新代码 2024-03-30 09:50:19 +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
lijiayao 089068a745 Merge remote-tracking branch 'origin/server_five_yuanyonghao' into server_five_xiaoyao 
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
#	couplet-gateway/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-modules/pom.xml
#	couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
 2024-03-30 00:42:05 +08:00
lijiayao 3303cfd0b3 Merge remote-tracking branch 'origin/server_five_liuyunhu' into server_five_xiaoyao 
# Conflicts:
#	couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java
#	pom.xml
 2024-03-30 00:40:16 +08:00