国际服rtk版本

src/main/java/com/fdkankan/manage/entity/RtkInfo.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -113,4 +115,8 @@ public class RtkInfo implements Serializable {
     @TableField(exist = false)
     private String updateUserName;
 
+    @TableField(value = "failure_time",updateStrategy = FieldStrategy.IGNORED)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date failureTime;
+
 }

src/main/java/com/fdkankan/manage/inner/controller/InnerController.java

@@ -3,6 +3,7 @@ package com.fdkankan.manage.inner.controller;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.log.Log;
 import com.fdkankan.common.util.SecurityUtil;
+import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.controller.BaseController;
@@ -94,6 +95,15 @@ public class InnerController extends BaseController {
         if(StringUtils.isBlank(rtkSnCode)){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        if("aws".equals(CacheUtil.uploadType)){
+            RtkInfo rtkInfo = rtkInfoService.getByRtkSnCode(rtkSnCode);
+            if(rtkInfo == null){
+                throw new BusinessException(ResultCode.RTK_SN_CODE_NOT_EXIT);
+            }
+            String clientIP = ServletUtil.getClientIP(request);
+            rtkUseLogService.saveLog(rtkInfo,clientIP,cameraSn,0);
+            return ResultData.ok(rtkInfo);
+        }
         RtkDevice rtkDevice = rtkDeviceService.getByRtkSnCode(rtkSnCode);
         if(rtkDevice == null || rtkDevice.getUseStatus() !=0){
             throw new BusinessException(ResultCode.RTK_SN_CODE_NOT_EXIT);
@@ -122,6 +132,15 @@ public class InnerController extends BaseController {
         if(StringUtils.isBlank(rtkSnCode)){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        if("aws".equals(CacheUtil.uploadType)){
+            RtkInfo rtkInfo = rtkInfoService.getByRtkSnCode(rtkSnCode);
+            if(rtkInfo == null){
+                throw new BusinessException(ResultCode.RTK_SN_CODE_NOT_EXIT);
+            }
+            String clientIP = ServletUtil.getClientIP(request);
+            rtkUseLogService.saveLog(rtkInfo,clientIP,cameraSn,1);
+            return ResultData.ok();
+        }
         RtkDevice rtkDevice = rtkDeviceService.getByRtkSnCode(rtkSnCode);
         if(rtkDevice == null){
             throw new BusinessException(ResultCode.RTK_SN_CODE_NOT_EXIT);

src/main/java/com/fdkankan/manage/service/IRtkUseLogService.java

@@ -18,6 +18,7 @@ import com.fdkankan.manage.vo.request.RtkInfoParam;
 public interface IRtkUseLogService extends IService<RtkUseLog> {
 
     void saveLog(RtkInfo rtkInfo, String clientIP,Integer rtkAccountId,String cameraSn,RtkDevice rtkDevice);
+    void saveLog(RtkInfo rtkInfo, String clientIP,String cameraSn,Integer useType);
     void saveLog(RtkDevice rtkDevice, String clientIP, RtkAccount rtkAccount,String cameraSn);
     void saveLog(RtkAccount rtkAccount);
 

src/main/java/com/fdkankan/manage/service/impl/RtkUseLogServiceImpl.java

@@ -44,6 +44,20 @@ public class RtkUseLogServiceImpl extends ServiceImpl<IRtkUseLogMapper, RtkUseLo
     }
 
     @Override
+    public void saveLog(RtkInfo rtkInfo, String clientIP,String cameraSn,Integer useType) {
+        RtkUseLog rtkUseLog = new RtkUseLog();
+        BeanUtils.copyProperties(rtkInfo,rtkUseLog);
+        rtkUseLog.setId(null);
+        rtkUseLog.setCreateTime(null);
+        rtkUseLog.setUpdateTime(null);
+        rtkUseLog.setVisitIp(clientIP);
+        rtkUseLog.setRtkAccountId(null);
+        rtkUseLog.setUseType(useType);
+        rtkUseLog.setCameraSn(cameraSn);
+        this.save(rtkUseLog);
+    }
+
+    @Override
     public void saveLog(RtkDevice rtkDevice, String clientIP, RtkAccount rtkAccount,String cameraSn) {
         RtkUseLog rtkUseLog = new RtkUseLog();
         rtkUseLog.setVisitIp(clientIP);

src/main/java/com/fdkankan/manage/task/TaskService.java

@@ -3,6 +3,7 @@ package com.fdkankan.manage.task;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.RtkAccount;
 import com.fdkankan.manage.exception.BusinessException;
@@ -37,6 +38,9 @@ public class TaskService {
     @Scheduled(cron = "0 */1 * * * ?")
     public void task() {
         try {
+            if("aws".equals(CacheUtil.uploadType)){
+                return;
+            }
             checkAccount();
         }catch (Exception e){
             log.info("定时任务checkAccount出错：",e);
@@ -47,6 +51,9 @@ public class TaskService {
     @Scheduled(cron = "0 0 * * * ?")
     public void task2() {
         try {
+            if("aws".equals(CacheUtil.uploadType)){
+                return;
+            }
             checkAccountDb();
         }catch (Exception e){
             log.info("定时任务checkAccountDb出错：",e);