设备，账号添加禁用状态

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

@@ -31,6 +31,9 @@ public class RtkUseLog implements Serializable {
     @TableField("rtk_sn_code")
     private String rtkSnCode;
 
+    @TableField("camera_sn")
+    private String cameraSn;
+
     @TableField("rtk_account_id")
     private Integer rtkAccountId;
 

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

@@ -88,8 +88,9 @@ public class InnerController extends BaseController {
     /**
      * 相机开启rtk获取账号
      */
-    @GetMapping("/info/{rtkSnCode}")
-    public synchronized ResultData info(@PathVariable String rtkSnCode){
+    @GetMapping("/info/{rtkSnCode}/{cameraSn}")
+    public synchronized ResultData info(@PathVariable String rtkSnCode,
+                                        @PathVariable String cameraSn){
         if(StringUtils.isBlank(rtkSnCode)){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
@@ -108,15 +109,16 @@ public class InnerController extends BaseController {
             BeanUtils.copyProperties(rtkAccount,rtkInfo);
         }
         String clientIP = ServletUtil.getClientIP(request);
-        rtkUseLogService.saveLog(rtkInfo,clientIP,rtkAccountId);
+        rtkUseLogService.saveLog(rtkInfo,clientIP,rtkAccountId,cameraSn);
         return ResultData.ok(rtkInfo);
     }
 
     /**
      * 相机关闭rtk,回收账号
      */
-    @GetMapping("/stop/{rtkSnCode}")
-    public ResultData stop(@PathVariable String rtkSnCode){
+    @GetMapping("/stop/{rtkSnCode}/{cameraSn}")
+    public ResultData stop(@PathVariable String rtkSnCode,
+                           @PathVariable String cameraSn){
         if(StringUtils.isBlank(rtkSnCode)){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
@@ -125,7 +127,7 @@ public class InnerController extends BaseController {
             throw new BusinessException(ResultCode.RTK_SN_CODE_NOT_EXIT);
         }
         String clientIP = ServletUtil.getClientIP(request);
-        rtkAccountService.stop(rtkDevice,clientIP);
+        rtkAccountService.stop(rtkDevice,clientIP,cameraSn);
         return ResultData.ok();
     }
 }

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

@@ -21,7 +21,7 @@ public interface IRtkAccountService extends IService<RtkAccount> {
 
     void updateAccountStatus(Integer id, int status);
 
-    void stop(RtkDevice rtkDevice, String clientIP);
+    void stop(RtkDevice rtkDevice, String clientIP,String cameraSn);
 
     Object pageList(RtkInfoParam param);
 

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

@@ -17,8 +17,8 @@ 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);
+    void saveLog(RtkInfo rtkInfo, String clientIP,Integer rtkAccountId,String cameraSn);
+    void saveLog(RtkDevice rtkDevice, String clientIP, RtkAccount rtkAccount,String cameraSn);
 
     RtkUseLog getByRtkSn(String rtkSnCode);
 

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

@@ -136,12 +136,12 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
     }
 
     @Override
-    public void stop(RtkDevice rtkDevice,String clientIP) {
+    public void stop(RtkDevice rtkDevice,String clientIP,String cameraSn) {
         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);
+            rtkUseLogService.saveLog(rtkDevice,clientIP,rtkAccount,cameraSn);
             updateAccountStatus(rtkAccount.getId(),1);
             redisUtil.del(redisKey);
         }

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) {
+    public void saveLog(RtkInfo rtkInfo, String clientIP,Integer rtkAccountId,String cameraSn) {
         RtkUseLog rtkUseLog = new RtkUseLog();
         BeanUtils.copyProperties(rtkInfo,rtkUseLog);
         rtkUseLog.setId(null);
@@ -38,14 +38,16 @@ public class RtkUseLogServiceImpl extends ServiceImpl<IRtkUseLogMapper, RtkUseLo
         rtkUseLog.setVisitIp(clientIP);
         rtkUseLog.setRtkAccountId(rtkAccountId);
         rtkUseLog.setUseType(0);
+        rtkUseLog.setCameraSn(cameraSn);
         this.save(rtkUseLog);
     }
 
     @Override
-    public void saveLog(RtkDevice rtkDevice, String clientIP, RtkAccount rtkAccount) {
+    public void saveLog(RtkDevice rtkDevice, String clientIP, RtkAccount rtkAccount,String cameraSn) {
         RtkUseLog rtkUseLog = new RtkUseLog();
         rtkUseLog.setVisitIp(clientIP);
         rtkUseLog.setRtkSnCode(rtkDevice.getRtkSnCode());
+        rtkUseLog.setCameraSn(cameraSn);
         rtkUseLog.setUserName(rtkAccount.getUserName());
         rtkUseLog.setPassword(rtkAccount.getPassword());
         rtkUseLog.setIpAddr(rtkAccount.getIpAddr());