wangliwen
|
f4939b34f4
|
...
|
2022-08-25 14:00:11 +08:00 |
wangliwen
|
a87bb573e9
|
...
|
2022-08-25 13:31:30 +08:00 |
wangliwen
|
6a306a8a13
|
调整跨区判断
|
2022-08-25 10:00:13 +08:00 |
wangliwen
|
12393ec5cc
|
更新能力申请模型v3
|
2022-08-25 09:00:21 +08:00 |
wangliwen
|
94c012ee44
|
Merge branch 'dev'
|
2022-08-24 18:54:11 +08:00 |
wangliwen
|
515ad62bd6
|
接口开启gzip压缩
|
2022-08-24 18:53:52 +08:00 |
lizhicheng
|
e1d1d964ab
|
区、市监听器:修改表单字段获取逻辑
|
2022-08-24 18:10:21 +08:00 |
wangliwen
|
738208ba2e
|
applyState 字段返回值不一致的问题fix
|
2022-08-24 17:13:10 +08:00 |
wangliwen
|
6da1b5b6b1
|
npe fix
|
2022-08-24 16:22:02 +08:00 |
huangweixiong
|
9b2d222ebf
|
修改日志输出级别
|
2022-08-24 15:30:56 +08:00 |
huangweixiong
|
16c0d2ad69
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform: (32 commits)
编目更新
...
...
能力申请v3 未查到审批人时,使用配置文件预设默认审核人
...
区、市审批流程监听器完善
能力申请模型更新
...
能力申请v3 新增监听器
...
npe
java.lang.NumberFormatException
修改getImgServices的子查询sql语句为兼容mysql5.7
修改sql
。。
增加能力申请V3 模型
整理代码
...
cim 根据应用领域查询图层服务 和 查询智能算法组件
1.cim模块统计查询及列表查询 2.编目及字典更新
...
|
2022-08-24 15:01:16 +08:00 |
huangweixiong
|
4c7df1cfb4
|
监控视频失效重试
|
2022-08-24 15:00:59 +08:00 |
huangweixiong
|
55e3b4a44e
|
网关重启适配
|
2022-08-24 15:00:40 +08:00 |
dinggang
|
0ac54c1207
|
编目更新
|
2022-08-24 10:37:25 +08:00 |
wangliwen
|
b41e48528d
|
...
|
2022-08-24 09:33:27 +08:00 |
wangliwen
|
2e79af48c1
|
...
|
2022-08-23 11:50:28 +08:00 |
wangliwen
|
6e7f17b48a
|
能力申请v3 未查到审批人时,使用配置文件预设默认审核人
|
2022-08-23 10:32:38 +08:00 |
wangliwen
|
09e2c34e31
|
...
|
2022-08-22 18:21:16 +08:00 |
Koi-tsk
|
c5ab16e7f9
|
区、市审批流程监听器完善
|
2022-08-22 17:59:18 +08:00 |
wangliwen
|
d4c88b8d20
|
能力申请模型更新
|
2022-08-22 16:44:30 +08:00 |
wangliwen
|
e88e596699
|
...
|
2022-08-22 13:59:40 +08:00 |
wangliwen
|
183a64c7ac
|
能力申请v3 新增监听器
|
2022-08-22 11:32:47 +08:00 |
huangweixiong
|
c51e335f9f
|
网关重启适配
|
2022-08-22 11:11:02 +08:00 |
wangliwen
|
9abb064ece
|
...
|
2022-08-22 10:37:58 +08:00 |
wangliwen
|
81db400dec
|
npe
|
2022-08-22 10:14:22 +08:00 |
wangliwen
|
28e28430f0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-22 09:54:25 +08:00 |
wangliwen
|
857681bcac
|
java.lang.NumberFormatException
|
2022-08-22 09:54:00 +08:00 |
yitonglei
|
26ee20e34c
|
修改getImgServices的子查询sql语句为兼容mysql5.7
|
2022-08-22 09:01:26 +08:00 |
yitonglei
|
b428b74e90
|
修改sql
|
2022-08-19 16:25:52 +08:00 |
dinggang
|
f65347f39f
|
。。
|
2022-08-19 16:02:56 +08:00 |
wangliwen
|
aa3a132421
|
Merge branch 'master' into dev
|
2022-08-19 15:53:32 +08:00 |
wangliwen
|
1816f2b9de
|
增加能力申请V3 模型
|
2022-08-19 15:53:08 +08:00 |
yitonglei
|
f1d87b3907
|
整理代码
|
2022-08-19 14:35:56 +08:00 |
wangliwen
|
1f7a61a601
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-19 14:22:19 +08:00 |
wangliwen
|
999c265c7e
|
...
|
2022-08-19 14:22:10 +08:00 |
yitonglei
|
e503565a85
|
cim 根据应用领域查询图层服务 和 查询智能算法组件
|
2022-08-19 14:11:06 +08:00 |
dinggang
|
6dcee405c5
|
1.cim模块统计查询及列表查询
2.编目及字典更新
|
2022-08-19 11:59:05 +08:00 |
wangliwen
|
f4418bae13
|
能力申请V3 批量进行能力申请
|
2022-08-19 11:29:23 +08:00 |
wangliwen
|
13db3a21bc
|
能力申请V3补充
|
2022-08-19 11:20:53 +08:00 |
wangliwen
|
08c05a2a55
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-19 10:04:04 +08:00 |
dinggang
|
a20fd1f5c8
|
cim模块
|
2022-08-19 10:03:14 +08:00 |
wangliwen
|
633339f64b
|
能力申请 V3
|
2022-08-19 10:03:06 +08:00 |
wangliwen
|
368d78f48f
|
...
|
2022-08-18 18:14:08 +08:00 |
wangliwen
|
92542c2ad8
|
TODO 调整
|
2022-08-18 14:53:41 +08:00 |
wangliwen
|
964bf55f12
|
TODO abilityprocess_v3 能力申请流程的发起
|
2022-08-18 10:01:04 +08:00 |
Koi-tsk
|
617ecd64c8
|
初步完成区、市审批流程监听器
|
2022-08-17 17:41:55 +08:00 |
wangliwen
|
4446657af2
|
500了
|
2022-08-17 16:27:11 +08:00 |
wangliwen
|
0eb62c0885
|
增加下架附件文件名
|
2022-08-17 16:04:23 +08:00 |
wangliwen
|
4028588ea7
|
下架新增录入字段
|
2022-08-17 15:43:27 +08:00 |
wangliwen
|
b7ce167d5f
|
增加取消置顶接口
|
2022-08-17 11:16:34 +08:00 |
huangweixiong
|
9bcdd78bae
|
网关重启适配
|
2022-08-17 11:04:49 +08:00 |
huangweixiong
|
98a18a1ddd
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform: (25 commits)
置顶存在缓存
...
会议室预约的表描述字段扩增
菜单新增会议室
会议室预约的新增表
能力广场和能力集市资源排序按指定方式排序修改 门户首页最新,最热查询排除知识库
total 排序将置顶放前面
...
能力广场和能力集市资源排序按指定方式排序
npe
...
npe
npe
归并为一个排序
屮
...
...
屮
stream 的排序模式
。。。
...
|
2022-08-17 11:01:16 +08:00 |
huangweixiong
|
ebe3d33994
|
适配网关重启
|
2022-08-17 11:00:59 +08:00 |
wangliwen
|
1f7d1e69db
|
置顶存在缓存
|
2022-08-17 10:17:02 +08:00 |
wangliwen
|
afbfd42c07
|
...
|
2022-08-17 09:13:05 +08:00 |
zhangzhikang
|
3697fbf5ee
|
会议室预约的表描述字段扩增
|
2022-08-16 17:39:34 +08:00 |
dinggang
|
1e5231a197
|
菜单新增会议室
|
2022-08-16 13:59:13 +08:00 |
zhangzhikang
|
b780ea9ad8
|
会议室预约的新增表
|
2022-08-16 14:02:48 +08:00 |
dinggang
|
408baba4af
|
能力广场和能力集市资源排序按指定方式排序修改
门户首页最新,最热查询排除知识库
|
2022-08-16 10:26:47 +08:00 |
wangliwen
|
42d7d1a27c
|
total 排序将置顶放前面
|
2022-08-16 10:17:37 +08:00 |
wangliwen
|
4000c2d30e
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-15 18:56:17 +08:00 |
wangliwen
|
fb1eaef889
|
...
|
2022-08-15 18:56:04 +08:00 |
dinggang
|
9e362f3ae9
|
能力广场和能力集市资源排序按指定方式排序
|
2022-08-15 18:55:05 +08:00 |
wangliwen
|
8574f26607
|
npe
|
2022-08-15 18:44:57 +08:00 |
wangliwen
|
6a9ae0e939
|
...
|
2022-08-15 18:37:10 +08:00 |
wangliwen
|
469a0d9d32
|
npe
|
2022-08-15 18:18:44 +08:00 |
wangliwen
|
d79578665f
|
npe
|
2022-08-15 18:12:18 +08:00 |
wangliwen
|
d7b4075e7f
|
归并为一个排序
|
2022-08-15 18:01:09 +08:00 |
wangliwen
|
a75dc249c9
|
屮
|
2022-08-15 17:47:33 +08:00 |
wangliwen
|
4fa7825bcd
|
...
|
2022-08-15 17:37:48 +08:00 |
wangliwen
|
6e9868e0f7
|
...
|
2022-08-15 17:05:33 +08:00 |
wangliwen
|
4b308ed69f
|
屮
|
2022-08-15 16:50:52 +08:00 |
wangliwen
|
a8cd7f8436
|
stream 的排序模式
|
2022-08-15 16:34:11 +08:00 |
wangliwen
|
5b63e648e2
|
。。。
|
2022-08-15 16:11:06 +08:00 |
wangliwen
|
a26819491d
|
屮
|
2022-08-15 16:03:20 +08:00 |
wangliwen
|
bda6596caa
|
....
|
2022-08-15 15:47:06 +08:00 |
wangliwen
|
9565b4fe82
|
结果分页的排序
|
2022-08-15 15:29:54 +08:00 |
wangliwen
|
b3b4ca16a6
|
屮
|
2022-08-15 15:16:59 +08:00 |
wangliwen
|
ce881d43de
|
total排序时,置顶优于total
|
2022-08-15 15:08:20 +08:00 |
huangweixiong
|
ed20fbd0a4
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
补充置顶状态与置顶时间
屮
全局搜索统计各类型能力数量
...
..
..
增加置顶接口
排序修改
sql
...
增加能力置顶字段
parallelStream 使用自定义 ForkJoinPool防止任务堆积
屮
...
...
会议室功能后端开发
|
2022-08-15 14:07:41 +08:00 |
huangweixiong
|
d5ca1cee4c
|
网关配置ip与监控ip分开
|
2022-08-15 14:07:22 +08:00 |
wangliwen
|
42f5f3e46a
|
补充置顶状态与置顶时间
|
2022-08-15 10:48:10 +08:00 |
wangliwen
|
61995e999e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-15 10:23:23 +08:00 |
wangliwen
|
5b5ec4d05d
|
屮
|
2022-08-15 10:23:10 +08:00 |
dinggang
|
2241e2808d
|
全局搜索统计各类型能力数量
|
2022-08-15 09:30:39 +08:00 |
wangliwen
|
e602317a7a
|
...
|
2022-08-12 17:47:53 +08:00 |
dinggang
|
c7ff499956
|
..
|
2022-08-12 17:35:04 +08:00 |
dinggang
|
ce07b0ea32
|
..
|
2022-08-12 17:21:35 +08:00 |
wangliwen
|
81e13e7824
|
Merge branch 'master' into dev
|
2022-08-12 17:18:43 +08:00 |
wangliwen
|
7d4f3cdb57
|
增加置顶接口
|
2022-08-12 17:18:20 +08:00 |
dinggang
|
e51668cc4d
|
排序修改
|
2022-08-12 16:58:35 +08:00 |
wangliwen
|
6e7c224109
|
sql
|
2022-08-12 16:29:48 +08:00 |
wangliwen
|
ab11836c23
|
...
|
2022-08-12 16:26:22 +08:00 |
wangliwen
|
2ccc878eda
|
增加能力置顶字段
|
2022-08-12 16:12:50 +08:00 |
wangliwen
|
f45e3ea2f4
|
parallelStream 使用自定义 ForkJoinPool防止任务堆积
|
2022-08-12 14:11:34 +08:00 |
wangliwen
|
8980f61b1c
|
屮
|
2022-08-12 10:41:11 +08:00 |
dinggang
|
f6509b5e19
|
...
|
2022-08-11 14:55:20 +08:00 |
dinggang
|
4aee184562
|
...
|
2022-08-11 14:02:35 +08:00 |
zhangzhikang
|
6b98b44d48
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-11 09:27:35 +08:00 |
zhangzhikang
|
e4ba0fcbea
|
会议室功能后端开发
|
2022-08-11 09:20:29 +08:00 |
lizhicheng
|
a01ecfc0fb
|
融合服务接口优化
|
2022-08-10 19:43:17 +08:00 |
dinggang
|
65dc6fae91
|
...
|
2022-08-10 14:02:19 +08:00 |
huangweixiong
|
201a092ed0
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
能力广场-应用资源列表查询
编目更新
|
2022-08-10 11:56:10 +08:00 |
huangweixiong
|
bbefe4fff1
|
增加网关注册接口
|
2022-08-10 11:55:54 +08:00 |
dinggang
|
0f493bb87c
|
能力广场-应用资源列表查询
|
2022-08-09 16:52:04 +08:00 |
dinggang
|
1dee7f1edc
|
编目更新
|
2022-08-09 10:02:53 +08:00 |
huangweixiong
|
b071097e96
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
管理系统-工作台-部门待办列表查询及部门已办列表查询新增申请用户所在部门及申请内容字段
|
2022-08-08 16:48:12 +08:00 |
huangweixiong
|
51fac0eb09
|
网关测试用接口
|
2022-08-08 16:45:46 +08:00 |
dinggang
|
a94fce5066
|
管理系统-工作台-部门待办列表查询及部门已办列表查询新增申请用户所在部门及申请内容字段
|
2022-08-08 15:36:33 +08:00 |
huangweixiong
|
1e8c970c39
|
能力挂接注册网关
|
2022-08-08 15:17:03 +08:00 |
wangliwen
|
f7af710466
|
npe
|
2022-08-08 14:47:15 +08:00 |
wangliwen
|
33c2b30a60
|
...
|
2022-08-08 10:46:13 +08:00 |
wangliwen
|
c1cd6de9e3
|
屮
|
2022-08-08 09:58:47 +08:00 |
wangliwen
|
4d53ef4c99
|
TODO 异步优化
|
2022-08-08 09:43:57 +08:00 |
wangliwen
|
50696e2617
|
新赋予部门审批人权限用户分配审批去啊权重更大
|
2022-08-06 09:48:45 +08:00 |
dinggang
|
e5da46fd4d
|
sql更新
|
2022-08-05 17:34:53 +08:00 |
wangliwen
|
b9a489beac
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-05 17:14:49 +08:00 |
wangliwen
|
16df18cddf
|
异步处理 能力申请
|
2022-08-05 17:14:44 +08:00 |
yitonglei
|
20c73efac5
|
修改ResourceDao.xml的selectByAppArea,增加了条件 AND tda.attr_type = '应用领域'
|
2022-08-05 15:10:27 +08:00 |
wangliwen
|
1047569a77
|
。。。
|
2022-08-05 12:48:03 +08:00 |
wangliwen
|
36ad699d38
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-05 11:56:26 +08:00 |
wangliwen
|
c065c04703
|
资源部门被删
|
2022-08-05 11:56:16 +08:00 |
dinggang
|
603d107b65
|
...
|
2022-08-05 10:41:55 +08:00 |
wangliwen
|
0666081fdc
|
Merge branch 'dev'
|
2022-08-05 10:25:20 +08:00 |
wangliwen
|
166fe05195
|
。。。
|
2022-08-05 10:25:00 +08:00 |
dinggang
|
8953cbd867
|
减少日志输出
|
2022-08-05 09:59:47 +08:00 |
wangliwen
|
a1bbd95591
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-05 09:46:19 +08:00 |
wangliwen
|
e4736d2ac4
|
部门审批人用户状态被停用时,流程不再分配给该用户
|
2022-08-05 09:46:09 +08:00 |
dinggang
|
a0901114ec
|
..
|
2022-08-05 09:18:29 +08:00 |
wangliwen
|
5023c7f288
|
屮
|
2022-08-05 09:09:14 +08:00 |
huangweixiong
|
086c9ff165
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
主动终止时 驳回置false
getByApplyFlag增加backToFirst标识
驳回重复通知
|
2022-08-04 17:24:49 +08:00 |
huangweixiong
|
082a6612ec
|
开启网关数据同步
|
2022-08-04 17:24:25 +08:00 |
wangliwen
|
f2c55b7718
|
主动终止时 驳回置false
|
2022-08-04 10:57:36 +08:00 |
wangliwen
|
c728ff3960
|
getByApplyFlag增加backToFirst标识
|
2022-08-04 10:16:51 +08:00 |
wangliwen
|
f47682c7f3
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-03 18:40:04 +08:00 |
wangliwen
|
0753dcf27c
|
驳回重复通知
|
2022-08-03 18:39:18 +08:00 |
huangweixiong
|
359e49f7db
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
...
|
2022-08-03 18:06:50 +08:00 |
wangliwen
|
ec2b030a30
|
...
|
2022-08-03 18:05:20 +08:00 |
huangweixiong
|
ebfbe769a6
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
资源上架异常
。。。
pageWithAttrs补充返回approveStatus字段值
。。。
配置文件新增默认审批人id
管理系统-用户管理-列表查询新增根据用户姓名模糊查询
被驳回 消息通知
被驳回时发送消息通知
|
2022-08-03 18:05:05 +08:00 |
huangweixiong
|
8e69ca0526
|
网关总数同步
|
2022-08-03 18:04:47 +08:00 |
wangliwen
|
c27816d13a
|
资源上架异常
|
2022-08-03 17:49:04 +08:00 |
wangliwen
|
6159b3b1ba
|
。。。
|
2022-08-03 16:49:52 +08:00 |
wangliwen
|
654ef21298
|
pageWithAttrs补充返回approveStatus字段值
|
2022-08-03 16:39:33 +08:00 |
wangliwen
|
d59ebd507b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-03 16:28:18 +08:00 |
wangliwen
|
8b40e077d1
|
。。。
|
2022-08-03 16:27:54 +08:00 |
dinggang
|
d945bad3a5
|
配置文件新增默认审批人id
|
2022-08-03 16:26:04 +08:00 |
dinggang
|
d0c8b4ae5f
|
管理系统-用户管理-列表查询新增根据用户姓名模糊查询
|
2022-08-03 15:22:03 +08:00 |
wangliwen
|
46ccea4556
|
被驳回 消息通知
|
2022-08-03 15:09:49 +08:00 |
wangliwen
|
527266a9b5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-03 14:41:08 +08:00 |
wangliwen
|
1ec9b2db5c
|
被驳回时发送消息通知
|
2022-08-03 14:40:42 +08:00 |
huangweixiong
|
259f1b757a
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
..
1、修改获取基础设施-视频资源的相关sql操作的表为cache表
发起者终止流程
存在欺诈行为?
npe
删除所有运行中的流程接口
...
npe
屮
..
。。。
???
用户主动终止流程
1.编目更新 2.工作台部门待办列表查询增加申请人姓名bugfix
通过实例id 终止流程
1、修改因为合并代码出现的基础设施-视频资源,点击左侧树报错的问题,原因是sql语句去组织cache表中查询了
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
..
超级管理员挂载能力时 无部门id问题
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/gateway/service/MonitorServiceV2.java
|
2022-08-03 14:27:30 +08:00 |
huangweixiong
|
04db7c6dc5
|
网关重启数据失效适配
|
2022-08-03 14:24:35 +08:00 |
dinggang
|
af5e237b3d
|
..
|
2022-08-03 11:04:53 +08:00 |
yitonglei
|
975d6654ce
|
1、修改获取基础设施-视频资源的相关sql操作的表为cache表
|
2022-08-02 18:13:25 +08:00 |
wangliwen
|
d0df922c62
|
发起者终止流程
|
2022-08-02 16:58:48 +08:00 |
wangliwen
|
a04745eaab
|
存在欺诈行为?
|
2022-08-02 15:55:58 +08:00 |
wangliwen
|
d170f9c177
|
npe
|
2022-08-02 15:40:46 +08:00 |
wangliwen
|
95989cc59c
|
删除所有运行中的流程接口
|
2022-08-02 15:32:08 +08:00 |
wangliwen
|
d96f797813
|
...
|
2022-08-02 15:08:01 +08:00 |
wangliwen
|
cbd91df644
|
npe
|
2022-08-02 14:49:03 +08:00 |
wangliwen
|
bbf677b513
|
屮
|
2022-08-02 14:08:57 +08:00 |
wangliwen
|
ef450bbf01
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-02 13:46:03 +08:00 |
dinggang
|
508c73df6b
|
..
|
2022-08-02 13:45:31 +08:00 |
wangliwen
|
d21c3b7099
|
。。。
|
2022-08-02 13:44:53 +08:00 |
wangliwen
|
6a12463098
|
???
|
2022-08-02 12:00:40 +08:00 |
wangliwen
|
621920daf9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-02 11:29:32 +08:00 |
wangliwen
|
d5fd0d2858
|
用户主动终止流程
|
2022-08-02 11:29:24 +08:00 |
dinggang
|
8f183162b5
|
1.编目更新
2.工作台部门待办列表查询增加申请人姓名bugfix
|
2022-08-02 10:39:32 +08:00 |
wangliwen
|
fe7b406f52
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-02 09:28:35 +08:00 |
wangliwen
|
5174a75b35
|
通过实例id 终止流程
|
2022-08-02 09:28:12 +08:00 |
yitonglei
|
95eb94f885
|
1、修改因为合并代码出现的基础设施-视频资源,点击左侧树报错的问题,原因是sql语句去组织cache表中查询了
|
2022-08-02 09:23:13 +08:00 |
yitonglei
|
ca9133004a
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-01 16:17:54 +08:00 |
dinggang
|
4d8f0c63ae
|
..
|
2022-08-01 16:11:59 +08:00 |
wangliwen
|
bb3d25d62f
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-01 14:40:48 +08:00 |
wangliwen
|
124940fc04
|
超级管理员挂载能力时 无部门id问题
|
2022-08-01 14:36:59 +08:00 |
huangweixiong
|
a4e6dad451
|
Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform: (80 commits)
1.配置文件修改 2.融合服务bugfix
1、修改大数据局配置文件,在最后增加了一个同步label标签表的数据库连接 2、简单修改了获取视频资源的部分代码
1、flyway提交的sql改版本号为4.4
配置文件修改
西海岸基础设施视频资源来源修改
西海岸基础设施视频资源来源修改
1、增加获取视频资源过程中2张缓存表的定义
..
融合服务完善
1、代码注释的修改
..
no message
1、自动获取视频资源部门和通道信息过程中所使用的RestTemplate不使用框架定义的而使用新定义的(主要是重新配置超时时间)
..
1、根据新的流程重新梳理获取视频资源(地区和通道信息)
西海岸基础设施需求修改
发送站内信 加点异常日志
发送站内信There is no session 的处理
bugfix
bugfix
...
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java
# renren-admin/src/main/java/io/renren/modules/processForm/service/ApiGatewayService.java
# renren-admin/src/main/resources/application-prod.yml
|
2022-08-01 14:33:05 +08:00 |
huangweixiong
|
9279ecf139
|
网关第二次对接
|
2022-08-01 11:41:12 +08:00 |
dinggang
|
8b51c0f378
|
1.配置文件修改
2.融合服务bugfix
|
2022-08-01 11:22:29 +08:00 |
yitonglei
|
8628a34b1e
|
1、修改大数据局配置文件,在最后增加了一个同步label标签表的数据库连接
2、简单修改了获取视频资源的部分代码
|
2022-08-01 11:02:26 +08:00 |
huangweixiong
|
61898cbcdc
|
修复没有满足网关申请数据时的审批标注
|
2022-08-01 11:02:00 +08:00 |
wangliwen
|
b68daeda1c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-01 10:13:33 +08:00 |
yitonglei
|
ff3e590dda
|
1、flyway提交的sql改版本号为4.4
|
2022-08-01 10:04:45 +08:00 |
dinggang
|
00651bc910
|
配置文件修改
|
2022-08-01 10:00:40 +08:00 |
dinggang
|
bb13969a1a
|
西海岸基础设施视频资源来源修改
|
2022-08-01 09:56:31 +08:00 |
dinggang
|
0e6984fb85
|
西海岸基础设施视频资源来源修改
|
2022-07-30 18:53:36 +08:00 |
wangliwen
|
a26fce4ddb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-29 18:04:09 +08:00 |
yitonglei
|
e1327c7fee
|
1、增加获取视频资源过程中2张缓存表的定义
|
2022-07-29 17:57:29 +08:00 |
dinggang
|
4760fa1898
|
..
|
2022-07-29 17:52:26 +08:00 |
lizhicheng
|
b525a1d50a
|
融合服务完善
|
2022-07-29 16:48:23 +08:00 |
wangliwen
|
79807f44e2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-29 13:55:00 +08:00 |
yitonglei
|
c874e7f9cf
|
1、代码注释的修改
|
2022-07-29 12:05:22 +08:00 |
dinggang
|
20c21aabf7
|
..
|
2022-07-29 11:30:17 +08:00 |
yitonglei
|
353485ee04
|
no message
|
2022-07-29 11:30:09 +08:00 |
yitonglei
|
63125fa2c5
|
1、自动获取视频资源部门和通道信息过程中所使用的RestTemplate不使用框架定义的而使用新定义的(主要是重新配置超时时间)
|
2022-07-29 11:29:18 +08:00 |
dinggang
|
52c4715b8f
|
..
|
2022-07-29 10:43:29 +08:00 |
yitonglei
|
0ccdf069f8
|
1、根据新的流程重新梳理获取视频资源(地区和通道信息)
|
2022-07-29 09:31:47 +08:00 |
dinggang
|
7586127226
|
西海岸基础设施需求修改
|
2022-07-28 20:03:59 +08:00 |
wangliwen
|
e74cc546f1
|
发送站内信 加点异常日志
|
2022-07-28 19:00:55 +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 |
dinggang
|
1f606f0c18
|
1.西海岸基础设施需求修改
2.shiro的jsessionid问题修复V1.0
3.新增基础设施sql导入
|
2022-07-28 16:28:34 +08:00 |
wangliwen
|
ee1d2550d3
|
...
|
2022-07-28 10:44:11 +08:00 |
dinggang
|
5eb0184bd4
|
西海岸基础设施需求修改
|
2022-07-27 17:07:58 +08:00 |
wangliwen
|
3281c72fff
|
...
|
2022-07-27 14:20:50 +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
|
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 |
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 |
wangliwen
|
c950efc96e
|
已办流程查询流程内参数
|
2022-07-22 13:32:23 +08:00 |
yitonglei
|
375d482ce2
|
1、flyway V4.1 改为V4.2,语句的文件存放地址改为resources/db下
|
2022-07-22 12:03:23 +08:00 |
wangliwen
|
7f59e33101
|
Merge branch 'dev' of http://15.2.21.221:3000/wangliwen/share-platform into dev
|
2022-07-22 11:57:54 +08:00 |
wangliwen
|
af7c18df12
|
已办任务内出现待办的问题解决
|
2022-07-22 11:57:28 +08:00 |
yitonglei
|
6f72e38a56
|
1、flyway增加V4.1,新增表t_region
2、修改基础设施页面地图中根据区域聚合查询的方法,区市信息以t_region表为准
|
2022-07-22 11:22:39 +08:00 |
wangliwen
|
1ebd70df03
|
调整mysql 全文索引使用自然语言搜索模式
|
2022-07-22 10:28:37 +08:00 |
yitonglei
|
fc66ef062b
|
同步摄像头通道信息后删除掉经纬度有空的通道
|
2022-07-21 18:18:26 +08:00 |
wangliwen
|
8de4de904f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-21 17:30:17 +08:00 |
wangliwen
|
66ae7d2fe6
|
...
|
2022-07-21 17:29:08 +08:00 |
dinggang
|
6bdd4b3c30
|
1.能力统计部门数统计逻辑修改
|
2022-07-21 17:28:13 +08:00 |
wangliwen
|
92dc144d7d
|
拆单 是否完成
|
2022-07-21 16:58:03 +08:00 |
wangliwen
|
7bdbecfe63
|
。。。
|
2022-07-21 16:33:20 +08:00 |
wangliwen
|
412ef1cc78
|
拆单审核所有流程是否完成
|
2022-07-21 16:31:22 +08:00 |
wangliwen
|
0ac8ef8940
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-21 15:59:57 +08:00 |
wangliwen
|
544a673f2a
|
...websocket先收到消息?
|
2022-07-21 15:59:36 +08:00 |
dinggang
|
67f8811b21
|
...
|
2022-07-21 15:40:52 +08:00 |
wangliwen
|
4b99279d87
|
审核结束消息通知bug与能力申请节点不进入能力申请异常
|
2022-07-21 15:33:59 +08:00 |
wangliwen
|
6fae1071ff
|
...
|
2022-07-21 15:18:31 +08:00 |
wangliwen
|
2b6165be0f
|
websocket 发送站内信通知
|
2022-07-21 14:27:24 +08:00 |
wangliwen
|
abbabe2e9a
|
npe
|
2022-07-21 11:44:27 +08:00 |
wangliwen
|
6a50553545
|
jackson允许出现特殊字符和转义符
|
2022-07-21 11:04:11 +08:00 |
wangliwen
|
20b7a2dccd
|
站内信通知异常
|
2022-07-21 10:54:25 +08:00 |
wangliwen
|
aad70245d8
|
前端无法展示异常信息
|
2022-07-21 10:41:46 +08:00 |
wangliwen
|
7e53cac06c
|
Merge branch 'master' into dev
|
2022-07-21 10:02:30 +08:00 |
wangliwen
|
76255c5ff3
|
...
|
2022-07-21 10:02:03 +08:00 |
dinggang
|
55ac3b8a60
|
1.编目更新
2.bugfix
|
2022-07-21 09:51:32 +08:00 |
wangliwen
|
162b016d36
|
下架支持附件
|
2022-07-21 09:40:55 +08:00 |
dinggang
|
7632d92ac2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-20 18:15:03 +08:00 |
dinggang
|
d7c0fa6dc2
|
1.新增菜单初始化数据sql
2.编目更新
3.bugfix
|
2022-07-20 18:14:34 +08:00 |
wangliwen
|
935f8f1588
|
...
|
2022-07-20 18:14:05 +08:00 |
wangliwen
|
41a06c660c
|
...
|
2022-07-20 17:35:46 +08:00 |
wangliwen
|
9f510817ff
|
tabilityapplication/in_use_page 参数缺少注解
|
2022-07-20 17:17:58 +08:00 |
huangweixiong
|
e729b95d2d
|
Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform: (29 commits)
屮
...
???
。。。
西海岸获取hls流地址更正
增加 根据能力资源id获取该能力申请使用分页接口
申购车模糊查询
.
新增日志清除任务
能力申请全为免批资源时,流程节点默认审核通过
1、 修改flyway 4.0语句
1、同步摄像头标签信息时数据库配置增加默认值
deal with
。。。
屮
dev环境配置文件调整
1、增加同步视频摄像头标签--配置文件
1、手动更新基础设施-摄像头信息后同步monitor_service项目中标签表的信息
deptToDoTaskPage接口优化
...
...
|
2022-07-20 17:00:21 +08:00 |
huangweixiong
|
c925cfdad3
|
线上上产环境配置文件同步
|
2022-07-20 16:57:52 +08:00 |
huangweixiong
|
9c720dff85
|
网关新接口
|
2022-07-20 16:56:54 +08:00 |
wangliwen
|
84d9562041
|
屮
|
2022-07-20 16:34:09 +08:00 |
wangliwen
|
c3658aceb0
|
...
|
2022-07-20 15:46:28 +08:00 |
wangliwen
|
46a30be29a
|
???
|
2022-07-20 15:44:24 +08:00 |
wangliwen
|
dc51b673a1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-20 14:50:52 +08:00 |
wangliwen
|
c44bb2df88
|
。。。
|
2022-07-20 14:50:35 +08:00 |
dinggang
|
6aaa0d13ad
|
西海岸获取hls流地址更正
|
2022-07-20 11:23:43 +08:00 |
wangliwen
|
d0d2afeaf3
|
增加 根据能力资源id获取该能力申请使用分页接口
|
2022-07-20 09:21:28 +08:00 |
wangliwen
|
76068f2ab5
|
申购车模糊查询
|
2022-07-19 20:04:51 +08:00 |
dinggang
|
b306ce533d
|
.
|
2022-07-19 19:16:19 +08:00 |
dinggang
|
5536f25c8f
|
新增日志清除任务
|
2022-07-19 19:14:23 +08:00 |
wangliwen
|
20007761eb
|
能力申请全为免批资源时,流程节点默认审核通过
|
2022-07-19 18:05:31 +08:00 |
yitonglei
|
6da7fa0665
|
1、同步摄像头标签信息时数据库配置增加默认值
|
2022-07-19 16:59:48 +08:00 |
wangliwen
|
6954af5ba4
|
deal with
|
2022-07-19 16:52:40 +08:00 |
wangliwen
|
58ba499f79
|
。。。
|
2022-07-19 16:47:13 +08:00 |
wangliwen
|
0cd5c87689
|
屮
|
2022-07-19 16:24:16 +08:00 |
wangliwen
|
c3c4a8025b
|
dev环境配置文件调整
|
2022-07-19 16:03:43 +08:00 |
yitonglei
|
e98a470d7e
|
1、增加同步视频摄像头标签--配置文件
|
2022-07-19 15:51:15 +08:00 |
yitonglei
|
561c481949
|
1、手动更新基础设施-摄像头信息后同步monitor_service项目中标签表的信息
|
2022-07-19 15:30:44 +08:00 |
wangliwen
|
df7e2a3824
|
deptToDoTaskPage接口优化
|
2022-07-19 15:06:38 +08:00 |
dinggang
|
b843f76d0f
|
...
|
2022-07-19 13:57:37 +08:00 |
wangliwen
|
2ff63afa00
|
...
|
2022-07-19 13:41:52 +08:00 |
yitonglei
|
75a51451fb
|
1、去掉所有t_camera_channel01和t_camera_organization02的后缀。并添加sql版本为t_camera_channel和t_camera_organization增加字段
|
2022-07-19 12:03:05 +08:00 |
yitonglei
|
b3e4b77447
|
1、修改个人中心-我的浏览接口
|
2022-07-19 11:19:05 +08:00 |
dinggang
|
b23afc8029
|
1.编目更新
2.后台管理-工作台-部门待办新增用户名称
|
2022-07-19 10:58:30 +08:00 |
dinggang
|
de822a40ae
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-19 10:37:00 +08:00 |
dinggang
|
4e6e9cdd42
|
谨记
|
2022-07-19 10:36:24 +08:00 |
wangliwen
|
18dad09f8f
|
调整sql
|
2022-07-19 10:34:58 +08:00 |
wangliwen
|
fdf7922d9b
|
。。
|
2022-07-19 09:56:32 +08:00 |
wangliwen
|
916aef738c
|
分页不传ended时的处理
|
2022-07-19 09:53:44 +08:00 |
wangliwen
|
56e20ef9ae
|
...
|
2022-07-19 09:26:39 +08:00 |
huangweixiong
|
9b94a3b913
|
我的配置修改
|
2022-07-18 20:51:11 +08:00 |
huangweixiong
|
f6fb190ade
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
。。。屮
门户首页-热门能力筛选去除赋能案例
审核状态不正确的处理
拆单内流程是否完成
屮
1.编目和字典表初始化数据sql 2.bugfix
。。。
批量申请异步处理
。。。
资源所属部门为空时的处理
...
fix bug
批量进行所有应用资源
排除特殊项目配置
|
2022-07-18 20:49:30 +08:00 |
huangweixiong
|
7dce8c0326
|
按部门申请网关
|
2022-07-18 20:48:59 +08:00 |
wangliwen
|
3bd433fc1c
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-18 18:52:50 +08:00 |
wangliwen
|
236162b861
|
。。。屮
|
2022-07-18 18:51:59 +08:00 |
dinggang
|
c8afb955a1
|
门户首页-热门能力筛选去除赋能案例
|
2022-07-18 18:39:47 +08:00 |
wangliwen
|
56fa006d82
|
审核状态不正确的处理
|
2022-07-18 18:28:25 +08:00 |
wangliwen
|
a503a961e0
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-18 18:16:26 +08:00 |
wangliwen
|
fe35973785
|
拆单内流程是否完成
|
2022-07-18 18:11:03 +08:00 |
dinggang
|
2b7cf13bfb
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-18 17:57:55 +08:00 |
dinggang
|
f165418650
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-18 17:54:49 +08:00 |
wangliwen
|
ca1a10c8ae
|
屮
|
2022-07-18 17:54:39 +08:00 |
dinggang
|
474976439b
|
1.编目和字典表初始化数据sql
2.bugfix
|
2022-07-18 17:54:19 +08:00 |
wangliwen
|
b911e4068e
|
。。。
|
2022-07-18 17:47:28 +08:00 |
wangliwen
|
115bb063b8
|
批量申请异步处理
|
2022-07-18 17:20:38 +08:00 |
wangliwen
|
76f2f4a323
|
。。。
|
2022-07-18 17:11:09 +08:00 |
wangliwen
|
24d104e904
|
资源所属部门为空时的处理
|
2022-07-18 17:06:56 +08:00 |
wangliwen
|
edf383ab8c
|
...
|
2022-07-18 16:55:37 +08:00 |
wangliwen
|
e62756b431
|
fix bug
|
2022-07-18 16:36:28 +08:00 |
wangliwen
|
da6901392c
|
批量进行所有应用资源
|
2022-07-18 16:11:21 +08:00 |
wangliwen
|
7cbbc369bb
|
排除特殊项目配置
|
2022-07-18 15:07:10 +08:00 |
wangliwen
|
7cfe1ce192
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-18 14:17:10 +08:00 |
wangliwen
|
adc72fb15d
|
sql文件名调整
|
2022-07-18 14:16:54 +08:00 |
dinggang
|
6420e23271
|
...
|
2022-07-18 13:55:19 +08:00 |
dinggang
|
071233b34e
|
bugfix
|
2022-07-18 12:48:40 +08:00 |
dinggang
|
99ee0fa9a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-18 12:04:52 +08:00 |
wangliwen
|
c4bacec4bd
|
是否申请 bug fix
|
2022-07-18 11:57:01 +08:00 |
wangliwen
|
1338bd64ff
|
模型全量调整
|
2022-07-18 11:02:31 +08:00 |
wangliwen
|
641fcacc17
|
。。。
|
2022-07-18 10:30:46 +08:00 |
wangliwen
|
f5e0bac27d
|
申购车不再只限制出组件服务
|
2022-07-18 10:04:32 +08:00 |
yitonglei
|
2cf7198a09
|
1、配置修改
|
2022-07-18 09:41:32 +08:00 |
yitonglei
|
0c8e905501
|
Merge branch 'dev' of http://15.2.21.221:3000/wangliwen/share-platform into dev
|
2022-07-18 09:33:21 +08:00 |
wangliwen
|
8cb469de89
|
。。。
|
2022-07-18 09:26:29 +08:00 |
dinggang
|
9c3623757b
|
Merge branch 'dev' of http://15.2.21.221:3000/wangliwen/share-platform into dev
|
2022-07-18 09:20:53 +08:00 |
dinggang
|
b1be59a581
|
bugfix
|
2022-07-18 09:20:25 +08:00 |
yitonglei
|
89161843d0
|
1、修改能力超市/基础设施的地图下面的列表查询语句,优化查询速度
|
2022-07-15 19:07:37 +08:00 |
wangliwen
|
6b63979594
|
统一okhttp客户端
|
2022-07-15 16:54:33 +08:00 |
wangliwen
|
c3d971e56d
|
。。。
|
2022-07-15 16:44:14 +08:00 |
wangliwen
|
46b445eba9
|
西海岸视频预览加日志输出
|
2022-07-15 16:35:37 +08:00 |
wangliwen
|
33d2595974
|
设置流水号传参的调整
|
2022-07-15 16:24:19 +08:00 |
wangliwen
|
b8b4623a8f
|
能力申请特殊处理
|
2022-07-15 15:25:12 +08:00 |
wangliwen
|
4c696eb196
|
...
|
2022-07-15 12:00:29 +08:00 |
wangliwen
|
87988942fa
|
npe
|
2022-07-15 11:47:40 +08:00 |
wangliwen
|
d7a45b2d17
|
...
|
2022-07-15 11:27:35 +08:00 |
wangliwen
|
6ba099605d
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-15 10:12:52 +08:00 |
wangliwen
|
5ef9763cae
|
能力使用申请可用流程是否结束来进行过滤
|
2022-07-15 10:01:10 +08:00 |
yitonglei
|
f24b7070fc
|
1、新增的能力超市/基础设施的地图下面的列表查询语句进行修改
|
2022-07-15 09:53:54 +08:00 |
wangliwen
|
40477d75c4
|
流程流水号生成调整
|
2022-07-15 09:16:49 +08:00 |
wangliwen
|
5e07068442
|
TODO 写流水号使加锁
|
2022-07-14 18:31:33 +08:00 |
wangliwen
|
22ba83eefe
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-14 16:17:43 +08:00 |
wangliwen
|
56316a2ce2
|
。。。补充部门名
|
2022-07-14 16:17:05 +08:00 |
lizhicheng
|
647adaf461
|
初步完成赋能场景、开发文档,融合服务修复
|
2022-07-14 15:37:19 +08:00 |
dinggang
|
bc44f875b2
|
...
|
2022-07-14 15:19:34 +08:00 |
dinggang
|
5ff1ab946f
|
...
|
2022-07-14 14:44:18 +08:00 |
dinggang
|
c1e165135b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-14 14:12:51 +08:00 |
dinggang
|
ffd3d24b6a
|
...
|
2022-07-14 14:12:17 +08:00 |
wangliwen
|
37e3ca34a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-14 13:37:12 +08:00 |
wangliwen
|
712fdf8265
|
。。
|
2022-07-14 13:37:01 +08:00 |
yitonglei
|
455f5b71d9
|
改
|
2022-07-14 12:54:22 +08:00 |
yitonglei
|
3b0e930aa9
|
1、摄像头根据区域聚合查询的sql修改
|
2022-07-14 12:43:59 +08:00 |
dinggang
|
e3f451b375
|
...
|
2022-07-14 11:51:31 +08:00 |
dinggang
|
2bdc46db62
|
...
|
2022-07-14 11:50:45 +08:00 |
wangliwen
|
dfaeb397da
|
需求评论tip
|
2022-07-14 11:47:29 +08:00 |
dinggang
|
311cadef3e
|
...
|
2022-07-14 11:38:30 +08:00 |
wangliwen
|
74edb1ef0c
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-14 11:08:56 +08:00 |
wangliwen
|
136e4453ce
|
流程记录返回申请单号
|
2022-07-14 11:08:31 +08:00 |
dinggang
|
1a4d495af5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-14 11:02:30 +08:00 |
dinggang
|
861483a477
|
...
|
2022-07-14 11:01:49 +08:00 |
wangliwen
|
a001fd5963
|
状态
|
2022-07-14 10:41:47 +08:00 |
wangliwen
|
92eb9d542e
|
日志
|
2022-07-14 09:55:46 +08:00 |
wangliwen
|
5cefbe1a0f
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-14 09:53:15 +08:00 |
dinggang
|
cfe6c9f240
|
...
|
2022-07-14 09:52:36 +08:00 |
wangliwen
|
35c938ef3b
|
。。。
|
2022-07-14 09:52:19 +08:00 |
wangliwen
|
589f03a103
|
使用单例枚举保证流水号工具类为全局单例
|
2022-07-14 09:35:59 +08:00 |
wangliwen
|
b27ebec5ba
|
...
|
2022-07-14 09:11:51 +08:00 |
wangliwen
|
223c449417
|
流水号加锁
|
2022-07-13 18:29:22 +08:00 |
wangliwen
|
0d61729d4a
|
TODO 流水号生成加锁
|
2022-07-13 18:15:20 +08:00 |
dinggang
|
8afd024265
|
...
|
2022-07-13 18:11:51 +08:00 |
wangliwen
|
a0a238b894
|
...
|
2022-07-13 18:00:51 +08:00 |
wangliwen
|
91355094ee
|
...
|
2022-07-13 16:29:33 +08:00 |
wangliwen
|
c81eb20845
|
能力资源更新infolist
|
2022-07-13 16:16:58 +08:00 |
wangliwen
|
9296dd1ce5
|
申请单号
|
2022-07-13 16:00:32 +08:00 |
wangliwen
|
97d26d9e1a
|
能力申请增加申请时间
|
2022-07-13 15:44:30 +08:00 |
huangweixiong
|
508aef594f
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
...
1、新增摄像头聚合展示
普通资源的npe问题
。。。
配置文件的调整
...
|
2022-07-13 15:26:54 +08:00 |
huangweixiong
|
bf8d191f52
|
hwx配置文件更新
|
2022-07-13 15:26:38 +08:00 |
dinggang
|
e5dc75844c
|
...
|
2022-07-13 15:17:10 +08:00 |
yitonglei
|
1290072076
|
1、新增摄像头聚合展示
|
2022-07-13 15:10:02 +08:00 |
wangliwen
|
6e328843a8
|
普通资源的npe问题
|
2022-07-13 15:02:56 +08:00 |
wangliwen
|
2ac2149cf8
|
。。。
|
2022-07-13 12:54:39 +08:00 |
wangliwen
|
ad5e567250
|
配置文件的调整
|
2022-07-13 11:43:34 +08:00 |
wangliwen
|
956d062428
|
...
|
2022-07-13 11:38:24 +08:00 |
wangliwen
|
63d23588f5
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-13 11:08:07 +08:00 |
wangliwen
|
218d42ad9b
|
。。。instanceId逆序失效的处理
|
2022-07-13 11:07:24 +08:00 |
huangweixiong
|
99822463e7
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
文案调整
processForm/tabilityapplication/my_page 接口摄像头特殊处理
|
2022-07-13 10:47:43 +08:00 |
huangweixiong
|
af6cc27fcd
|
【单账号多地登录】初版
|
2022-07-13 10:47:23 +08:00 |
wangliwen
|
61ab58b704
|
文案调整
|
2022-07-13 10:47:21 +08:00 |
wangliwen
|
31cdc17236
|
processForm/tabilityapplication/my_page 接口摄像头特殊处理
|
2022-07-13 10:19:46 +08:00 |
wangliwen
|
9426860495
|
npe
|
2022-07-12 14:56:31 +08:00 |
dinggang
|
5a603f5cf0
|
...
|
2022-07-12 14:08:53 +08:00 |
wangliwen
|
5a2e6727f7
|
...
|
2022-07-12 14:02:40 +08:00 |
wangliwen
|
454b0c5ed6
|
处理摄像头
|
2022-07-12 11:36:56 +08:00 |
wangliwen
|
44abdc3c2f
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java
|
2022-07-12 10:42:47 +08:00 |
wangliwen
|
45be93e850
|
根据申请标识获取本次申请详情(信息、流程、部门)
|
2022-07-12 10:40:30 +08:00 |
dinggang
|
4dda8aaf1b
|
1.dev配置mysql空闲回收时间为1分钟
2.操作日志新增操作数据表字段,日志注解增加操作数据表属性,修改涉及到数据修改接口的日志注解
3.ucs编码生成工具类
4.涉及到流程的增加申请单号字段
|
2022-07-12 10:24:51 +08:00 |
wangliwen
|
15cc666261
|
根据申请标识获取本次申请的分部门申请信息
|
2022-07-11 17:52:43 +08:00 |
wangliwen
|
c27d2c9c78
|
流程流转异常
|
2022-07-11 15:43:40 +08:00 |
wangliwen
|
588b41669d
|
resource 更新失败
|
2022-07-11 15:33:23 +08:00 |
wangliwen
|
7a15f3ad92
|
同一次批量申请做好标识
|
2022-07-11 14:32:25 +08:00 |
wangliwen
|
e43e86b30b
|
能力下线对各类统计的影响
|
2022-07-11 13:48:49 +08:00 |
wangliwen
|
9abc6bf96e
|
npe
|
2022-07-11 11:27:04 +08:00 |
wangliwen
|
b8de1070fc
|
...
|
2022-07-11 11:08:21 +08:00 |
wangliwen
|
99a945e33f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-11 11:03:43 +08:00 |
wangliwen
|
1b46f676f2
|
查询部门信息 by name
|
2022-07-11 11:02:39 +08:00 |
lizhicheng
|
c3737733f7
|
完成融合服务功能开发
|
2022-07-11 09:17:28 +08:00 |
wangliwen
|
c7a4e1219c
|
站内信消息通知异常解决
|
2022-07-08 17:44:10 +08:00 |
wangliwen
|
510afd01cc
|
。。。
|
2022-07-08 17:20:46 +08:00 |
wangliwen
|
2ab4b169f5
|
。。。
|
2022-07-08 11:29:39 +08:00 |
wangliwen
|
76584319d4
|
根据流程定义key获取对应已办任务
|
2022-07-08 11:22:29 +08:00 |
wangliwen
|
a34e254e79
|
二级缓存策略调整
|
2022-07-08 11:00:17 +08:00 |
wangliwen
|
44dd889936
|
timeout too small.
|
2022-07-08 10:31:08 +08:00 |
wangliwen
|
73dd3535bd
|
Merge branch 'master' into dev
|
2022-07-08 10:11:43 +08:00 |
wangliwen
|
90b62a9f8f
|
调整知识库http客户端线程池
|
2022-07-08 10:11:16 +08:00 |
wangliwen
|
e1329442cb
|
调整pageWithAttrs 接口代码结构
|
2022-07-08 09:37:28 +08:00 |
wangliwen
|
0f980cf238
|
解决能力集市 筛选各类排序失效(内部二级缓存)
|
2022-07-08 09:18:03 +08:00 |
wangliwen
|
ec6597ba35
|
按总体评分 逆序与顺序
|
2022-07-07 19:55:54 +08:00 |
wangliwen
|
861e5413e5
|
排序失败
|
2022-07-07 19:49:56 +08:00 |
wangliwen
|
d9511cb1c6
|
...
|
2022-07-07 19:25:19 +08:00 |
wangliwen
|
213f25085e
|
查询所有部门
|
2022-07-07 18:57:09 +08:00 |
wangliwen
|
4cc31af90e
|
...
|
2022-07-07 18:32:05 +08:00 |
wangliwen
|
7dec63c6c8
|
能力申请方 能力集数目异常
|
2022-07-07 18:16:14 +08:00 |
wangliwen
|
d84737dbd6
|
线程池调整
|
2022-07-07 17:38:58 +08:00 |
wangliwen
|
cd87eb6072
|
sql调整
|
2022-07-07 16:50:01 +08:00 |
wangliwen
|
0ee54db89e
|
评论自动通过时状态异常
|
2022-07-07 16:04:08 +08:00 |
yitonglei
|
6b5c67f60e
|
1、修改 能力统计列表和详情-所有详情展示的sql语句,统计以当前部门为准,不包含其下级部门
|
2022-07-07 15:59:58 +08:00 |
wangliwen
|
7c5362464e
|
。。。
|
2022-07-07 15:18:18 +08:00 |
wangliwen
|
cdebffd2b5
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-07 14:58:27 +08:00 |
wangliwen
|
ca667cb116
|
捕获站内信通知异常
|
2022-07-07 14:58:09 +08:00 |
yitonglei
|
3d49aae51d
|
1、修改 能力统计列表和详情-组件服务-应用领域分布情况的sql语句
|
2022-07-07 14:23:10 +08:00 |
wangliwen
|
2041c6b558
|
...调整
|
2022-07-07 14:17:49 +08:00 |
wangliwen
|
9226d20e7a
|
。。。
|
2022-07-07 13:57:02 +08:00 |
wangliwen
|
e494a94c57
|
异步更新访问量
|
2022-07-07 12:00:42 +08:00 |
wangliwen
|
fc715c9cd4
|
屮
|
2022-07-07 11:53:46 +08:00 |
wangliwen
|
8371b085f4
|
。。。
|
2022-07-07 11:38:35 +08:00 |
wangliwen
|
ac7f9f5b68
|
所有流程审核人为发起人时,默认审核通过
|
2022-07-07 10:29:28 +08:00 |
wangliwen
|
03129a13c2
|
需求审核人为发起人时,默认通过
|
2022-07-07 10:04:06 +08:00 |
wangliwen
|
ec7da281e6
|
...
|
2022-07-06 17:58:24 +08:00 |
wangliwen
|
fb28534f56
|
工作台异常
|
2022-07-06 17:46:51 +08:00 |
wangliwen
|
fbb5fa3bc3
|
npe
|
2022-07-06 17:25:16 +08:00 |
wangliwen
|
089ff2bb3a
|
npe
|
2022-07-06 16:30:07 +08:00 |
wangliwen
|
c4bd9a2baa
|
部门待办防止重复
|
2022-07-06 15:56:12 +08:00 |
wangliwen
|
898e1c5ae5
|
浏览记录的处理
|
2022-07-06 15:45:12 +08:00 |
wangliwen
|
419ad451bd
|
浏览记录添加
|
2022-07-06 15:12:28 +08:00 |
wangliwen
|
0610457207
|
...
|
2022-07-06 11:03:27 +08:00 |
wangliwen
|
8da1f87d46
|
category/getCategoryTree 加上二级缓存
|
2022-07-06 10:30:22 +08:00 |
wangliwen
|
11829cfc75
|
dev配置调大连接池线程池数目
|
2022-07-06 10:22:55 +08:00 |
wangliwen
|
6eb4596a66
|
...
|
2022-07-05 18:22:20 +08:00 |
huangweixiong
|
079c3b4eb4
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
...
...
|
2022-07-05 17:19:44 +08:00 |
huangweixiong
|
9831f7725e
|
兼容能力主次表数据不一致
|
2022-07-05 17:19:00 +08:00 |
wangliwen
|
96cebb55ba
|
Merge remote-tracking branch 'origin/dev'
|
2022-07-05 16:54:10 +08:00 |
wangliwen
|
e57bc3feac
|
...
|
2022-07-05 16:53:32 +08:00 |
huangweixiong
|
45787c0fa3
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform: (22 commits)
1、修改/resource/selectTotal方法,在548行增加代码删除“基础设施”的数据
申购车脏数据处理(资源不存在时)
重复收藏时更新收藏时间
npe
需求 不展示问题
CompletableFuture 使用自定义线程池
使用自定义线程池
能力申请V2模型导入
姜永超增加应用上架关联组件;增加服务融合冗余接口,以后用的话可以用
常用校验token加上二级缓存
申购车摄像头sql
...
...
姜永超增加能力上架 组件类型关联应用
数据库死锁解决
1、修改能力统计列表和详情-知识库-知识库发布时间统计的sql
评论审核通过,通知评论人
更新日志文件
1、修改能力统计列表和详情-基础设施-发布情况列表的查询
。。。
...
# Conflicts:
# renren-admin/src/main/java/io/renren/common/controller/CensusControllerV2.java
|
2022-07-05 16:50:36 +08:00 |
huangweixiong
|
0bd1259e6d
|
云图统计优化
|
2022-07-05 16:48:03 +08:00 |
wangliwen
|
b65abbdd04
|
...
|
2022-07-05 16:32:02 +08:00 |
wangliwen
|
4a6879b91a
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-05 16:10:09 +08:00 |
yitonglei
|
f1cb8158ea
|
1、修改/resource/selectTotal方法,在548行增加代码删除“基础设施”的数据
|
2022-07-05 16:08:08 +08:00 |
wangliwen
|
6276b29333
|
申购车脏数据处理(资源不存在时)
|
2022-07-05 15:26:13 +08:00 |
wangliwen
|
6b6ebf6fc1
|
重复收藏时更新收藏时间
|
2022-07-05 14:55:06 +08:00 |
wangliwen
|
d4d51f997a
|
npe
|
2022-07-05 14:42:34 +08:00 |
wangliwen
|
92c4658f76
|
需求 不展示问题
|
2022-07-05 14:32:20 +08:00 |
wangliwen
|
04365958fc
|
CompletableFuture 使用自定义线程池
|
2022-07-05 14:13:16 +08:00 |
wangliwen
|
a2e5a0d4ff
|
使用自定义线程池
|
2022-07-05 11:52:16 +08:00 |
wangliwen
|
c8ce2d4ce2
|
能力申请V2模型导入
|
2022-07-05 10:35:59 +08:00 |
wangliwen
|
5a820c653f
|
Merge branch 'dev'
|
2022-07-05 10:25:33 +08:00 |
dinggang
|
4b8765d2f7
|
姜永超增加应用上架关联组件;增加服务融合冗余接口,以后用的话可以用
|
2022-07-05 10:10:34 +08:00 |
wangliwen
|
c69efa101f
|
常用校验token加上二级缓存
|
2022-07-05 09:21:03 +08:00 |
wangliwen
|
0f25b9414e
|
申购车摄像头sql
|
2022-07-04 17:40:25 +08:00 |
wangliwen
|
02cad2750c
|
...
|
2022-07-04 16:38:41 +08:00 |
dinggang
|
55737c2d3d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-04 16:15:15 +08:00 |
wangliwen
|
54dfab4198
|
...
|
2022-07-04 16:14:46 +08:00 |
dinggang
|
330f9ea2ce
|
姜永超增加能力上架 组件类型关联应用
|
2022-07-04 16:14:33 +08:00 |
wangliwen
|
cc72976528
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-04 16:06:12 +08:00 |
wangliwen
|
c0b8856fe5
|
数据库死锁解决
|
2022-07-04 16:02:20 +08:00 |
yitonglei
|
901b6ad0a0
|
1、修改能力统计列表和详情-知识库-知识库发布时间统计的sql
|
2022-07-04 15:58:46 +08:00 |
wangliwen
|
5b4bddca10
|
评论审核通过,通知评论人
|
2022-07-04 15:48:54 +08:00 |
wangliwen
|
d6139676ff
|
Merge branch 'release' into dev
|
2022-07-04 15:37:35 +08:00 |
yitonglei
|
a087c7b955
|
1、修改能力统计列表和详情-基础设施-发布情况列表的查询
|
2022-07-04 15:32:26 +08:00 |
wangliwen
|
6ee0f4fbc8
|
。。。
|
2022-07-04 15:16:51 +08:00 |
wangliwen
|
1bd2ae80cf
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-04 14:49:31 +08:00 |
wangliwen
|
cd01826d3c
|
一些状态补充
|
2022-07-04 14:49:01 +08:00 |
lizhicheng
|
d839710432
|
新增功能:融合服务
|
2022-07-04 14:44:20 +08:00 |
huangweixiong
|
6d1dc16896
|
修复摄像头预览接口报错
|
2022-07-04 11:29:43 +08:00 |
huangweixiong
|
0b1f82f933
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform: (47 commits)
bug修复
bug修复: 1.能力统计-基础设施来源修改 2.申购车查询逻辑修改 3.排序失效修复
1、修改能力统计列表和详情-组件服务-使用情况统计相关代码修改为统计调用数和使用数
补充 发表需求评论
1、修改能力统计列表和详情-TOP5使用组件
异步优化
1、修改能力统计列表和详情-组件服务-使用情况统计列表的查询字段名称
工作台bug修复
异步多线程优化
1、修改能力统计列表和详情-组件服务-使用情况统计-使用组件评分TOP5的sql
1.申购车查询结果新增字段 2.根据申请查询摄像头列表修改 3.修改新增收藏因为异步导致的数据库死锁
1、修改能力统计列表和详情-组件服务-使用情况统计-top5使用组件的sql
...
sql 调整
1、修改能力统计列表和详情-应用资源-发布端应用情况的sql
我发起的流程、已办任务 可按流程类型过滤
...
1、修改能力统计列表和详情-优化贡献组件分别被多少应用使用的sql
...
申请摄像头通知异常的解决
...
|
2022-07-04 11:09:42 +08:00 |
huangweixiong
|
d3342276c7
|
网关统计bug修复
|
2022-07-04 11:08:58 +08:00 |
dinggang
|
90dbc0d9f4
|
bug修复
|
2022-07-01 19:55:13 +08:00 |
dinggang
|
52edb4edcd
|
bug修复:
1.能力统计-基础设施来源修改
2.申购车查询逻辑修改
3.排序失效修复
|
2022-07-01 18:27:31 +08:00 |
yitonglei
|
4f2ba4d710
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 18:21:01 +08:00 |