 dinggang
|
aba372676d
|
1.基础设施摄像头申请流程修改
2.申购车查询摄像头列表数据新增字段
|
2022-06-30 16:00:02 +08:00 |
 yitonglei
|
3e4716a432
|
1、修改能力统计列表和详情-应用资源的贡献组件分别被多少应用使用
|
2022-06-30 15:38:49 +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 |
|
wangliwen
|
4a9dbdceb9
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-28 16:49:13 +08:00 |
|
wangliwen
|
97b5f7c79b
|
总体评价更新
|
2022-06-28 16:48:50 +08:00 |
|
yitonglei
|
4e13cb093a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-28 15:52:28 +08:00 |
|
yitonglei
|
ee22d1d8fc
|
1、组件使用情况统计的查询方法--修改了基础设置列表、基础设施使用情况、知识库相关方法
|
2022-06-28 15:50:46 +08:00 |
|
HISENSE\lizhicheng2
|
fd3c2a7a4b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-28 15:35:45 +08:00 |
|
Unknown
|
95365f1901
|
新增api：部门待办、部门已办
|
2022-06-28 15:35:15 +08:00 |
|
wangliwen
|
f52e462e18
|
二级缓存调整
|
2022-06-28 14:00:18 +08:00 |
|
wangliwen
|
ed81a9807a
|
。。。
|
2022-06-28 13:53:29 +08:00 |
|
wangliwen
|
1d5567d493
|
。。。
|
2022-06-28 13:48:13 +08:00 |
|
wangliwen
|
d10367c4c6
|
使用冗余字段代替sql函数计算
|
2022-06-28 13:40:59 +08:00 |
|
wangliwen
|
d16d7add39
|
selectDeptList 使用全异步处理与加二级缓存
|
2022-06-28 11:49:54 +08:00 |
|
wangliwen
|
2954ede07a
|
Merge remote-tracking branch 'origin/dev'
|
2022-06-28 11:04:12 +08:00 |
|
wangliwen
|
0562a1548f
|
selectDeptList 使用并行减少io
|
2022-06-28 11:03:51 +08:00 |
|
yitonglei
|
0adb6b095c
|
1、修改组件使用情况统计的查询方法
|
2022-06-28 10:43:20 +08:00 |
|
yitonglei
|
8efd7866aa
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
|
2022-06-28 10:40:32 +08:00 |
|
yitonglei
|
ceb9c747e2
|
1、修改组件使用情况统计的查询方法
|
2022-06-28 10:33:09 +08:00 |
|
wangliwen
|
4058089bcd
|
...
|
2022-06-28 09:33:10 +08:00 |
|
wangliwen
|
73f0607099
|
selectWithAttrs 减少sql返回字段
|
2022-06-28 09:27:35 +08:00 |
|
wangliwen
|
5176f58ac8
|
selectWithAttrs 使用流分页
|
2022-06-28 09:16:40 +08:00 |
|
wangliwen
|
99bb41556d
|
按条件出条件总数
|
2022-06-27 19:58:24 +08:00 |
|
wangliwen
|
7288012bf6
|
资源表sql 中 规避使用 * 进行查询
|
2022-06-27 19:42:02 +08:00 |
|
wangliwen
|
46b17e96c2
|
修改本地dev环境下数据库访问地址（238数据库io慢）
|
2022-06-27 18:36:58 +08:00 |
|
dinggang
|
54a9ce5d62
|
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/sys/controller/SysDeptController.java
|
2022-06-27 18:11:29 +08:00 |
|
dinggang
|
cb134396b3
|
1.申购车分页查询修改
2.删除system.out代码
|
2022-06-27 18:05:44 +08:00 |
|
yitonglei
|
9f704ea01d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-06-27 18:04:43 +08:00 |
|
wangliwen
|
d6df42fe7b
|
...
|
2022-06-27 18:04:01 +08:00 |
|
wangliwen
|
f4670d45cd
|
二级缓存手动清理
|
2022-06-27 17:59:30 +08:00 |
|
wangliwen
|
e1fb7b0b9e
|
云图 接口异常时 默认数据
|
2022-06-27 17:44:01 +08:00 |
|
wangliwen
|
1e38a30eb5
|
npe
|
2022-06-27 17:40:55 +08:00 |
|
wangliwen
|
78286468fa
|
资源入库时 更新infoList字段
|
2022-06-27 17:33:03 +08:00 |
|
yitonglei
|
142ab2d84a
|
1、继续修改代码
|
2022-06-27 17:30:14 +08:00 |