wangliwen
|
92eb9d542e
|
日志
|
2022-07-14 09:55:46 +08:00 |
|
wangliwen
|
a9c39f4f02
|
Merge branch 'master' into docker_package
|
2022-07-14 09:53:42 +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
|
4fde0bc273
|
Merge branch 'master' into docker_package
|
2022-07-14 09:37:45 +08:00 |
|
wangliwen
|
589f03a103
|
使用单例枚举保证流水号工具类为全局单例
|
2022-07-14 09:35:59 +08:00 |
|
wangliwen
|
75060f9947
|
Merge branch 'master' into docker_package
|
2022-07-14 09:12:38 +08:00 |
|
wangliwen
|
b27ebec5ba
|
...
|
2022-07-14 09:11:51 +08:00 |
|
wangliwen
|
3f5934bca6
|
Merge branch 'master' into docker_package
|
2022-07-13 18:48:19 +08:00 |
|
wangliwen
|
223c449417
|
流水号加锁
|
2022-07-13 18:29:22 +08:00 |
|
wangliwen
|
c9edff06dd
|
Merge branch 'master' into docker_package
|
2022-07-13 18:15:48 +08:00 |
|
wangliwen
|
0d61729d4a
|
TODO 流水号生成加锁
|
2022-07-13 18:15:20 +08:00 |
|
wangliwen
|
c0676abb1b
|
Merge branch 'master' into docker_package
|
2022-07-13 18:12:13 +08:00 |
|
dinggang
|
8afd024265
|
...
|
2022-07-13 18:11:51 +08:00 |
|
wangliwen
|
a0a238b894
|
...
|
2022-07-13 18:00:51 +08:00 |
|
wangliwen
|
c3531a5b8f
|
Merge branch 'master' into docker_package
|
2022-07-13 17:14:23 +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
|
ce4b2e8310
|
Merge branch 'master' into docker_package
|
2022-07-13 11:08:50 +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
|
bd13ed4b62
|
文案调整
|
2022-07-13 10:46:09 +08:00 |
|
wangliwen
|
60f4e1ae14
|
Merge branch 'master' into docker_package
|
2022-07-13 10:20:27 +08:00 |
|
wangliwen
|
31cdc17236
|
processForm/tabilityapplication/my_page 接口摄像头特殊处理
|
2022-07-13 10:19:46 +08:00 |
|
wangliwen
|
24cb34d98e
|
Merge branch 'dev' into docker_package
|
2022-07-12 14:56:46 +08:00 |
|
wangliwen
|
9426860495
|
npe
|
2022-07-12 14:56:31 +08:00 |
|
wangliwen
|
923bf8b1ca
|
Merge branch 'dev' into docker_package
|
2022-07-12 14:38:30 +08:00 |
|
dinggang
|
5a603f5cf0
|
...
|
2022-07-12 14:08:53 +08:00 |
|
wangliwen
|
60d3505364
|
Merge branch 'master' into docker_package
|
2022-07-12 14:03:46 +08:00 |
|
wangliwen
|
5a2e6727f7
|
...
|
2022-07-12 14:02:40 +08:00 |
|
wangliwen
|
e0a6369b5a
|
Merge branch 'master' into docker_package
|
2022-07-12 11:38:01 +08:00 |
|
wangliwen
|
454b0c5ed6
|
处理摄像头
|
2022-07-12 11:36:56 +08:00 |
|
wangliwen
|
4e063c2408
|
Merge branch 'master' into docker_package
|
2022-07-12 10:43:26 +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
|
64e82a94fa
|
Merge branch 'master' into docker_package
|
2022-07-11 18:12:54 +08:00 |
|
wangliwen
|
15cc666261
|
根据申请标识获取本次申请的分部门申请信息
|
2022-07-11 17:52:43 +08:00 |
|
wangliwen
|
c27d2c9c78
|
流程流转异常
|
2022-07-11 15:43:40 +08:00 |
|
wangliwen
|
6ac753b68b
|
Merge branch 'master' into docker_package
|
2022-07-11 15:33:57 +08:00 |
|
wangliwen
|
588b41669d
|
resource 更新失败
|
2022-07-11 15:33:23 +08:00 |
|
wangliwen
|
447760f509
|
Merge branch 'master' into docker_package
|
2022-07-11 14:33:40 +08:00 |
|
wangliwen
|
7a15f3ad92
|
同一次批量申请做好标识
|
2022-07-11 14:32:25 +08:00 |
|
wangliwen
|
bbffe9a6e5
|
Merge branch 'master' into docker_package
|
2022-07-11 13:49:22 +08:00 |
|
wangliwen
|
e43e86b30b
|
能力下线对各类统计的影响
|
2022-07-11 13:48:49 +08:00 |
|
wangliwen
|
92ab97f795
|
Merge branch 'master' into docker_package
|
2022-07-11 11:27:45 +08:00 |
|
wangliwen
|
9abc6bf96e
|
npe
|
2022-07-11 11:27:04 +08:00 |
|
wangliwen
|
b8de1070fc
|
...
|
2022-07-11 11:08:21 +08:00 |
|
wangliwen
|
6b5a55881c
|
Merge branch 'master' into docker_package
|
2022-07-11 11:06:46 +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
|
da499d088d
|
Merge branch 'master' into docker_package
|
2022-07-08 17:44:44 +08:00 |
|
wangliwen
|
c7a4e1219c
|
站内信消息通知异常解决
|
2022-07-08 17:44:10 +08:00 |
|
wangliwen
|
0df88251da
|
...
|
2022-07-08 17:32:17 +08:00 |
|
wangliwen
|
30e60deda8
|
Merge branch 'dev' into docker_package
|
2022-07-08 17:21:14 +08:00 |
|
wangliwen
|
510afd01cc
|
。。。
|
2022-07-08 17:20:46 +08:00 |
|
wangliwen
|
1df08939cb
|
Merge branch 'master' into docker_package
|
2022-07-08 11:30:32 +08:00 |
|
wangliwen
|
2ab4b169f5
|
。。。
|
2022-07-08 11:29:39 +08:00 |
|
wangliwen
|
fb1ff312ec
|
Merge branch 'master' into docker_package
|
2022-07-08 11:27:37 +08:00 |
|
wangliwen
|
76584319d4
|
根据流程定义key获取对应已办任务
|
2022-07-08 11:22:29 +08:00 |
|
wangliwen
|
fe69f08765
|
Merge branch 'dev' into docker_package
|
2022-07-08 11:00:42 +08:00 |
|
wangliwen
|
a34e254e79
|
二级缓存策略调整
|
2022-07-08 11:00:17 +08:00 |
|
wangliwen
|
9fbe1a69e9
|
Merge branch 'master' into docker_package
|
2022-07-08 10:31:39 +08:00 |
|
wangliwen
|
44dd889936
|
timeout too small.
|
2022-07-08 10:31:08 +08:00 |
|
wangliwen
|
5a88770943
|
Merge branch 'master' into docker_package
|
2022-07-08 10:13:04 +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
|
486c9b8d02
|
Merge branch 'master' into docker_package
|
2022-07-08 09:38:33 +08:00 |
|
wangliwen
|
e1329442cb
|
调整pageWithAttrs 接口代码结构
|
2022-07-08 09:37:28 +08:00 |
|
wangliwen
|
0f980cf238
|
解决能力集市 筛选各类排序失效（内部二级缓存）
|
2022-07-08 09:18:03 +08:00 |
|
wangliwen
|
9be7dd5f28
|
Merge branch 'master' into docker_package
|
2022-07-07 19:56:28 +08:00 |
|
wangliwen
|
ec6597ba35
|
按总体评分 逆序与顺序
|
2022-07-07 19:55:54 +08:00 |
|
wangliwen
|
408920d950
|
Merge branch 'master' into docker_package
|
2022-07-07 19:50:55 +08:00 |
|
wangliwen
|
861e5413e5
|
排序失败
|
2022-07-07 19:49:56 +08:00 |
|
wangliwen
|
27e7aa8654
|
Merge branch 'master' into docker_package
|
2022-07-07 19:26:26 +08:00 |
|
wangliwen
|
d9511cb1c6
|
...
|
2022-07-07 19:25:19 +08:00 |
|
wangliwen
|
77722d8226
|
Merge branch 'master' into docker_package
|
2022-07-07 18:57:53 +08:00 |
|
wangliwen
|
213f25085e
|
查询所有部门
|
2022-07-07 18:57:09 +08:00 |
|
wangliwen
|
88707274d3
|
Merge branch 'master' into docker_package
|
2022-07-07 18:32:30 +08:00 |
|
wangliwen
|
4cc31af90e
|
...
|
2022-07-07 18:32:05 +08:00 |
|
wangliwen
|
b349a87010
|
Merge branch 'master' into docker_package
|
2022-07-07 18:17:15 +08:00 |
|
wangliwen
|
7dec63c6c8
|
能力申请方 能力集数目异常
|
2022-07-07 18:16:14 +08:00 |
|
wangliwen
|
75b10cd9d1
|
Merge branch 'dev' into docker_package
|
2022-07-07 17:40:03 +08:00 |
|
wangliwen
|
d84737dbd6
|
线程池调整
|
2022-07-07 17:38:58 +08:00 |
|
wangliwen
|
3189d96992
|
Merge branch 'master' into docker_package
|
2022-07-07 16:51:31 +08:00 |