校验机器码

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -75,6 +75,7 @@ public enum ResultCode  {
     READ_MACHINE_CODE_ERROR(50057, "读取机器码失败!"),
     GET_MACHINE_CODE_ERROR(50058, "获取授权码失败!"),
     RECOED_NO_EXITS(50058, "记录不存在!"),
+    MACHINE_CODE_EXITS(50059, "当前设备已存在授权记录!"),
     ;
 
     private Integer code;

src/main/java/com/fdkankan/manage/controller/AuthorizeInstallController.java

@@ -8,12 +8,9 @@ import com.fdkankan.manage.entity.AuthorizeModeling;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.service.IAuthorizeInstallService;
 import com.fdkankan.manage.vo.request.AuthorizeParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -48,5 +45,13 @@ public class AuthorizeInstallController {
         authorizeInstallService.removeById(param.getId());
         return ResultData.ok();
     }
+
+    @PostMapping("/checkMachineCode")
+    public ResultData checkMachineCode(@RequestBody AuthorizeInstall param){
+        if(StringUtils.isBlank(param.getMachineCode())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        return ResultData.ok(authorizeInstallService.checkMachineCode(param.getMachineCode()));
+    }
 }
 

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

@@ -109,6 +109,9 @@ public class AuthorizeCamera implements Serializable {
     @TableField("sys_user_id")
     private Long sysUserId;
 
+    @TableField(exist = false)
+    private String sysUserName;
+
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
     private String recStatus;

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

@@ -97,6 +97,9 @@ public class AuthorizeInstall implements Serializable {
     @TableField("sys_user_id")
     private Long sysUserId;
 
+    @TableField(exist = false)
+    private String sysUserName;
+
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
     private String recStatus;

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

@@ -96,6 +96,9 @@ public class AuthorizeModeling implements Serializable {
     @TableField("sys_user_id")
     private Long sysUserId;
 
+    @TableField(exist = false)
+    private Long sysUserName;
+
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
     private String recStatus;

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

@@ -2,7 +2,6 @@ package com.fdkankan.manage.service;
 
 import com.fdkankan.manage.entity.AuthorizeInstall;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.manage.entity.AuthorizeModeling;
 import com.fdkankan.manage.vo.request.AuthorizeParam;
 
 /**
@@ -18,4 +17,6 @@ public interface IAuthorizeInstallService extends IService<AuthorizeInstall> {
     Object pageList(AuthorizeParam param);
 
     AuthorizeInstall addOrUpdate(AuthorizeInstall param);
+
+    AuthorizeInstall checkMachineCode(String machineCode);
 }

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

@@ -5,16 +5,14 @@ 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.common.ResultCode;
-import com.fdkankan.manage.entity.AuthorizeCamera;
-import com.fdkankan.manage.entity.AuthorizeCameraDetail;
-import com.fdkankan.manage.entity.AuthorizeCameraLog;
-import com.fdkankan.manage.entity.AuthorizeInstall;
+import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.IAuthorizeCameraMapper;
 import com.fdkankan.manage.service.IAuthorizeCameraDetailService;
 import com.fdkankan.manage.service.IAuthorizeCameraLogService;
 import com.fdkankan.manage.service.IAuthorizeCameraService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.vo.request.AuthorizeParam;
 import com.fdkankan.reg.RegCodeUtil;
 import com.fdkankan.reg.dto.CamRegDto;
@@ -26,9 +24,8 @@ import org.ini4j.Reg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -45,6 +42,8 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
     IAuthorizeCameraDetailService authorizeCameraDetailService;
     @Autowired
     IAuthorizeCameraLogService authorizeCameraLogService;
+    @Autowired
+    ISysUserService sysUserService;
 
     @Override
     public Object pageList(AuthorizeParam param) {
@@ -66,6 +65,13 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
         }
         wrapper.orderByDesc(AuthorizeCamera::getCreateTime);
         Page<AuthorizeCamera> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        Set<Long> sysIds = page.getRecords().stream().map(AuthorizeCamera::getSysUserId).collect(Collectors.toSet());
+        HashMap<Long, SysUser> userMap = sysUserService.getByIds(sysIds);
+        for (AuthorizeCamera record : page.getRecords()) {
+            if(userMap.get(record.getSysUserId())!=null){
+                record.setSysUserName(userMap.get(record.getSysUserId()).getNickName());
+            }
+        }
         return PageInfo.PageInfo(page);
     }
 

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

@@ -6,17 +6,24 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.AuthorizeInstall;
-import com.fdkankan.manage.entity.AuthorizeModeling;
+import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.IAuthorizeInstallMapper;
 import com.fdkankan.manage.service.IAuthorizeInstallService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.vo.request.AuthorizeParam;
 import com.fdkankan.reg.RegCodeUtil;
 import com.fdkankan.reg.dto.MachineRegDto;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -28,6 +35,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class AuthorizeInstallServiceImpl extends ServiceImpl<IAuthorizeInstallMapper, AuthorizeInstall> implements IAuthorizeInstallService {
 
+    @Autowired
+    ISysUserService sysUserService;
+
     @Override
     public Object pageList(AuthorizeParam param) {
         LambdaQueryWrapper<AuthorizeInstall> wrapper = new LambdaQueryWrapper<>();
@@ -48,6 +58,13 @@ public class AuthorizeInstallServiceImpl extends ServiceImpl<IAuthorizeInstallMa
         }
         wrapper.orderByDesc(AuthorizeInstall::getCreateTime);
         Page<AuthorizeInstall> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        Set<Long> sysIds = page.getRecords().stream().map(AuthorizeInstall::getSysUserId).collect(Collectors.toSet());
+        HashMap<Long, SysUser> userMap = sysUserService.getByIds(sysIds);
+        for (AuthorizeInstall record : page.getRecords()) {
+            if(userMap.get(record.getSysUserId())!=null){
+                record.setSysUserName(userMap.get(record.getSysUserId()).getNickName());
+            }
+        }
         return PageInfo.PageInfo(page);
     }
 
@@ -75,4 +92,26 @@ public class AuthorizeInstallServiceImpl extends ServiceImpl<IAuthorizeInstallMa
         this.saveOrUpdate(param);
         return param;
     }
+
+    @Override
+    public AuthorizeInstall checkMachineCode(String machineCode) {
+        LambdaQueryWrapper<AuthorizeInstall> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AuthorizeInstall::getMachineCode,machineCode);
+        List<AuthorizeInstall> list = this.list(wrapper);
+        if(list!=null && list.size() >0){
+            return list.get(0);
+        }
+        MachineRegDto machineRegDto = RegCodeUtil.ParseMachineCode(machineCode);
+        if(machineRegDto == null){
+            throw new BusinessException(ResultCode.READ_MACHINE_CODE_ERROR);
+        }
+        String uuid = machineRegDto.getUuid();
+        LambdaQueryWrapper<AuthorizeInstall> wrapper2 = new LambdaQueryWrapper<>();
+        wrapper2.eq(AuthorizeInstall::getMachineUuid,uuid);
+        List<AuthorizeInstall> list2 = this.list(wrapper2);
+        if(list2!=null && list2.size() >0){
+            return list2.get(0);
+        }
+        return null;
+    }
 }

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

@@ -4,14 +4,22 @@ import cn.dev33.satoken.stp.StpUtil;
 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.AuthorizeCamera;
 import com.fdkankan.manage.entity.AuthorizeModeling;
+import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.mapper.IAuthorizeModelingMapper;
 import com.fdkankan.manage.service.IAuthorizeModelingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.vo.request.AuthorizeParam;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -23,6 +31,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class AuthorizeModelingServiceImpl extends ServiceImpl<IAuthorizeModelingMapper, AuthorizeModeling> implements IAuthorizeModelingService {
 
+    @Autowired
+    ISysUserService sysUserService;
+
     @Override
     public Object pageList(AuthorizeParam param) {
         LambdaQueryWrapper<AuthorizeModeling> wrapper = new LambdaQueryWrapper<>();
@@ -40,6 +51,13 @@ public class AuthorizeModelingServiceImpl extends ServiceImpl<IAuthorizeModeling
         }
         wrapper.orderByDesc(AuthorizeModeling::getCreateTime);
         Page<AuthorizeModeling> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        Set<Long> sysIds = page.getRecords().stream().map(AuthorizeModeling::getSysUserId).collect(Collectors.toSet());
+        HashMap<Long, SysUser> userMap = sysUserService.getByIds(sysIds);
+        for (AuthorizeModeling record : page.getRecords()) {
+            if(userMap.get(record.getSysUserId())!=null){
+                record.setSysUserName(userMap.get(record.getSysUserId()).getNickName());
+            }
+        }
         return PageInfo.PageInfo(page);
     }