Commit Graph

944 Commits

Author SHA1 Message Date
wangliwen 115bb063b8 批量申请异步处理 2022-07-18 17:20:38 +08:00
wangliwen 76f2f4a323 。。。 2022-07-18 17:11:09 +08:00
wangliwen 24d104e904 资源所属部门为空时的处理 2022-07-18 17:06:56 +08:00
wangliwen edf383ab8c ... 2022-07-18 16:55:37 +08:00
wangliwen e62756b431 fix bug 2022-07-18 16:36:28 +08:00
wangliwen da6901392c 批量进行所有应用资源 2022-07-18 16:11:21 +08:00
wangliwen 7cbbc369bb 排除特殊项目配置 2022-07-18 15:07:10 +08:00
wangliwen 7cfe1ce192 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-07-18 14:17:10 +08:00
wangliwen adc72fb15d sql文件名调整 2022-07-18 14:16:54 +08:00
dinggang 6420e23271 ... 2022-07-18 13:55:19 +08:00
dinggang 071233b34e bugfix 2022-07-18 12:48:40 +08:00
dinggang 99ee0fa9a8 Merge remote-tracking branch 'origin/dev' into dev 2022-07-18 12:04:52 +08:00
wangliwen c4bacec4bd 是否申请 bug fix 2022-07-18 11:57:01 +08:00
wangliwen 1338bd64ff 模型全量调整 2022-07-18 11:02:31 +08:00
wangliwen 641fcacc17 。。。 2022-07-18 10:30:46 +08:00
wangliwen f5e0bac27d 申购车不再只限制出组件服务 2022-07-18 10:04:32 +08:00
yitonglei 2cf7198a09 1、配置修改 2022-07-18 09:41:32 +08:00
yitonglei 0c8e905501 Merge branch 'dev' of http://15.2.21.221:3000/wangliwen/share-platform into dev 2022-07-18 09:33:21 +08:00
wangliwen 8cb469de89 。。。 2022-07-18 09:26:29 +08:00
dinggang 9c3623757b Merge branch 'dev' of http://15.2.21.221:3000/wangliwen/share-platform into dev 2022-07-18 09:20:53 +08:00
dinggang b1be59a581 bugfix 2022-07-18 09:20:25 +08:00
yitonglei 89161843d0 1、修改能力超市/基础设施的地图下面的列表查询语句,优化查询速度 2022-07-15 19:07:37 +08:00
wangliwen 6b63979594 统一okhttp客户端 2022-07-15 16:54:33 +08:00
wangliwen c3d971e56d 。。。 2022-07-15 16:44:14 +08:00
wangliwen 46b445eba9 西海岸视频预览加日志输出 2022-07-15 16:35:37 +08:00
wangliwen 33d2595974 设置流水号传参的调整 2022-07-15 16:24:19 +08:00
wangliwen b8b4623a8f 能力申请特殊处理 2022-07-15 15:25:12 +08:00
wangliwen 4c696eb196 ... 2022-07-15 12:00:29 +08:00
wangliwen 87988942fa npe 2022-07-15 11:47:40 +08:00
wangliwen d7a45b2d17 ... 2022-07-15 11:27:35 +08:00
wangliwen 6ba099605d Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-07-15 10:12:52 +08:00
wangliwen 5ef9763cae 能力使用申请可用流程是否结束来进行过滤 2022-07-15 10:01:10 +08:00
yitonglei f24b7070fc 1、新增的能力超市/基础设施的地图下面的列表查询语句进行修改 2022-07-15 09:53:54 +08:00
wangliwen 40477d75c4 流程流水号生成调整 2022-07-15 09:16:49 +08:00
wangliwen 5e07068442 TODO 写流水号使加锁 2022-07-14 18:31:33 +08:00
wangliwen 22ba83eefe Merge remote-tracking branch 'origin/dev' into dev 2022-07-14 16:17:43 +08:00
wangliwen 56316a2ce2 。。。补充部门名 2022-07-14 16:17:05 +08:00
lizhicheng 647adaf461 初步完成赋能场景、开发文档,融合服务修复 2022-07-14 15:37:19 +08:00
dinggang bc44f875b2 ... 2022-07-14 15:19:34 +08:00
dinggang 5ff1ab946f ... 2022-07-14 14:44:18 +08:00
dinggang c1e165135b Merge remote-tracking branch 'origin/dev' into dev 2022-07-14 14:12:51 +08:00
dinggang ffd3d24b6a ... 2022-07-14 14:12:17 +08:00
wangliwen 37e3ca34a8 Merge remote-tracking branch 'origin/dev' into dev 2022-07-14 13:37:12 +08:00
wangliwen 712fdf8265 。。 2022-07-14 13:37:01 +08:00
yitonglei 455f5b71d9 2022-07-14 12:54:22 +08:00
yitonglei 3b0e930aa9 1、摄像头根据区域聚合查询的sql修改 2022-07-14 12:43:59 +08:00
dinggang e3f451b375 ... 2022-07-14 11:51:31 +08:00
dinggang 2bdc46db62 ... 2022-07-14 11:50:45 +08:00
wangliwen dfaeb397da 需求评论tip 2022-07-14 11:47:29 +08:00
dinggang 311cadef3e ... 2022-07-14 11:38:30 +08:00
wangliwen 74edb1ef0c Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-07-14 11:08:56 +08:00
wangliwen 136e4453ce 流程记录返回申请单号 2022-07-14 11:08:31 +08:00
dinggang 1a4d495af5 Merge remote-tracking branch 'origin/dev' into dev 2022-07-14 11:02:30 +08:00
dinggang 861483a477 ... 2022-07-14 11:01:49 +08:00
wangliwen a001fd5963 状态 2022-07-14 10:41:47 +08:00
wangliwen 92eb9d542e 日志 2022-07-14 09:55:46 +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 589f03a103 使用单例枚举保证流水号工具类为全局单例 2022-07-14 09:35:59 +08:00
wangliwen b27ebec5ba ... 2022-07-14 09:11:51 +08:00
wangliwen 223c449417 流水号加锁 2022-07-13 18:29:22 +08:00
wangliwen 0d61729d4a TODO 流水号生成加锁 2022-07-13 18:15:20 +08:00
dinggang 8afd024265 ... 2022-07-13 18:11:51 +08:00
wangliwen a0a238b894 ... 2022-07-13 18:00:51 +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 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 31cdc17236 processForm/tabilityapplication/my_page 接口摄像头特殊处理 2022-07-13 10:19:46 +08:00
wangliwen 9426860495 npe 2022-07-12 14:56:31 +08:00
dinggang 5a603f5cf0 ... 2022-07-12 14:08:53 +08:00
wangliwen 5a2e6727f7 ... 2022-07-12 14:02:40 +08:00
wangliwen 454b0c5ed6 处理摄像头 2022-07-12 11:36:56 +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 15cc666261 根据申请标识获取本次申请的分部门申请信息 2022-07-11 17:52:43 +08:00
wangliwen c27d2c9c78 流程流转异常 2022-07-11 15:43:40 +08:00
wangliwen 588b41669d resource 更新失败 2022-07-11 15:33:23 +08:00
wangliwen 7a15f3ad92 同一次批量申请做好标识 2022-07-11 14:32:25 +08:00
wangliwen e43e86b30b 能力下线对各类统计的影响 2022-07-11 13:48:49 +08:00
wangliwen 9abc6bf96e npe 2022-07-11 11:27:04 +08:00
wangliwen b8de1070fc ... 2022-07-11 11:08:21 +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