dev #5

Merged

yuanqiang merged 69 commits from dev into test 11 months ago

yuanqiang commented 11 months ago

Owner

合并

yuanqiang added 69 commits 11 months ago

a3e6b0b2fa 提交：排序

8a664019af [feat]

1、增加预警管理根据标签查询
2、增加工作流动态增加处理人逻辑。
3、对接设备权限

993a9d44d7 Merge remote-tracking branch 'origin/dev' into dev

f29808dfaf [feat]

1、增加预警管理根据标签查询
2、增加工作流动态增加处理人逻辑。
3、对接设备权限②

37f98c55a5 [feat]

1、对接设备权限③

06ebc2a4ea [feat]

1、增加预警管理查询标签下拉列表接口①

c2f24932bc 天翼云，使用minio访问测试

8aced047e5 [feat]

1、修改根据用户查询设备组信息①

08944e5422 Merge remote-tracking branch 'origin/dev' into dev

f5c4041894 [feat]

1、修改bug

6d90d193bd 提交：预警热力图

b776c64d65 [feat]

1、修改设备组管理相关问题①

7486db2f68 Merge remote-tracking branch 'origin/dev' into dev

18a6858dfb [feat]

1、修改设备组管理相关问题②

639dd1d056 [feat]

1、修改设备组管理相关问题③

82903e136a [feat]

1、修改设备组管理相关问题④

eb3b6364de [feat]

1、修改工作流

3f7b3eb7ac 提交:feign

2651bfdeaa [feat]

1、修改预警查询问题。
2、增加工作流批量加签功能。

2f78be2b4e Merge remote-tracking branch 'origin/dev' into dev

855e915dde [feat]

1、修改预警查询问题。

e446b8bca4 提交

51deca2ed7 提交: AI预警实时推送逻辑修改

e2ec21d429 Merge remote-tracking branch 'origin/dev' into dev

b962532431 [feat]

1、集成rocketmq

1b0767a1e8 Merge remote-tracking branch 'origin/dev' into dev

d9ff5f76ff 赛邮服务配置用户+后台调用短信接口

9337904788 提交:实时与预警

788d6c0c06 Merge branch 'dev' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone into dev

e8aad6f968 提交:修改

aa12725241 星罗接口对接和视频流接口

cbd3cf974a 自动播放直播流

a12b6de33d Merge branch 'dev' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone into dev

7a4c75655b [bug]修改页面预警列表查询

679ff0ed8c 自动播放直播流

440e437c97 Merge remote-tracking branch 'origin/dev' into dev

e6c561a6ce 自动播放直播流

cc70dd8565 星罗接口对接和视频流接口

f82d9b9f85 Merge remote-tracking branch 'origin/dev' into dev

c69d7a6768 自动播放直播流

70a787720e Merge remote-tracking branch 'origin/dev' into dev

56d59d7ff7 提交

58133f37bb 星罗接口对接和视频流接口

dc642d750a 自动播放直播流

a3742d462f Merge remote-tracking branch 'origin/dev' into dev

5f12c29eb7 自动播放直播流

cdbbe257d7 [feat]

1、增加权限过滤

2b66362bd8 Merge remote-tracking branch 'origin/dev' into dev

b856267b91 提交

166149bdd7 工地-oss文件独立管理-配合天翼云OSS-要在nacos里system.yml配置osstianyi

ba750db3c6 Merge remote-tracking branch 'origin/dev' into dev

80d7e72bcb 自动播放直播流

04a8c898b3 Merge remote-tracking branch 'origin/dev' into dev

a0cf0071ed 工地-ai标签动态获取有效项(启用status)

a74ac3ceec 大疆开发-api+错误码对比管理

74dfbf1bf7 推流接口

65ec93eb85 Merge remote-tracking branch 'origin/dev' into dev

124d7ac453 推流接口

6b060c1d48 自动播放直播流

aa3ea1527b 推流接口

e1a66ecbe0 [feat]

1、回退功能
2、移交功能
3、增加案件号

61988570fe Merge remote-tracking branch 'origin/dev' into dev

ce1e5cbd75 [feat]

1、回退功能
2、移交功能
3、增加案件号

d44957773c 天翼云-minio配置修复，避免启动报错

d3a3107acc 提交;通知

1ab57a52c6 Merge branch 'dev' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone into dev

edead5b97d 提交

66c5aa1c04 [feat]第三方免登录认证

28a04a0a96 Merge remote-tracking branch 'origin/dev' into dev

yuanqiang merged commit 566e639cc0 into test 11 months ago

yuanqiang referenced this issue from a commit 11 months ago

Merge pull request 'dev' (#5) from dev into test

The pull request has been merged as 566e639cc0.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.