wangliwen
|
c2e64e630b
|
Merge branch 'master' into docker_package
|
2022-07-26 17:03:58 +08:00 |
|
wangliwen
|
df86ed661f
|
websocket定时心跳
|
2022-07-26 17:03:38 +08:00 |
|
wangliwen
|
cc50527b4b
|
Merge branch 'master' into docker_package
|
2022-07-26 16:29:28 +08:00 |
|
wangliwen
|
ec20e986fa
|
...
|
2022-07-26 16:29:15 +08:00 |
|
wangliwen
|
1969a1c0bd
|
Merge branch 'dev' into docker_package
|
2022-07-26 16:26:05 +08:00 |
|
wangliwen
|
8968c1017d
|
定时清理操作日志
|
2022-07-26 16:25:53 +08:00 |
|
wangliwen
|
3c5c26b7de
|
Merge branch 'master' into docker_package
|
2022-07-26 16:13:18 +08:00 |
|
wangliwen
|
b314c05072
|
...
|
2022-07-26 16:13:02 +08:00 |
|
wangliwen
|
83f6fb67df
|
Merge branch 'master' into docker_package
|
2022-07-26 15:37:11 +08:00 |
 dinggang
|
efdda05ec2
|
门户首页-推荐能力-去除重复能力
|
2022-07-26 15:34:13 +08:00 |
|
wangliwen
|
eb4c402866
|
换一下初始镜像
|
2022-07-26 14:07:12 +08:00 |
|
wangliwen
|
31cae23036
|
Merge branch 'master' into docker_package
|
2022-07-26 10:29:36 +08:00 |
|
wangliwen
|
a68d24f687
|
npe
|
2022-07-26 10:29:22 +08:00 |
|
wangliwen
|
ef5bb41a0f
|
Merge branch 'master' into docker_package
|
2022-07-25 19:04:54 +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
|
1a2c909f4c
|
Merge branch 'master' into docker_package
|
2022-07-25 16:00:27 +08:00 |
|
wangliwen
|
6fedef22c0
|
屮
|
2022-07-25 16:00:10 +08:00 |
|
wangliwen
|
37d511742c
|
Merge remote-tracking branch '备份/dev' into docker_package
|
2022-07-25 14:14:12 +08:00 |
|
wangliwen
|
88c75d5022
|
docker 启动调整jvm参数
|
2022-07-25 14:13:54 +08:00 |
|
yitonglei
|
f0cc8cc5a9
|
1、能力超市、基础设施、视频资源的列表查询增加gps坐标为空的判断
|
2022-07-25 14:01:45 +08:00 |
|
wangliwen
|
62c023a046
|
Merge branch 'master' into docker_package
|
2022-07-25 11:47:20 +08:00 |
|
wangliwen
|
5d1b7da56a
|
批量申请时 businesskey只记录5条id
|
2022-07-25 11:47:03 +08:00 |
|
wangliwen
|
cc70512cdd
|
Merge branch 'master' into docker_package
|
2022-07-25 10:52:06 +08:00 |
|
wangliwen
|
d113c6ec7a
|
已办任务接口，能力下架增加申请内容为 能力名称
|
2022-07-25 10:51:43 +08:00 |
|
wangliwen
|
3f9405ab88
|
Merge branch 'master' into docker_package
|
2022-07-25 10:20:45 +08:00 |
|
wangliwen
|
0b2844e246
|
能力上架审核被拒绝时，能力状态不正确的bug fix
|
2022-07-25 10:20:08 +08:00 |
|
wangliwen
|
001bae1711
|
Merge branch 'master' into docker_package
|
2022-07-22 18:44:17 +08:00 |
|
wangliwen
|
afaa8cb26c
|
.。
|
2022-07-22 18:44:04 +08:00 |
|
wangliwen
|
ca0bb90e1f
|
调整
|
2022-07-22 18:43:45 +08:00 |
|
wangliwen
|
9b0cbc88e6
|
Merge branch 'master' into docker_package
|
2022-07-22 17:54:29 +08:00 |
|
wangliwen
|
51ab0f7c78
|
屮
|
2022-07-22 17:54:17 +08:00 |
|
wangliwen
|
762dccbb91
|
Merge branch 'master' into docker_package
|
2022-07-22 17:35:50 +08:00 |
|
wangliwen
|
47e873ecab
|
。。。
|
2022-07-22 17:35:29 +08:00 |
|
wangliwen
|
488b42719f
|
Merge branch 'master' into docker_package
|
2022-07-22 17:21:58 +08:00 |
|
wangliwen
|
573c55687c
|
能力详情出是否通过
|
2022-07-22 17:21:45 +08:00 |
|
wangliwen
|
5092055091
|
Merge branch 'master' into docker_package
|
2022-07-22 17:14:03 +08:00 |
|
wangliwen
|
aad23ca5ee
|
资源详情返回 是否加入申购车
|
2022-07-22 17:11:21 +08:00 |
|
wangliwen
|
0d6347c964
|
Merge branch 'master' into docker_package
|
2022-07-22 16:47:50 +08:00 |
|
wangliwen
|
676a1d2e17
|
是否为基础设施的判断
|
2022-07-22 16:47:32 +08:00 |
|
wangliwen
|
555c023476
|
Merge branch 'master' into docker_package
|
2022-07-22 16:11:40 +08:00 |
|
wangliwen
|
4a4d21bf87
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-07-22 16:11:22 +08:00 |
|
wangliwen
|
373af4ba93
|
Merge remote-tracking branch '备份/dev' into docker_package
|
2022-07-22 16:10:43 +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 |
|
wangliwen
|
fe3c6bb939
|
Merge branch 'master' into docker_package
|
2022-07-22 15:45:47 +08:00 |
|
wangliwen
|
6c06060b16
|
Merge branch 'master' into dev
|
2022-07-22 15:45:34 +08:00 |
|
wangliwen
|
aa54a9a8fc
|
pageWithAttr增加是否加入申购车
|
2022-07-22 15:45:11 +08:00 |
|
dinggang
|
81b5b28743
|
1.修复金宏环境-能力统计-资源图谱-能力类型-能力集-按照数据资源查数据接口调用错误
|
2022-07-22 14:43:04 +08:00 |