Commit Graph

2896 Commits

Author SHA1 Message Date
yitonglei 6f72e38a56 1、flyway增加V4.1,新增表t_region
2、修改基础设施页面地图中根据区域聚合查询的方法,区市信息以t_region表为准
2022-07-22 11:22:39 +08:00
wangliwen 622da8f4e5 Merge branch 'master' into docker_package 2022-07-22 10:28:57 +08:00
wangliwen 1ebd70df03 调整mysql 全文索引使用自然语言搜索模式 2022-07-22 10:28:37 +08:00
wangliwen f3dc7ca4d5 Merge branch 'master' into docker_package 2022-07-22 08:56:04 +08:00
yitonglei fc66ef062b 同步摄像头通道信息后删除掉经纬度有空的通道 2022-07-21 18:18:26 +08:00
wangliwen f41ef8a3ba Merge branch 'master' into docker_package 2022-07-21 17:30:31 +08:00
wangliwen 8de4de904f Merge remote-tracking branch 'origin/dev' into dev 2022-07-21 17:30:17 +08:00
wangliwen 1af2b0e48e Merge branch 'master' into docker_package 2022-07-21 17:29:38 +08:00
wangliwen 66ae7d2fe6 ... 2022-07-21 17:29:08 +08:00
dinggang 6bdd4b3c30 1.能力统计部门数统计逻辑修改 2022-07-21 17:28:13 +08:00
wangliwen aa4b0d3d70 Merge branch 'master' into docker_package 2022-07-21 16:58:23 +08:00
wangliwen 92dc144d7d 拆单 是否完成 2022-07-21 16:58:03 +08:00
wangliwen 120e5cb13a Merge branch 'master' into docker_package 2022-07-21 16:33:34 +08:00
wangliwen 7bdbecfe63 。。。 2022-07-21 16:33:20 +08:00
wangliwen 412ef1cc78 拆单审核所有流程是否完成 2022-07-21 16:31:22 +08:00
wangliwen de73c653b0 Merge branch 'master' into docker_package 2022-07-21 16:00:20 +08:00
wangliwen 0ac8ef8940 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-07-21 15:59:57 +08:00
wangliwen 544a673f2a ...websocket先收到消息? 2022-07-21 15:59:36 +08:00
dinggang 67f8811b21 ... 2022-07-21 15:40:52 +08:00
wangliwen 20851412a4 Merge branch 'master' into docker_package 2022-07-21 15:34:13 +08:00
wangliwen 4b99279d87 审核结束消息通知bug与能力申请节点不进入能力申请异常 2022-07-21 15:33:59 +08:00
wangliwen 826f327482 Merge branch 'master' into docker_package 2022-07-21 15:18:44 +08:00
wangliwen 6fae1071ff ... 2022-07-21 15:18:31 +08:00
wangliwen 53589991ea Merge branch 'master' into docker_package 2022-07-21 14:28:08 +08:00
wangliwen 2b6165be0f websocket 发送站内信通知 2022-07-21 14:27:24 +08:00
wangliwen 3941260b63 Merge branch 'master' into docker_package 2022-07-21 11:44:46 +08:00
wangliwen abbabe2e9a npe 2022-07-21 11:44:27 +08:00
wangliwen e5c683de8b Merge branch 'master' into docker_package 2022-07-21 11:04:29 +08:00
wangliwen 6a50553545 jackson允许出现特殊字符和转义符 2022-07-21 11:04:11 +08:00
wangliwen 20b7a2dccd 站内信通知异常 2022-07-21 10:54:25 +08:00
wangliwen d9de090df4 Merge branch 'master' into docker_package 2022-07-21 10:41:58 +08:00
wangliwen aad70245d8 前端无法展示异常信息 2022-07-21 10:41:46 +08:00
wangliwen 0f01dd82a5 Merge branch 'master' into docker_package 2022-07-21 10:02:49 +08:00
wangliwen 7e53cac06c Merge branch 'master' into dev 2022-07-21 10:02:30 +08:00
wangliwen 76255c5ff3 ... 2022-07-21 10:02:03 +08:00
dinggang 55ac3b8a60 1.编目更新
2.bugfix
2022-07-21 09:51:32 +08:00
wangliwen a5278aed91 Merge branch 'dev' into docker_package 2022-07-21 09:41:07 +08:00
wangliwen 162b016d36 下架支持附件 2022-07-21 09:40:55 +08:00
wangliwen 24207a2843 Merge branch 'dev' into docker_package 2022-07-21 09:08:22 +08:00
dinggang 7632d92ac2 Merge remote-tracking branch 'origin/dev' into dev 2022-07-20 18:15:03 +08:00
dinggang d7c0fa6dc2 1.新增菜单初始化数据sql
2.编目更新
3.bugfix
2022-07-20 18:14:34 +08:00
wangliwen 02322bdbb3 Merge branch 'master' into docker_package 2022-07-20 18:14:19 +08:00
wangliwen 935f8f1588 ... 2022-07-20 18:14:05 +08:00
wangliwen a960e9c894 Merge branch 'master' into docker_package 2022-07-20 17:46:39 +08:00
wangliwen 41a06c660c ... 2022-07-20 17:35:46 +08:00
wangliwen d297b6c6e1 Merge branch 'master' into docker_package 2022-07-20 17:18:14 +08:00
wangliwen 9f510817ff tabilityapplication/in_use_page 参数缺少注解 2022-07-20 17:17:58 +08:00
huangweixiong e729b95d2d Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform: (29 commits)
  屮
  ...
  ???
  。。。
  西海岸获取hls流地址更正
  增加 根据能力资源id获取该能力申请使用分页接口
  申购车模糊查询
  .
  新增日志清除任务
  能力申请全为免批资源时,流程节点默认审核通过
  1、 修改flyway 4.0语句
  1、同步摄像头标签信息时数据库配置增加默认值
  deal with
  。。。
  屮
  dev环境配置文件调整
  1、增加同步视频摄像头标签--配置文件
  1、手动更新基础设施-摄像头信息后同步monitor_service项目中标签表的信息
  deptToDoTaskPage接口优化
  ...
  ...
2022-07-20 17:00:21 +08:00
huangweixiong c925cfdad3 线上上产环境配置文件同步 2022-07-20 16:57:52 +08:00
huangweixiong 9c720dff85 网关新接口 2022-07-20 16:56:54 +08:00