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 |
|
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 |
|
liuyunhu
|
08aec277e6
|
虎虎虎虎
|
2024-04-02 14:46:36 +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 |
|
lijiayao
|
5148ae5e14
|
chore: 新增解析系统模块
|
2024-04-02 14:23:01 +08:00 |
|
dongxiaodong
|
5b499eb8c3
|
Kafka测试
|
2024-04-02 14:22:55 +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 |
|
liuyunhu
|
c3aee00eff
|
虎虎虎虎
|
2024-04-02 09:07:40 +08:00 |
|
liuyunhu
|
c884fc9a19
|
Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
# Conflicts:
# couplet-modules/pom.xml
|
2024-04-02 09:05:41 +08:00 |
|
liuyunhu
|
a3f5055ef2
|
虎，添加上线模块
|
2024-04-02 09:03:26 +08:00 |
|
ffr
|
fa79d7a83b
|
员工管理
|
2024-04-01 21:19:21 +08:00 |
|
dongxiaodong
|
143176fd5a
|
Kafka测试
|
2024-04-01 20:48:43 +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 |
|
lijiayao
|
9c9dfb7090
|
Merge remote-tracking branch 'origin/server_five_liuyunhu' 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-visual/couplet-monitor/src/main/resources/bootstrap.yml
|
2024-04-01 19:49:11 +08:00 |
|
lijiayao
|
1094fe0136
|
Merge remote-tracking branch 'origin/server_five_dongxiaodong' into server_five_xiaoyao
|
2024-04-01 19:48:16 +08:00 |
|
lijiayao
|
ef85dad9c9
|
feat: 电子围栏编辑和化多边形
|
2024-04-01 19:47:00 +08:00 |
|
dongxiaodong
|
a20dc82049
|
解析报文
|
2024-03-31 22:28:46 +08:00 |
|
liuyunhu
|
f597b6cbfc
|
虎，车辆模块完善，前台完善，功能已完成
|
2024-03-31 22:10:30 +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 |
|
liuyunhu
|
42c80590ff
|
虎，车辆模块优化，车辆和类型的关联
|
2024-03-31 10:53:19 +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 |
|
lijiayao
|
5cd149e502
|
实现业务功能
|
2024-03-30 00:39:17 +08:00 |
|
lijiayao
|
96f9bc50f1
|
实现业务功能
|
2024-03-30 00:38:42 +08:00 |
|
liuyunhu
|
3a4ddc8f2e
|
虎，车辆模块优化、mq模块测试，无法传输参数，数据到达交换机就停了
|
2024-03-29 22:32:16 +08:00 |
|
YuanYh
|
2f74b536d9
|
管理企业更新
|
2024-03-29 21:52:04 +08:00 |
|
dongxiaodong
|
21045e1d5a
|
3/28Dxd提交2
|
2024-03-29 15:26:27 +08:00 |
|
dongxiaodong
|
203e7b6561
|
3/28Dxd提交2
|
2024-03-29 15:24:39 +08:00 |
|
lijiayao
|
ecf40782e2
|
Merge remote-tracking branch 'origin/server_five_liuyunhu' into server_five_xiaoyao
# Conflicts:
# couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java
|
2024-03-29 09:43:24 +08:00 |
|
lijiayao
|
292646e534
|
修改付报错
|
2024-03-29 09:43:00 +08:00 |
|
dongxiaodong
|
e59a8b3300
|
Merge branch 'server_five_liuyunhu' into server_five_dongxiaodong
|
2024-03-29 09:16:01 +08:00 |
|
liuyunhu
|
c37f78aecd
|
更正规范
|
2024-03-29 09:14:35 +08:00 |
|
dongxiaodong
|
486e7a3c7a
|
Merge branch 'server_five_liuyunhu' into server_five_dongxiaodong
|
2024-03-29 09:12:59 +08:00 |
|
liuyunhu
|
f46ff2e948
|
解决配置文件无法覆盖实例问题
|
2024-03-29 09:11:18 +08:00 |
|
dongxiaodong
|
f26476a526
|
Merge branch 'server_five' into server_five_dongxiaodong
|
2024-03-29 09:05:20 +08:00 |
|
dongxiaodong
|
9b649d2e60
|
3/28Dxd提交2
|
2024-03-28 23:34:52 +08:00 |
|
lijiayao
|
ab6f21a6ff
|
修改付报错
|
2024-03-28 22:41:13 +08:00 |
|
lijiayao
|
5ce8944c51
|
Merge remote-tracking branch 'origin/server_five_dongxiaodong' into server_five_xiaoyao
|
2024-03-28 22:39:44 +08:00 |
|
lijiayao
|
5be8c78209
|
Merge remote-tracking branch 'origin/server_five_yuanyonghao' into server_five_xiaoyao
# Conflicts:
# couplet-modules/pom.xml
# pom.xml
|
2024-03-28 22:38:41 +08:00 |
|
lijiayao
|
825026a357
|
Merge remote-tracking branch 'origin/server_five_liuyunhu' into server_five_xiaoyao
|
2024-03-28 22:37:48 +08:00 |
|
lijiayao
|
5cba075219
|
feat: 围栏列表
|
2024-03-28 22:36:22 +08:00 |
|
YuanYh
|
c00d4c8904
|
管理企业
|
2024-03-28 22:33:31 +08:00 |
|
dongxiaodong
|
5f6bffff35
|
3/28Dxd提交
|
2024-03-28 22:30:33 +08:00 |
|
liuyunhu
|
2d6cbf6f1c
|
车辆模块代码规范更正，新建Mqtt服务，并测试连接，控制台输出接受的报文
|
2024-03-28 21:55:06 +08:00 |
|
liuyunhu
|
b9764dc297
|
车辆模块代码规范更正，新建Mqtt服务，并测试连接，控制台输出接受的报文
|
2024-03-28 21:53:50 +08:00 |
DongZeLiang
|
847e150cbc
|
企业管理，伪代码
|
2024-03-28 17:31:30 +08:00 |
|
DongZeLiang
|
8f9cf1a6c6
|
增加依赖声明
|
2024-03-28 17:07:51 +08:00 |
|
DongZeLiang
|
0e4c1d3cba
|
移除多余模块声明
|
2024-03-28 17:05:14 +08:00 |
|
ffr
|
f9356bd0b7
|
提交代码
|
2024-03-28 17:00:41 +08:00 |
|
dongxiaodong
|
69c67fbcad
|
改bug
|
2024-03-28 14:28:45 +08:00 |
|
lijiayao
|
759ad1ee6f
|
加油！！
|
2024-03-28 00:57:48 +08:00 |
|
lijiayao
|
a044923af3
|
Merge remote-tracking branch 'origin/lyh' into xiaoyao
# Conflicts:
# couplet-modules/pom.xml
|
2024-03-28 00:45:41 +08:00 |
|
lijiayao
|
3c1d76b417
|
style: 电子围栏初始化
|
2024-03-28 00:44:25 +08:00 |
|
dongxiaodong
|
3be43f8fb6
|
基本业务功能
|
2024-03-27 22:43:38 +08:00 |
|
liuyunhu
|
39c764922c
|
车辆录入，生成vin码，可以用于模拟车辆和验证车辆上线
|
2024-03-27 16:58:14 +08:00 |
|
liuyunhu
|
9df04a6af2
|
aa
|
2024-03-26 22:37:57 +08:00 |
|
lijiayao
|
68ced79707
|
style: 代码初始化
|
2024-03-26 19:18:33 +08:00 |
|
lijiayao
|
1dce28afa3
|
style: 代码初始化
|
2024-03-26 18:45:36 +08:00 |