1

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

@@ -109,7 +109,7 @@ public class InnerController extends BaseController {
             BeanUtils.copyProperties(rtkAccount,rtkInfo);
         }
         String clientIP = ServletUtil.getClientIP(request);
-        rtkUseLogService.saveLog(rtkInfo,clientIP,rtkAccountId,cameraSn);
+        rtkUseLogService.saveLog(rtkInfo,clientIP,rtkAccountId,cameraSn,rtkDevice);
         return ResultData.ok(rtkInfo);
     }
 

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

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

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

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 public class RtkUseLogServiceImpl extends ServiceImpl<IRtkUseLogMapper, RtkUseLog> implements IRtkUseLogService {
 
     @Override
-    public void saveLog(RtkInfo rtkInfo, String clientIP,Integer rtkAccountId,String cameraSn) {
+    public void saveLog(RtkInfo rtkInfo, String clientIP,Integer rtkAccountId,String cameraSn,RtkDevice rtkDevice) {
         RtkUseLog rtkUseLog = new RtkUseLog();
         BeanUtils.copyProperties(rtkInfo,rtkUseLog);
         rtkUseLog.setId(null);
@@ -39,6 +39,7 @@ public class RtkUseLogServiceImpl extends ServiceImpl<IRtkUseLogMapper, RtkUseLo
         rtkUseLog.setRtkAccountId(rtkAccountId);
         rtkUseLog.setUseType(0);
         rtkUseLog.setCameraSn(cameraSn);
+        rtkUseLog.setSgRtkSn(rtkDevice.getSgRtkSn());
         this.save(rtkUseLog);
     }
 
@@ -47,6 +48,7 @@ public class RtkUseLogServiceImpl extends ServiceImpl<IRtkUseLogMapper, RtkUseLo
         RtkUseLog rtkUseLog = new RtkUseLog();
         rtkUseLog.setVisitIp(clientIP);
         rtkUseLog.setRtkSnCode(rtkDevice.getRtkSnCode());
+        rtkUseLog.setSgRtkSn(rtkDevice.getSgRtkSn());
         rtkUseLog.setCameraSn(cameraSn);
         rtkUseLog.setUserName(rtkAccount.getUserName());
         rtkUseLog.setPassword(rtkAccount.getPassword());