|
@@ -3,6 +3,7 @@ package com.ozs.controller.upload;
|
|
import com.alibaba.fastjson2.JSON;
|
|
import com.alibaba.fastjson2.JSON;
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.ozs.common.core.domain.entity.SysDictData;
|
|
import com.ozs.common.core.domain.entity.SysDictData;
|
|
import com.ozs.common.core.redis.RedisCache;
|
|
import com.ozs.common.core.redis.RedisCache;
|
|
import com.ozs.common.utils.ApiTokenUtils;
|
|
import com.ozs.common.utils.ApiTokenUtils;
|
|
@@ -575,9 +576,10 @@ public class GeoHazardMonitorTokenController {
|
|
terminal.eq(BaseTerminal::getTerminalCode, vehiclePosition.getTerminalCode());
|
|
terminal.eq(BaseTerminal::getTerminalCode, vehiclePosition.getTerminalCode());
|
|
boolean update = baseTerminalService.update(baseTerminal1, terminal);
|
|
boolean update = baseTerminalService.update(baseTerminal1, terminal);
|
|
//获取心跳接口相机记录表信息
|
|
//获取心跳接口相机记录表信息
|
|
- List<TerminalHeartbeatLog> heartbeatLogList = terminalHeartbeatLogService.list(new LambdaQueryWrapper<TerminalHeartbeatLog>()
|
|
|
|
- .orderByDesc(TerminalHeartbeatLog::getCreateTime)
|
|
|
|
- .last("limit 4"));
|
|
|
|
|
|
+ List<TerminalHeartbeatLog> heartbeatLogList = terminalHeartbeatLogService.list(new QueryWrapper<TerminalHeartbeatLog>()
|
|
|
|
+ .select("DISTINCT camera_code") // 替换your_distinct_field1, your_distinct_field2为实际需要去重的字段名
|
|
|
|
+ .orderByDesc("create_time")
|
|
|
|
+ .last("limit 2"));
|
|
List<String> codeList = new ArrayList<>();
|
|
List<String> codeList = new ArrayList<>();
|
|
log.info("-----heartbeatLogList----->" + heartbeatLogList);
|
|
log.info("-----heartbeatLogList----->" + heartbeatLogList);
|
|
if (!ObjectUtils.isEmpty(heartbeatLogList)) {
|
|
if (!ObjectUtils.isEmpty(heartbeatLogList)) {
|