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

1445 Commits

Author SHA1 Message Date
wangliwen 21a56a4d26 ... 2022-09-26 16:25:38 +08:00
wangliwen 0e4c61cda1 能力申请增加当前节点信息 2022-09-26 16:07:28 +08:00
wangliwen 48c80cb357 能力申请通知调整 2022-09-26 15:39:40 +08:00
wangliwen 5edf6803e9 ... 2022-09-26 14:21:46 +08:00
lizhicheng c64c3b4278 统计报表修改 2022-09-23 17:42:43 +08:00
lizhicheng 4aab62391a 西海岸bug修复 2022-09-23 09:17:41 +08:00
lizhicheng 51682736e6 新增功能：无人机、单兵设备审批 2022-09-21 21:57:38 +08:00
lizhicheng 98ae1d69bd 云脑群网关统计对接 2022-09-20 13:05:08 +08:00
lizhicheng ffa1ebc9f7 西海岸需求：通知消息体现资源 2022-09-20 10:25:11 +08:00
wangliwen 347961cbd2 ... 2022-09-19 11:49:06 +08:00
wangliwen 8b8d155bc2 /resource/selectAppList 接口增加参数 area 2022-09-19 11:06:03 +08:00
wangliwen cda3c4968a ... 2022-09-16 14:35:30 +08:00
wangliwen a0508e76ff ... 2022-09-16 14:21:00 +08:00
wangliwen 71611ec1d6 npe 2022-09-16 11:45:14 +08:00
wangliwen 8e5648b964 能力申请前端传用户部门id时，更新用户部门id（存在用户原有部门被删除的情况 屮） 2022-09-16 10:53:17 +08:00
lizhicheng e539922487 申请、上架全局统计优化 2022-09-14 19:38:51 +08:00
lizhicheng 4e027e9f04 新增上架、申请详情统计 2022-09-14 17:09:13 +08:00
huangweixiong 7cbdb1c555 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:
  新增上架统计api
  新增统计api
 2022-09-14 17:05:58 +08:00
huangweixiong b8e3884c6d 修改亚威通知字段 2022-09-14 17:05:15 +08:00
lizhicheng 3f0f344d5b 新增上架统计api 
按照部门、能力类型、组件类型统计能力上架情况
 2022-09-14 14:19:50 +08:00
lizhicheng c3541440c5 新增统计api 
按照部门、能力类型、组件类型统计能力使用情况
 2022-09-13 17:42:50 +08:00
huangweixiong 3c8d2d6ccd 人员同步添加日志 2022-09-13 14:51:49 +08:00
wangliwen df7da72a99 ... 2022-09-13 09:44:00 +08:00
wangliwen 9a0c01619e 屮 2022-09-08 17:00:21 +08:00
lizhicheng 3c51f94840 云脑群网关代码优化 2022-09-08 10:31:48 +08:00
lizhicheng 3da00d0ce9 添加网关配置项 2022-09-08 10:30:17 +08:00
lizhicheng 866bbd1faf 融合服务：新增申请量统计功能 2022-09-07 15:42:00 +08:00
lizhicheng 2a453b02d8 云脑群网关接入 2022-09-07 13:46:14 +08:00
lizhicheng 2349aec38e 通知消息修改 2022-09-07 11:03:35 +08:00
dinggang 2ce9eac65d 查询最新能力增加所属部门名称 2022-09-05 09:35:55 +08:00
wangliwen 606757b31e npe 2022-09-02 14:22:23 +08:00
wangliwen 9a9d791ae5 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-09-02 11:32:41 +08:00
wangliwen d143699684 ... 2022-09-02 11:32:15 +08:00
zhangzhikang 2b1bc48814 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-09-02 11:09:11 +08:00
zhangzhikang 4f33fac986 0902会议室禅道问题修改 2022-09-02 11:08:54 +08:00
wangliwen c542c51e5c ... 2022-09-02 09:20:13 +08:00
Koi-tsk 087b1ca78f 停用账号不分配审批bug修复 2022-09-01 17:10:47 +08:00
wangliwen 7865ebbd27 能力申请V3 免批判断 2022-09-01 17:04:09 +08:00
wangliwen f3a155c44d Merge remote-tracking branch 'origin/dev' into dev 2022-09-01 13:48:11 +08:00
wangliwen 82a96dba99 ... 2022-09-01 13:47:55 +08:00
dinggang 7bdbc7dcb1 编目更新 2022-09-01 11:51:48 +08:00
zhangzhikang 28f4558fa6 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-31 18:27:44 +08:00
zhangzhikang 9c7470a123 0831会议室禅道问题修改 2022-08-31 18:27:31 +08:00
wangliwen e251ae518f Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-31 16:54:09 +08:00
wangliwen be6968c78f 发送消息到亚微 2022-08-31 16:53:43 +08:00
yitonglei 82ca10d9eb no message 2022-08-31 16:19:43 +08:00
yitonglei cdca90474d Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-31 15:48:50 +08:00
yitonglei aa9f756f2c 添加注释，并删掉无用的注释 2022-08-31 15:48:15 +08:00
Koi-tsk c62cfc25a6 自动审批通过的节点不发消息 2022-08-31 15:31:01 +08:00
yitonglei d452ddb4fb 修改从金宏网获取用户的方法，增加自动任务调度功能 2022-08-31 13:50:46 +08:00
wangliwen ce1bce47c5 ... 2022-08-31 09:47:46 +08:00
wangliwen c7adca34bd 使用索引替换 2022-08-30 15:20:35 +08:00
wangliwen f95d2d0157 ... 2022-08-30 13:30:28 +08:00
wangliwen 35f004a75d ... 2022-08-30 13:03:34 +08:00
wangliwen b3074d25ad Merge remote-tracking branch 'origin/dev' into dev 2022-08-30 12:54:56 +08:00
wangliwen 77099bd434 是否申请的状态 2022-08-30 12:54:42 +08:00
Koi-tsk 795d890cd6 1.停用用户不分配审批 
2.连续重复只审批一次
 2022-08-30 11:50:40 +08:00
wangliwen fb95b0cfa7 ... 2022-08-30 11:30:24 +08:00
wangliwen d8e44a1f49 ... 2022-08-30 10:41:01 +08:00
wangliwen b835ce3f73 知识库左边树数据异常 2022-08-30 10:08:30 +08:00
Koi-tsk 13934c1da9 融合服务-数据资源bug修复 2022-08-29 10:08:10 +08:00
yitonglei 0f20088c46 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-26 18:29:47 +08:00
yitonglei 664a22ce4b no message 2022-08-26 18:28:08 +08:00
Koi-tsk c2a949ad13 融合服务-数据资源暂时注释 2022-08-26 18:16:34 +08:00
yitonglei 246bc4b4df Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-26 17:59:37 +08:00
yitonglei 0bfef296ab 从金宏获取用户增加更新能力 2022-08-26 17:59:02 +08:00
huangweixiong 73b02e3ce6 视频token失效重试 2022-08-26 17:56:13 +08:00
huangweixiong 12861d1c24 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:
  v3审批：当前审批与申请人一样，默认通过
  融合服务修改
  删除不需要的注释
  。。。
 2022-08-26 17:39:32 +08:00
huangweixiong 1e321145ac 视频流token失效重试 2022-08-26 17:39:19 +08:00
Koi-tsk fdc9019a4b v3审批：当前审批与申请人一样，默认通过 2022-08-26 16:26:18 +08:00
Koi-tsk ffe1b86a28 融合服务修改 2022-08-26 14:47:55 +08:00
wangliwen 2590638c22 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-26 14:12:23 +08:00
wangliwen 8ce17a5601 。。。 2022-08-26 14:12:13 +08:00
huangweixiong 951923b551 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:
  同步知识库问题
  。。。
  user表新增字段
  融合服务修改
  修改获从金宏网获取用户信息，但是还是获取不到guid
  同步知识库的优化
  能力申请v3-bug fix
  ...
  ...
  调整跨区判断
  更新能力申请模型v3
  接口开启gzip压缩
  区、市监听器:修改表单字段获取逻辑
  applyState 字段返回值不一致的问题fix
  npe fix

# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/sys/entity/SysUserEntity.java
 2022-08-26 13:47:12 +08:00
huangweixiong bf8a701e57 金宏待办推送对接 2022-08-26 13:44:04 +08:00
wangliwen 841cb32035 同步知识库问题 2022-08-26 11:36:42 +08:00
wangliwen 5727a36b3f 。。。 2022-08-26 11:27:37 +08:00
yitonglei 1f6438086c Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-26 11:03:23 +08:00
yitonglei e7ce6d3a1c user表新增字段 2022-08-26 11:02:03 +08:00
Koi-tsk 1336f6d5e4 融合服务修改 2022-08-26 10:37:20 +08:00
yitonglei 2d403dcc9e 修改获从金宏网获取用户信息，但是还是获取不到guid 2022-08-26 09:05:38 +08:00
wangliwen 70c706ba73 同步知识库的优化 2022-08-25 17:55:27 +08:00
Koi-tsk 30b5ee12f0 能力申请v3-bug fix 2022-08-25 14:52:20 +08:00
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