wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,100 Commits 6 Branches 12 Tags 25 MiB
Commit Graph

1077 Commits

Author SHA1 Message Date
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
wangliwen cd87eb6072 sql调整 2022-07-07 16:50:01 +08:00
wangliwen e6a6d64d38 Merge branch 'dev' into docker_package 
# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java
 2022-07-07 16:05:13 +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 4842aa936f 自动通过的评论状态不对？ 2022-07-07 15:39:09 +08:00
wangliwen 0a0f3543c7 Merge branch 'dev' into docker_package 2022-07-07 15:18:38 +08:00
wangliwen 7c5362464e 。。。 2022-07-07 15:18:18 +08:00
wangliwen 80356dff2d Merge branch 'dev' into docker_package 2022-07-07 14:58:54 +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 fa34ec0c2b Merge branch 'dev' into docker_package 2022-07-07 14:18:04 +08:00
wangliwen 2041c6b558 ...调整 2022-07-07 14:17:49 +08:00
wangliwen c69f7ea262 Merge branch 'dev' into docker_package 2022-07-07 13:57:14 +08:00
wangliwen 9226d20e7a 。。。 2022-07-07 13:57:02 +08:00
wangliwen a29c377456 Merge branch 'master' into docker_package 2022-07-07 12:37:30 +08:00
wangliwen e494a94c57 异步更新访问量 2022-07-07 12:00:42 +08:00
wangliwen 8844a9fdf2 Merge branch 'dev' into docker_package 2022-07-07 11:53:56 +08:00
wangliwen fc715c9cd4 屮 2022-07-07 11:53:46 +08:00
wangliwen 816bf600ad Merge branch 'dev' into docker_package 2022-07-07 11:38:51 +08:00
wangliwen 8371b085f4 。。。 2022-07-07 11:38:35 +08:00
wangliwen d568739dfa Merge branch 'dev' into docker_package 2022-07-07 10:29:51 +08:00
wangliwen ac7f9f5b68 所有流程审核人为发起人时，默认审核通过 2022-07-07 10:29:28 +08:00
wangliwen 2dc4a978ed Merge branch 'dev' into docker_package 2022-07-07 10:07:56 +08:00
wangliwen 08e3b2d09a 字体缺失，镜像内处理 2022-07-07 10:07:49 +08:00
wangliwen 03129a13c2 需求审核人为发起人时，默认通过 2022-07-07 10:04:06 +08:00
wangliwen 446a0928bc 容器内字体缺失 2022-07-07 09:54:02 +08:00
wangliwen ceb5c5fdea Merge branch 'dev' into docker_package 2022-07-06 17:58:36 +08:00
wangliwen ec7da281e6 ... 2022-07-06 17:58:24 +08:00
wangliwen eaaac41e48 Merge branch 'dev' into docker_package 2022-07-06 17:47:04 +08:00
wangliwen fb28534f56 工作台异常 2022-07-06 17:46:51 +08:00
wangliwen f553d9de0b Merge branch 'dev' into docker_package 2022-07-06 17:25:38 +08:00
wangliwen fbb5fa3bc3 npe 2022-07-06 17:25:16 +08:00
wangliwen 17c54835f4 Merge branch 'dev' into docker_package 2022-07-06 16:30:18 +08:00
wangliwen 089ff2bb3a npe 2022-07-06 16:30:07 +08:00
wangliwen 49d7d2d1f0 Merge branch 'master' into docker_package 2022-07-06 15:59:27 +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 e606ec0499 Merge branch 'master' into docker_package 2022-07-06 11:51:26 +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 7141447306 。。。 2022-07-06 09:14:52 +08:00
wangliwen 11f2d4d835 容器内调试 2022-07-05 19:33:23 +08:00
wangliwen 45fb520d1a ... 2022-07-05 19:22:34 +08:00
wangliwen 8a2fa967e2 Merge branch 'master' into docker_package 2022-07-05 18:23:23 +08:00
wangliwen 6eb4596a66 ... 2022-07-05 18:22:20 +08:00
wangliwen a5418338a2 Merge branch 'master' into docker_package 2022-07-05 17:33:28 +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 eb287b4f3d Merge branch 'master' into docker_package 2022-07-05 15:57:47 +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 3d08431a33 Merge branch 'master' into docker_package 2022-07-05 14:21:03 +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
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