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 |
|
wangliwen
|
01da3378a1
|
Merge branch 'master' into docker_package
|
2022-07-01 18:44:47 +08:00 |
|
wangliwen
|
9e2e7fdbdd
|
Merge branch 'master' into docker_package
|
2022-07-01 18:32:29 +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 |
|
yitonglei
|
f367009215
|
1、修改能力统计列表和详情-组件服务-使用情况统计相关代码修改为统计调用数和使用数
|
2022-07-01 18:20:54 +08:00 |
|
wangliwen
|
8d15ad35de
|
补充 发表需求评论
|
2022-07-01 18:02:56 +08:00 |
|
yitonglei
|
a5954e286e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 17:29:30 +08:00 |
|
yitonglei
|
e75208a8cb
|
1、修改能力统计列表和详情-TOP5使用组件
|
2022-07-01 17:29:24 +08:00 |
|
wangliwen
|
26e6c2d157
|
Merge branch 'master' into docker_package
|
2022-07-01 17:18:12 +08:00 |
|
wangliwen
|
d9ed300609
|
Merge remote-tracking branch 'origin/dev'
|
2022-07-01 17:00:40 +08:00 |
|
wangliwen
|
a15f79cece
|
异步优化
|
2022-07-01 17:00:12 +08:00 |
|
yitonglei
|
ff808b022b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 16:09:22 +08:00 |
|
yitonglei
|
2992eb2792
|
1、修改能力统计列表和详情-组件服务-使用情况统计列表的查询字段名称
|
2022-07-01 16:08:09 +08:00 |
|
lizhicheng
|
eecbdbcf52
|
工作台bug修复
|
2022-07-01 15:55:09 +08:00 |
|
wangliwen
|
4e32f0c58e
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-01 14:41:15 +08:00 |
|
wangliwen
|
bc68b6d0af
|
异步多线程优化
|
2022-07-01 14:40:56 +08:00 |
|
yitonglei
|
46ea3faede
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 14:38:17 +08:00 |
|
yitonglei
|
c72f598780
|
1、修改能力统计列表和详情-组件服务-使用情况统计-使用组件评分TOP5的sql
|
2022-07-01 14:38:11 +08:00 |
|
dinggang
|
7511a9d9f2
|
1.申购车查询结果新增字段
2.根据申请查询摄像头列表修改
3.修改新增收藏因为异步导致的数据库死锁
|
2022-07-01 14:35:24 +08:00 |
|
yitonglei
|
fa9f22628b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 14:06:36 +08:00 |
|
yitonglei
|
797ee5f59f
|
1、修改能力统计列表和详情-组件服务-使用情况统计-top5使用组件的sql
|
2022-07-01 14:06:29 +08:00 |
|
wangliwen
|
e78b5ca35f
|
Merge branch 'dev' into docker_package
|
2022-07-01 13:34:58 +08:00 |
|
wangliwen
|
c0962e670c
|
sql 调整
|
2022-07-01 13:18:18 +08:00 |
|
yitonglei
|
fc910297a0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 12:09:35 +08:00 |
|
yitonglei
|
92d08a0a3c
|
1、修改能力统计列表和详情-应用资源-发布端应用情况的sql
|
2022-07-01 12:09:27 +08:00 |
|
wangliwen
|
aea576a204
|
Merge branch 'master' into docker_package
|
2022-07-01 11:37:55 +08:00 |
|
wangliwen
|
410ac4c964
|
我发起的流程、已办任务 可按流程类型过滤
|
2022-07-01 11:36:09 +08:00 |
|
wangliwen
|
ea62505f8d
|
调整 启动环境
|
2022-07-01 11:34:11 +08:00 |
|
wangliwen
|
68f9685daa
|
Merge branch 'master' into docker_package
|
2022-07-01 11:16:06 +08:00 |
|
dinggang
|
3b44fa36a0
|
...
|
2022-07-01 10:46:57 +08:00 |
|
yitonglei
|
66356dd6c6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 10:42:44 +08:00 |
|
yitonglei
|
45952427fc
|
1、修改能力统计列表和详情-优化贡献组件分别被多少应用使用的sql
|
2022-07-01 10:42:39 +08:00 |
|
wangliwen
|
b21210e36f
|
...
|
2022-07-01 10:42:11 +08:00 |
|
wangliwen
|
a092e6b00f
|
申请摄像头通知异常的解决
|
2022-07-01 10:30:54 +08:00 |
|
wangliwen
|
1547954471
|
Merge branch 'master' into docker_package
|
2022-07-01 10:03:23 +08:00 |
|
wangliwen
|
e610457d13
|
申请的表单 camera_list 查询不出的问题
|
2022-07-01 10:02:39 +08:00 |
|
wangliwen
|
ef1cbe93fc
|
...
|
2022-07-01 09:57:29 +08:00 |
|
wangliwen
|
03dee6f380
|
已办任务支持能力批量申请
|
2022-07-01 09:50:48 +08:00 |
|
wangliwen
|
31d11b8009
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-01 09:40:39 +08:00 |
|
yitonglei
|
f7f04f90e0
|
1、修改能力统计列表和详情-使用情况统计的sql
|
2022-07-01 09:38:48 +08:00 |
|
yitonglei
|
7c1988cde5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-01 09:31:29 +08:00 |
|
yitonglei
|
220d3d9f0e
|
1、修改能力统计列表和详情-使用情况统计的sql
|
2022-07-01 09:31:22 +08:00 |
|
wangliwen
|
357ed71dbe
|
摄像头申请 我的申请名字特殊处理
|
2022-07-01 09:28:40 +08:00 |
|
wangliwen
|
3cb9e083ed
|
我的待办 所有类型都为获取到时，直接输出
|
2022-07-01 08:57:52 +08:00 |
|
wangliwen
|
8cf701aeef
|
Merge branch 'master' into docker_package
|
2022-06-30 18:59:55 +08:00 |
|
dinggang
|
87cc41c22b
|
1.共享门户和能力统计对资源等信息统计逻辑修改
2.需求中心按时间倒序
|
2022-06-30 18:41:44 +08:00 |
|
yitonglei
|
f67de9cf52
|
1、修改能力统计列表和详情-部分查询的条件限制
|
2022-06-30 18:26:06 +08:00 |
|
yitonglei
|
5cbc508655
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-30 17:56:50 +08:00 |
|
yitonglei
|
274b11639f
|
1、修改能力统计列表和详情-部分查询的条件限制
|
2022-06-30 17:56:40 +08:00 |
|
wangliwen
|
409b9b865e
|
Merge branch 'master' into docker_package
|
2022-06-30 17:47:07 +08:00 |
|
wangliwen
|
d72e30308f
|
Merge branch 'master' into dev
|
2022-06-30 17:46:01 +08:00 |
|
yitonglei
|
9d04ba4113
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-30 17:21:30 +08:00 |
|
yitonglei
|
75b7de0052
|
1、修改能力统计列表和详情-部分查询的条件限制
|
2022-06-30 17:21:24 +08:00 |
|
wangliwen
|
8fb6924557
|
。。。
|
2022-06-30 17:02:26 +08:00 |
|
wangliwen
|
19d1cdde41
|
文案调整
|
2022-06-30 16:46:34 +08:00 |
|
wangliwen
|
eea490071b
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-06-30 16:39:40 +08:00 |
|
wangliwen
|
20a426cb9a
|
处理pageWithAttr接口返回缺失infoList字段的问题
|
2022-06-30 16:37:38 +08:00 |
|
yitonglei
|
a57b280270
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-30 16:34:11 +08:00 |
|
yitonglei
|
511bcc7850
|
1、修改能力统计列表和详情-应用资源的发布情况和应用资源使用情况关于登录用户的判断，解决空指针问题
|
2022-06-30 16:33:53 +08:00 |
|
lizhicheng
|
6005903b1a
|
工作台：前端联调补充
|
2022-06-30 16:31:22 +08:00 |
|
wangliwen
|
1e370568a7
|
Merge branch 'master' into docker_package
|
2022-06-30 16:10:28 +08:00 |
|
yitonglei
|
70f4756f9e
|
1、修改能力统计列表和详情-应用资源的发布情况增加收藏字段，修改五大资源发布情况的sql语句
|
2022-06-30 16:10:24 +08:00 |
|
wangliwen
|
30206c5867
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-30 16:07:29 +08:00 |
|
wangliwen
|
3e78aec4d3
|
二级缓存的调整
|
2022-06-30 16:06:08 +08:00 |
|
wangliwen
|
da41776d98
|
Merge branch 'master' into docker_package
|
2022-06-30 16:00:39 +08:00 |
|
dinggang
|
aba372676d
|
1.基础设施摄像头申请流程修改
2.申购车查询摄像头列表数据新增字段
|
2022-06-30 16:00:02 +08:00 |
|
wangliwen
|
093dc5ba91
|
docker 镜像
|
2022-06-30 15:58:43 +08:00 |
|
yitonglei
|
3e4716a432
|
1、修改能力统计列表和详情-应用资源的贡献组件分别被多少应用使用
|
2022-06-30 15:38:49 +08:00 |
|
wangliwen
|
22bdb9c4dc
|
TODO docker打包
|
2022-06-30 14:16:06 +08:00 |
|
yitonglei
|
91fc811ed6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-30 12:04:25 +08:00 |
|
yitonglei
|
4c463e922f
|
1、修改能力统计列表和详情-应用资源的应用贡献组件数量分布（算法、图层、开发、业务）和 应用贡献组件数量分布
|
2022-06-30 12:04:17 +08:00 |
|
wangliwen
|
b1774b9875
|
所有能力资源infoList交给本表字段处理、保存
|
2022-06-30 11:58:35 +08:00 |
|
wangliwen
|
48e9eecbd3
|
能力导入默认为大数据局
|
2022-06-30 11:50:24 +08:00 |
|
wangliwen
|
44233d80de
|
屮
|
2022-06-30 11:22:43 +08:00 |
|
wangliwen
|
a959af6fa7
|
。。。
|
2022-06-30 10:56:11 +08:00 |
|
wangliwen
|
204eb8d5e3
|
dto 内 json 字段特殊处理
|
2022-06-30 10:45:10 +08:00 |
|
wangliwen
|
26307f6d0d
|
单点登录调整的启用配置
|
2022-06-30 10:19:04 +08:00 |
|
huangweixiong
|
214bf4bc61
|
cas单点登录
|
2022-06-30 09:41:38 +08:00 |
|
huangweixiong
|
d9222f25e1
|
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: (77 commits)
。。。
1、修改shiro的关于/census/center/v3/**的配置顺序，移到/census/center/**配置之前
ObjectMapper 线程安全，减少new
新增api：查询资源按申请次数排名、查询部门需求
。。。
...
。。。
。。。
基础设施特殊处理
1、修改一处拼写错误
流程图放开
批量能力申请 我的申请页
1、修改一处拼写错误
...
...
新增api：部门申请、部门申请统计
批量申请时 手动填充发起人id
1、修改字符串转换成数字方法，由转成int改为long
1、修改鉴权ShiroConfig,增加filterMap.put("/census/center/v3/**", "oauth2");
npe
...
|
2022-06-30 09:34:54 +08:00 |
|
huangweixiong
|
7ee146eaa9
|
单点登录重构，新增cas单点登录
|
2022-06-30 09:34:33 +08:00 |
|
wangliwen
|
d886019cb9
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-30 09:26:40 +08:00 |
|
wangliwen
|
e7ee2632e0
|
。。。
|
2022-06-30 09:26:04 +08:00 |
|
yitonglei
|
67387e1451
|
1、修改shiro的关于/census/center/v3/**的配置顺序，移到/census/center/**配置之前
|
2022-06-30 09:24:56 +08:00 |
|
wangliwen
|
14474061cd
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-06-30 09:00:29 +08:00 |
|
wangliwen
|
cc7b22b304
|
ObjectMapper 线程安全，减少new
|
2022-06-30 08:58:54 +08:00 |
|
lizhicheng
|
e0d472a9a8
|
新增api：查询资源按申请次数排名、查询部门需求
|
2022-06-29 20:50:41 +08:00 |
|
wangliwen
|
17415e4a07
|
。。。
|
2022-06-29 19:49:20 +08:00 |
|
dinggang
|
0039b8b776
|
...
|
2022-06-29 19:25:11 +08:00 |
|
wangliwen
|
09ae34cf61
|
。。。
|
2022-06-29 19:21:23 +08:00 |
|
wangliwen
|
c8df1c2468
|
。。。
|
2022-06-29 19:03:08 +08:00 |
|
wangliwen
|
b012861c51
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-29 18:57:31 +08:00 |
|
wangliwen
|
f5ecfb1fcd
|
基础设施特殊处理
|
2022-06-29 18:56:19 +08:00 |
|
yitonglei
|
2f8761fec1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-29 18:19:36 +08:00 |
|
yitonglei
|
fce552600b
|
1、修改一处拼写错误
|
2022-06-29 18:19:29 +08:00 |
|
wangliwen
|
0b50439f43
|
流程图放开
|
2022-06-29 18:11:17 +08:00 |
|
wangliwen
|
6b756c6963
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-29 18:08:19 +08:00 |
|
wangliwen
|
f1da551b13
|
批量能力申请 我的申请页
|
2022-06-29 18:07:01 +08:00 |
|
yitonglei
|
17a3c32c86
|
1、修改一处拼写错误
|
2022-06-29 17:50:43 +08:00 |
|
wangliwen
|
a58c74caea
|
...
|
2022-06-29 17:37:22 +08:00 |
|
wangliwen
|
18ab6f6697
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-29 16:43:21 +08:00 |
|
wangliwen
|
22c626aa55
|
...
|
2022-06-29 16:40:09 +08:00 |
|
lizhicheng
|
fa280cb83c
|
新增api：部门申请、部门申请统计
|
2022-06-29 16:10:35 +08:00 |
|
wangliwen
|
b5316c85eb
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-29 15:48:15 +08:00 |
|
wangliwen
|
bd2c5b951b
|
批量申请时 手动填充发起人id
|
2022-06-29 15:46:35 +08:00 |
|
yitonglei
|
1340f9b2cd
|
1、修改字符串转换成数字方法，由转成int改为long
|
2022-06-29 15:38:41 +08:00 |
|
yitonglei
|
ad98c9b0dc
|
1、修改鉴权ShiroConfig,增加filterMap.put("/census/center/v3/**", "oauth2");
|
2022-06-29 15:29:54 +08:00 |
|
wangliwen
|
a2cf04b5fd
|
npe
|
2022-06-29 15:11:35 +08:00 |
|
wangliwen
|
e2a14c2ad5
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-29 14:48:52 +08:00 |
|
dinggang
|
7d5eaa62d7
|
...
|
2022-06-29 14:43:38 +08:00 |
|
yitonglei
|
98976ae620
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-29 14:11:34 +08:00 |
|
yitonglei
|
58088236ab
|
1、能力统计列表及详情页CensusControllerV3的列表查询方法做了改动，部门id从登录用户获取
2、删除了SysDeptController中新增的查询部门树方法
|
2022-06-29 14:08:50 +08:00 |
|
wangliwen
|
cf4545a266
|
businessKey直接出task内部参数
|
2022-06-29 11:56:38 +08:00 |
|
wangliwen
|
eaf2e3b289
|
调整申请表单应用场景支持多选
|
2022-06-29 11:42:52 +08:00 |
|
wangliwen
|
fc4210442a
|
Merge branch 'master' into dev
|
2022-06-29 10:55:08 +08:00 |
|
dinggang
|
63cc759ac4
|
基础设施摄像头批量申请
|
2022-06-29 10:28:40 +08:00 |
|
wangliwen
|
1a07719063
|
...
|
2022-06-29 10:15:06 +08:00 |
|
lizhicheng
|
d16113cd48
|
新增api：部门上架、部门上架统计
|
2022-06-29 10:11:03 +08:00 |
|
wangliwen
|
400fb77529
|
...
|
2022-06-29 09:48:24 +08:00 |
|
wangliwen
|
f953b77294
|
批量申请流程申请接口处理
|
2022-06-29 09:39:41 +08:00 |
|
wangliwen
|
8577b7f1e4
|
数据库切换回 238
|
2022-06-29 09:08:42 +08:00 |
|
wangliwen
|
f435bb8d49
|
Merge branch 'dev'
|
2022-06-28 20:13:40 +08:00 |
|
wangliwen
|
00031c475f
|
启动脚本 调大堆栈
|
2022-06-28 20:13:00 +08:00 |
|
wangliwen
|
87b74e303a
|
...
|
2022-06-28 19:31:23 +08:00 |
|
wangliwen
|
bfbcbceaac
|
...
|
2022-06-28 19:29:29 +08:00 |
|
wangliwen
|
73f3101477
|
selectWithAttrs 二级缓存
|
2022-06-28 19:18:39 +08:00 |
|
wangliwen
|
4ae2d62670
|
总体评分逆序
|
2022-06-28 19:13:38 +08:00 |
|
dinggang
|
a9b5f6f22d
|
1.基础设施摄像头列表查询修改
2.申购车根据流程ID查询申请的摄像头列表
|
2022-06-28 19:12:52 +08:00 |
|
wangliwen
|
eb362e16df
|
二级缓存缓存 按总体评价排序
|
2022-06-28 19:00:57 +08:00 |
|
wangliwen
|
a92a53b850
|
...
|
2022-06-28 18:12:55 +08:00 |
|
wangliwen
|
4fddf96687
|
Merge remote-tracking branch 'origin/dev'
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
|
2022-06-28 18:11:59 +08:00 |
|
wangliwen
|
0a8fcd3d8f
|
npe
|
2022-06-28 18:09:00 +08:00 |
|
yitonglei
|
9b3dbc53cb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-28 17:48:36 +08:00 |
|
wangliwen
|
27d2757f9d
|
总体评价特殊处理，防止sql 卡顿
|
2022-06-28 17:48:29 +08:00 |
|
yitonglei
|
d27039cf07
|
1、部门发布情况增加分页能力
|
2022-06-28 17:48:26 +08:00 |
|
wangliwen
|
03f1e20a46
|
...
|
2022-06-28 17:05:21 +08:00 |
|
wangliwen
|
926bc78395
|
。。。
|
2022-06-28 16:52:57 +08:00 |