 yitonglei
|
0ccdf069f8
|
1、根据新的流程重新梳理获取视频资源（地区和通道信息）
|
2022-07-29 09:31:47 +08:00 |
wangliwen
|
baab5ac0b3
|
Merge branch 'dev'
|
2022-07-28 20:06:42 +08:00 |
 dinggang
|
7586127226
|
西海岸基础设施需求修改
|
2022-07-28 20:03:59 +08:00 |
|
wangliwen
|
7bf0b2a33e
|
Merge branch 'dev'
|
2022-07-28 19:01:10 +08:00 |
|
wangliwen
|
e74cc546f1
|
发送站内信 加点异常日志
|
2022-07-28 19:00:55 +08:00 |
|
wangliwen
|
1e624749cb
|
Merge branch 'dev'
|
2022-07-28 17:41:13 +08:00 |
|
wangliwen
|
fdbf32c47c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-28 17:41:05 +08:00 |
|
wangliwen
|
47888777f8
|
发送站内信There is no session 的处理
|
2022-07-28 17:40:52 +08:00 |
|
dinggang
|
0628d738c4
|
bugfix
|
2022-07-28 17:30:13 +08:00 |
|
dinggang
|
645368398d
|
bugfix
|
2022-07-28 16:55:04 +08:00 |
|
wangliwen
|
6602e9c07d
|
Merge branch 'dev'
|
2022-07-28 16:31:19 +08:00 |
|
dinggang
|
1f606f0c18
|
1.西海岸基础设施需求修改
2.shiro的jsessionid问题修复V1.0
3.新增基础设施sql导入
|
2022-07-28 16:28:34 +08:00 |
|
wangliwen
|
5349c03e91
|
Merge branch 'dev'
|
2022-07-28 10:44:26 +08:00 |
|
wangliwen
|
ee1d2550d3
|
...
|
2022-07-28 10:44:11 +08:00 |
|
wangliwen
|
ac4347687f
|
Merge branch 'dev'
|
2022-07-27 17:10:13 +08:00 |
|
dinggang
|
5eb0184bd4
|
西海岸基础设施需求修改
|
2022-07-27 17:07:58 +08:00 |
|
wangliwen
|
b1aaf5e5bc
|
Merge branch 'dev'
|
2022-07-27 14:20:59 +08:00 |
|
wangliwen
|
3281c72fff
|
...
|
2022-07-27 14:20:50 +08:00 |
|
wangliwen
|
58f9ecc762
|
Merge branch 'dev'
|
2022-07-27 10:24:51 +08:00 |
|
wangliwen
|
fdac3a7a86
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-27 10:24:36 +08:00 |
|
wangliwen
|
1b26354533
|
Merge branch 'dev'
|
2022-07-27 10:22:54 +08:00 |
|
wangliwen
|
32f9558052
|
....
|
2022-07-27 10:21:45 +08:00 |
|
dinggang
|
26830e19e8
|
前台退出未清除后台登录用户bugfix-1.0
|
2022-07-27 10:06:31 +08:00 |
|
wangliwen
|
559a1a4f55
|
...
|
2022-07-26 19:45:27 +08:00 |
|
yitonglei
|
68cf80df1f
|
手动获取视频地区信息后保存地区信息前先清空表格t_camera_organization
|
2022-07-26 17:55:37 +08:00 |
|
wangliwen
|
4f03039109
|
...
|
2022-07-26 17:08:06 +08:00 |
|
wangliwen
|
df86ed661f
|
websocket定时心跳
|
2022-07-26 17:03:38 +08:00 |
|
wangliwen
|
ec20e986fa
|
...
|
2022-07-26 16:29:15 +08:00 |
|
wangliwen
|
8968c1017d
|
定时清理操作日志
|
2022-07-26 16:25:53 +08:00 |
|
wangliwen
|
b314c05072
|
...
|
2022-07-26 16:13:02 +08:00 |
|
dinggang
|
efdda05ec2
|
门户首页-推荐能力-去除重复能力
|
2022-07-26 15:34:13 +08:00 |
|
wangliwen
|
a68d24f687
|
npe
|
2022-07-26 10:29:22 +08:00 |
|
wangliwen
|
d61043f00d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-25 19:04:36 +08:00 |
|
yitonglei
|
4d2141d807
|
增加视频资源申请时查询该资源是否在库中的判断cameraChannelService.checkCameraIfExists
|
2022-07-25 18:00:29 +08:00 |
|
dinggang
|
115944b8e8
|
管理系统-能力挂接列表新增显示所属部门字段
|
2022-07-25 17:19:23 +08:00 |
|
wangliwen
|
6fedef22c0
|
屮
|
2022-07-25 16:00:10 +08:00 |
|
yitonglei
|
f0cc8cc5a9
|
1、能力超市、基础设施、视频资源的列表查询增加gps坐标为空的判断
|
2022-07-25 14:01:45 +08:00 |
|
wangliwen
|
5d1b7da56a
|
批量申请时 businesskey只记录5条id
|
2022-07-25 11:47:03 +08:00 |
|
wangliwen
|
d113c6ec7a
|
已办任务接口，能力下架增加申请内容为 能力名称
|
2022-07-25 10:51:43 +08:00 |
|
wangliwen
|
0b2844e246
|
能力上架审核被拒绝时，能力状态不正确的bug fix
|
2022-07-25 10:20:08 +08:00 |
|
wangliwen
|
afaa8cb26c
|
.。
|
2022-07-22 18:44:04 +08:00 |
|
wangliwen
|
ca0bb90e1f
|
调整
|
2022-07-22 18:43:45 +08:00 |
|
wangliwen
|
51ab0f7c78
|
屮
|
2022-07-22 17:54:17 +08:00 |
|
wangliwen
|
47e873ecab
|
。。。
|
2022-07-22 17:35:29 +08:00 |
|
wangliwen
|
573c55687c
|
能力详情出是否通过
|
2022-07-22 17:21:45 +08:00 |
|
wangliwen
|
aad23ca5ee
|
资源详情返回 是否加入申购车
|
2022-07-22 17:11:21 +08:00 |
|
wangliwen
|
676a1d2e17
|
是否为基础设施的判断
|
2022-07-22 16:47:32 +08:00 |
|
wangliwen
|
4a4d21bf87
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-07-22 16:11:22 +08:00 |
|
wangliwen
|
888e148fb4
|
。。。
|
2022-07-22 16:10:33 +08:00 |
|
yitonglei
|
72cf26ec72
|
1、能力集市-基础设施页面的列表查询的sql语句增加 check_status 为空的判断
|
2022-07-22 16:06:44 +08:00 |