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 |
|
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 |
|
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 |