|
@@ -1,14 +1,11 @@
|
|
|
package com.ozs.web.controller.accountmanagment;
|
|
|
|
|
|
-import com.alibaba.fastjson2.JSONArray;
|
|
|
-import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.ozs.common.annotation.Log;
|
|
|
import com.ozs.common.core.controller.BaseController;
|
|
|
import com.ozs.common.core.domain.AjaxResult;
|
|
|
-import com.ozs.common.core.domain.R;
|
|
|
import com.ozs.common.core.domain.entity.SysDept;
|
|
|
import com.ozs.common.core.domain.entity.SysDictData;
|
|
|
import com.ozs.common.enums.BusinessType;
|
|
@@ -22,14 +19,11 @@ import com.ozs.common.utils.http.HttpUtils;
|
|
|
import com.ozs.common.utils.poi.ExcelUtil;
|
|
|
import com.ozs.entity.*;
|
|
|
import com.ozs.entity.vo.*;
|
|
|
-import com.ozs.framework.config.ServerConfig;
|
|
|
import com.ozs.service.*;
|
|
|
import com.ozs.system.service.DataScoreUtil;
|
|
|
import com.ozs.system.service.ISysDeptService;
|
|
|
import com.ozs.system.service.ISysDictTypeService;
|
|
|
import com.ozs.utils.CameraUtil;
|
|
|
-import com.ozs.utils.CaneraConfig;
|
|
|
-import com.ozs.utils.RtspToMP4;
|
|
|
import com.ozs.web.core.config.GetCameraPreviewURL;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -49,7 +43,6 @@ import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
-import java.util.concurrent.TimeUnit;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -87,6 +80,8 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
private CameraUtil cameraUtil;
|
|
|
@Autowired
|
|
|
private ISysDictTypeService dictTypeService;
|
|
|
+ @Autowired
|
|
|
+ private TerminalHeartbeatLogService terminalHeartbeatLogService;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -1032,5 +1027,15 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
cameraUtil.videoCompression(code);
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
|
+
|
|
|
+ @GetMapping(value = "/terminalHeartbeatLog")
|
|
|
+ public AjaxResult terminalHeartbeatLog() {
|
|
|
+ TerminalHeartbeatLog terminalHeartbeatLog=new TerminalHeartbeatLog();
|
|
|
+ terminalHeartbeatLog.setId(terminalHeartbeatLogService.count()+1);
|
|
|
+ terminalHeartbeatLog.setCameraCode("111");
|
|
|
+ terminalHeartbeatLog.setCreateTime(new Date());
|
|
|
+ boolean save = terminalHeartbeatLogService.save(terminalHeartbeatLog);
|
|
|
+ return AjaxResult.success(save);
|
|
|
+ }
|
|
|
}
|
|
|
|