设备，账号添加禁用状态

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

@@ -49,11 +49,14 @@ public class RtkUseLog implements Serializable {
     @TableField("port")
     private String port;
 
-    @TableField("type")
-    private Integer type;
+    @TableField("rtk_type")
+    private Integer rtkType;
 
-    @TableField("status")
-    private Integer status;
+    @TableField("account_status")
+    private Integer accountStatus;
+
+    @TableField("use_type")
+    private Integer useType;
 
     @TableField("visit_ip")
     private String visitIp;

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

@@ -124,7 +124,8 @@ public class InnerController extends BaseController {
         if(rtkDevice == null){
             throw new BusinessException(ResultCode.RTK_SN_CODE_NOT_EXIT);
         }
-        rtkAccountService.stop(rtkSnCode);
+        String clientIP = ServletUtil.getClientIP(request);
+        rtkAccountService.stop(rtkDevice,clientIP);
         return ResultData.ok();
     }
 }

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

@@ -2,6 +2,7 @@ package com.fdkankan.manage.service;
 
 import com.fdkankan.manage.entity.RtkAccount;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.entity.RtkDevice;
 import com.fdkankan.manage.vo.request.RtkInfoParam;
 
 import java.util.List;
@@ -20,7 +21,7 @@ public interface IRtkAccountService extends IService<RtkAccount> {
 
     void updateAccountStatus(Integer id, int status);
 
-    void stop(String rtkSnCode);
+    void stop(RtkDevice rtkDevice, String clientIP);
 
     Object pageList(RtkInfoParam param);
 

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

@@ -1,5 +1,7 @@
 package com.fdkankan.manage.service;
 
+import com.fdkankan.manage.entity.RtkAccount;
+import com.fdkankan.manage.entity.RtkDevice;
 import com.fdkankan.manage.entity.RtkInfo;
 import com.fdkankan.manage.entity.RtkUseLog;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,6 +18,7 @@ import com.fdkankan.manage.vo.request.RtkInfoParam;
 public interface IRtkUseLogService extends IService<RtkUseLog> {
 
     void saveLog(RtkInfo rtkInfo, String clientIP,Integer rtkAccountId);
+    void saveLog(RtkDevice rtkDevice, String clientIP, RtkAccount rtkAccount);
 
     RtkUseLog getByRtkSn(String rtkSnCode);
 

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

@@ -136,11 +136,12 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
     }
 
     @Override
-    public void stop(String rtkSnCode) {
-        String redisKey = "4dkankan:rtk:snCode:"+rtkSnCode;
+    public void stop(RtkDevice rtkDevice,String clientIP) {
+        String redisKey = "4dkankan:rtk:snCode:"+rtkDevice.getRtkSnCode();
         if(redisUtil.hasKey(redisKey)){
             String jsonStr = redisUtil.get(redisKey);
             RtkAccount rtkAccount = JSONObject.parseObject(jsonStr, RtkAccount.class);
+            rtkUseLogService.saveLog(rtkDevice,clientIP,rtkAccount);
             updateAccountStatus(rtkAccount.getId(),1);
             redisUtil.del(redisKey);
         }

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

@@ -3,9 +3,7 @@ package com.fdkankan.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.common.PageInfo;
-import com.fdkankan.manage.entity.RtkInfo;
-import com.fdkankan.manage.entity.RtkUseLog;
-import com.fdkankan.manage.entity.SysUser;
+import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.mapper.IRtkUseLogMapper;
 import com.fdkankan.manage.service.IRtkUseLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -38,8 +36,25 @@ public class RtkUseLogServiceImpl extends ServiceImpl<IRtkUseLogMapper, RtkUseLo
         rtkUseLog.setCreateTime(null);
         rtkUseLog.setUpdateTime(null);
         rtkUseLog.setVisitIp(clientIP);
-        rtkUseLog.setType(rtkInfo.getRtkType());
         rtkUseLog.setRtkAccountId(rtkAccountId);
+        rtkUseLog.setUseType(0);
+        this.save(rtkUseLog);
+    }
+
+    @Override
+    public void saveLog(RtkDevice rtkDevice, String clientIP, RtkAccount rtkAccount) {
+        RtkUseLog rtkUseLog = new RtkUseLog();
+        rtkUseLog.setVisitIp(clientIP);
+        rtkUseLog.setRtkSnCode(rtkDevice.getRtkSnCode());
+        rtkUseLog.setUserName(rtkAccount.getUserName());
+        rtkUseLog.setPassword(rtkAccount.getPassword());
+        rtkUseLog.setIpAddr(rtkAccount.getIpAddr());
+        rtkUseLog.setMountPoint(rtkAccount.getMountPoint());
+        rtkUseLog.setRtkType(rtkDevice.getRtkType());
+        rtkUseLog.setAccountStatus(rtkAccount.getStatus());
+        rtkUseLog.setVisitIp(clientIP);
+        rtkUseLog.setRtkAccountId(rtkAccount.getId());
+        rtkUseLog.setUseType(1);
         this.save(rtkUseLog);
     }