Commit Graph

206 Commits

Author SHA1 Message Date
yitonglei d29b05fc32 1、新增工地接口 2022-05-17 17:04:30 +08:00
wuweida 0cacf6c8fa 添加swagger注释 2022-05-17 13:59:19 +08:00
wuweida 0f9588aa4c 1 2022-05-17 13:40:02 +08:00
wuweida 034a99ba94 Merge remote-tracking branch 'origin/master' 2022-05-17 13:35:11 +08:00
yitonglei 238e13d98e 1、修改swagger的相关注解 2022-05-17 13:34:54 +08:00
wuweida 3a2f2b8e38 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/hisense/monitormanage/controller/Controller.java
2022-05-17 13:31:30 +08:00
yitonglei 5a3c335c79 1、修改swagger的相关注解 2022-05-17 13:23:43 +08:00
yitonglei 4cf8203977 1、修改swagger的相关注解 2022-05-17 13:14:59 +08:00
wuweida a41d0a0b7e 商汤接口对接 2022-05-17 11:43:00 +08:00
yitonglei f7b023478e Merge remote-tracking branch 'origin/master' 2022-05-17 11:38:08 +08:00
yitonglei a80ebd353a 1、增加swagger配置 2022-05-17 11:36:14 +08:00
wuweida d4894d4767 Merge remote-tracking branch 'origin/master' 2022-05-16 15:16:20 +08:00
wuweida f2aff62d51 查询摄像头详细信息优化
添加订阅任务下发接口
2022-05-16 15:16:04 +08:00
yitonglei 8ea3443791 1、新增获取最新客流列表--从表获取 2022-05-16 13:30:27 +08:00
yitonglei 8d052e3918 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/hisense/monitormanage/utils/EhcacheUtil.java
2022-05-16 09:15:38 +08:00
yitonglei d8fb61bfb6 1.修改查询视频视频点播巡检结果,在MonitorService中将listChannelPlayStates做成调度任务,每天的6点5分执行一次,查询当前时间截止向前推1天 2022-05-16 09:14:39 +08:00
yitonglei 50fbfd6645 1.修改查询视频视频点播巡检结果,在MonitorService中将listChannelPlayStates做成调度任务,每天的6点5分执行一次,查询当前时间截止向前推1天 2022-05-16 09:14:01 +08:00
wuweida 45b906d816 查询全部摄像头优化 2022-05-14 11:38:59 +08:00
wuweida 01ecbf0a1d 摄像头截图优化 2022-05-12 17:32:52 +08:00
wuweida 22ed4014a6 Merge remote-tracking branch 'origin/master' 2022-05-12 17:13:34 +08:00
wuweida 3876c5834b 截图优化 2022-05-12 17:12:43 +08:00
yitonglei ae96948655 1.增加查询工地信息接口 2022-05-12 14:08:41 +08:00
wuweida bd038a0c22 按标签查询摄像头接口优化 2022-05-12 11:46:25 +08:00
wuweida b0e4365e04 接口优化 2022-05-12 11:17:58 +08:00
wuweida 442ac20d3c 查询全部摄像头接口优化 2022-05-12 10:58:33 +08:00
wuweida bac2105efb 按标签查询摄像头接口优化 2022-05-12 10:39:34 +08:00
yitonglei 8122e35574 1.查询所有摄像头 selectAll 增加缓存 2022-05-12 10:35:55 +08:00
wuweida cbfb409a11 1 2022-05-11 18:05:46 +08:00
yitonglei f6ecf0dfb0 1、controller增加了listRoadData 2022-05-11 17:37:01 +08:00
wuweida 92298bb539 1 2022-05-11 17:29:01 +08:00
wuweida 540df792eb Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/hisense/monitormanage/controller/Controller.java
2022-05-11 17:23:24 +08:00
wuweida f0e9390e4b 新增抓取摄像头截图服务
根据channelId查询摄像头详情信息优化
2022-05-11 17:21:39 +08:00
yitonglei b14134cc5a 1、修改查询游客数量接口,返回的数据包括本地 外地和总人数 2022-05-11 15:59:53 +08:00
yitonglei aafe76b886 1、新增查询道路污染情况接口,修改获取游客数据的定时任务 2022-05-11 14:49:54 +08:00
yitonglei f919ae9e51 1、修改自动获取游客数据并保存的任务调度表达式,改为cron = "0 31 10-22/1 * * ? " 2022-05-11 11:36:33 +08:00
yitonglei deaf4e2097 1、修改注释 2022-05-11 10:27:58 +08:00
yitonglei 51831372d5 1、新增了获取渣土车轨迹并保存和根据经纬度、半径查询符合条件的渣土车轨迹修改 2022-05-11 10:14:00 +08:00
yitonglei be0c88bfdc 1、新增了获取渣土车轨迹并保存和根据经纬度、半径查询符合条件的渣土车轨迹 2022-05-11 09:53:48 +08:00
wuweida 4d6a6a3649 查询摄像头优化 2022-05-10 13:54:13 +08:00
wuweida 5399a21056 Merge remote-tracking branch 'origin/master' 2022-05-10 09:03:29 +08:00
wuweida 1e3b25b350 添加根据标签名字模糊查询标签
添加根据摄像头名字模糊查询摄像头
2022-05-10 09:03:18 +08:00
yitonglei 05a99409f6 1、新增了获取渣土车轨迹并保存和根据经纬度、半径查询符合条件的渣土车轨迹 2022-05-09 17:54:17 +08:00
wuweida 73bbd006d0 根据parentId查询所有组织
根据parentId查询摄像头
2022-05-09 15:32:42 +08:00
wuweida 244599f817 根据parentId查询所有组织 2022-05-09 11:34:11 +08:00
yitonglei aac56928dd 1、修改启迪中台对接接口 2022-05-09 09:44:50 +08:00
wuweida 0fef3344ec 查询所有组织 2022-05-09 09:31:23 +08:00
wuweida c46036c450 1 2022-05-07 18:21:24 +08:00
wuweida 05527114d9 查询标签 2022-05-07 17:53:47 +08:00
wuweida a1b1c1b774 Merge branch 'master' of http://221.0.232.152:9393/monitor/monitor-manage
 Conflicts:
	src/main/java/com/hisense/monitormanage/controller/Controller.java
	src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java
2022-05-07 17:53:00 +08:00
wuweida a9b891e33c 查询标签 2022-05-07 17:49:57 +08:00