feat: device auth record and device auth api

smsb-modules/smsb-device/src/main/java/com/inspur/device/controller/SmsbDeviceAuthController.java

@@ -0,0 +1,105 @@
+package com.inspur.device.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import com.inspur.device.domain.vo.SmsbDeviceAuthVo;
+import com.inspur.device.domain.bo.SmsbDeviceAuthBo;
+import com.inspur.device.service.ISmsbDeviceAuthService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 设备鉴权
+ *
+ * @author Lion Li
+ * @date 2025-04-29
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/smsb/device/auth")
+public class SmsbDeviceAuthController extends BaseController {
+
+    private final ISmsbDeviceAuthService smsbDeviceAuthService;
+
+    /**
+     * 查询设备鉴权列表
+     */
+    @SaCheckPermission("device:auth:list")
+    @GetMapping("/list")
+    public TableDataInfo<SmsbDeviceAuthVo> list(SmsbDeviceAuthBo bo, PageQuery pageQuery) {
+        return smsbDeviceAuthService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出设备鉴权列表
+     */
+    @SaCheckPermission("device:auth:export")
+    @Log(title = "设备鉴权", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SmsbDeviceAuthBo bo, HttpServletResponse response) {
+        List<SmsbDeviceAuthVo> list = smsbDeviceAuthService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备鉴权", SmsbDeviceAuthVo.class, response);
+    }
+
+    /**
+     * 获取设备鉴权详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("device:auth:query")
+    @GetMapping("/{id}")
+    public R<SmsbDeviceAuthVo> getInfo(@NotNull(message = "主键不能为空")
+                                       @PathVariable Long id) {
+        return R.ok(smsbDeviceAuthService.queryById(id));
+    }
+
+    /**
+     * 新增设备鉴权
+     */
+    @SaCheckPermission("device:auth:add")
+    @Log(title = "设备鉴权", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SmsbDeviceAuthBo bo) {
+        return toAjax(smsbDeviceAuthService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备鉴权
+     */
+    @SaCheckPermission("device:auth:edit")
+    @Log(title = "设备鉴权", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SmsbDeviceAuthBo bo) {
+        return toAjax(smsbDeviceAuthService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备鉴权
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("device:auth:remove")
+    @Log(title = "设备鉴权", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(smsbDeviceAuthService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

smsb-modules/smsb-device/src/main/java/com/inspur/device/domain/SmsbDeviceAuth.java

@@ -0,0 +1,70 @@
+package com.inspur.device.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 设备鉴权对象 smsb_device_auth
+ *
+ * @author Lion Li
+ * @date 2025-04-29
+ */
+@Data
+@TableName("smsb_device_auth")
+public class SmsbDeviceAuth {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 设备IP
+     */
+    private String deviceIp;
+
+    /**
+     * 设备唯一标识
+     */
+    private String identifier;
+
+    /**
+     * 加密字符
+     */
+    private String encryptCode;
+
+    /**
+     * 解密字符
+     */
+    private String decryptCode;
+
+    /**
+     * 鉴权结果 smsb_device_auth_result
+     */
+    private Integer authResult;
+
+    private String authRemark;
+
+    /**
+     * 鉴权key
+     */
+    private String authKey;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+
+}

smsb-modules/smsb-device/src/main/java/com/inspur/device/domain/bo/HttpHeartbeatReq.java

@@ -10,19 +10,34 @@ import lombok.Data;
 @Data
 public class HttpHeartbeatReq {
 
-    /** 设备标识 */
+    /**
+     * 设备标识
+     */
     private String identifier;
 
-    /** 设备IP */
+    /**
+     * 设备IP
+     */
     private String deviceIp;
 
-    /** 亮度 */
+    /**
+     * 加密码
+     */
+    private String encryptCode;
+
+    /**
+     * 亮度
+     */
     private Integer bright;
 
-    /** CUP 百分比 */
+    /**
+     * CUP 百分比
+     */
     private String cpuUsage;
 
-    /** 外部存储 总量 */
+    /**
+     * 外部存储 总量
+     */
     private Long externalMemoryTotal;
 
     /** 外部存储 已使用 */

smsb-modules/smsb-device/src/main/java/com/inspur/device/domain/bo/SmsbDeviceAuthBo.java

@@ -0,0 +1,67 @@
+package com.inspur.device.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.inspur.device.domain.SmsbDeviceAuth;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 设备鉴权业务对象 smsb_device_auth
+ *
+ * @author Lion Li
+ * @date 2025-04-29
+ */
+@Data
+@AutoMapper(target = SmsbDeviceAuth.class, reverseConvertGenerate = false)
+public class SmsbDeviceAuthBo {
+
+    private Long id;
+
+    /**
+     * 设备IP
+     */
+    private String deviceIp;
+
+    /**
+     * 设备唯一标识
+     */
+    private String identifier;
+
+    /**
+     * 加密字符
+     */
+    private String encryptCode;
+
+    /**
+     * 鉴权结果 smsb_device_auth_result
+     */
+    private Integer authResult;
+
+    private String authRemark;
+
+    /**
+     * 鉴权key
+     */
+    private String authKey;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+
+}

smsb-modules/smsb-device/src/main/java/com/inspur/device/domain/vo/SmsbDeviceAuthVo.java

@@ -0,0 +1,101 @@
+package com.inspur.device.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.inspur.device.domain.SmsbDeviceAuth;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 设备鉴权视图对象 smsb_device_auth
+ *
+ * @author Lion Li
+ * @date 2025-04-29
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SmsbDeviceAuth.class)
+public class SmsbDeviceAuthVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 设备IP
+     */
+    @ExcelProperty(value = "设备IP")
+    private String deviceIp;
+
+    /**
+     * 设备唯一标识
+     */
+    @ExcelProperty(value = "设备唯一标识")
+    private String identifier;
+
+    /**
+     * 加密字符
+     */
+    @ExcelProperty(value = "加密字符")
+    private String encryptCode;
+
+    /**
+     * 解密字符
+     */
+    @ExcelProperty(value = "解密字符")
+    private String decryptCode;
+
+    /**
+     * 鉴权结果 smsb_device_auth_result
+     */
+    @ExcelProperty(value = "鉴权结果 smsb_device_auth_result", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "smsb_device_login_result")
+    private Integer authResult;
+
+    private String authRemark;
+
+    /**
+     * 鉴权key
+     */
+    @ExcelProperty(value = "鉴权key")
+    private String authKey;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty(value = "设备名称")
+    private String deviceName;
+
+
+    /**
+     * sn号
+     */
+    @ExcelProperty(value = "sn号")
+    private String serialNumber;
+
+    /**
+     * mac号
+     */
+    @ExcelProperty(value = "mac号")
+    private String mac;
+
+
+}

smsb-modules/smsb-device/src/main/java/com/inspur/device/mapper/SmsbDeviceAuthMapper.java

@@ -0,0 +1,27 @@
+package com.inspur.device.mapper;
+
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.inspur.device.domain.SmsbDeviceAuth;
+import com.inspur.device.domain.bo.SmsbDeviceAuthBo;
+import com.inspur.device.domain.vo.SmsbDeviceAuthVo;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 设备鉴权Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-04-29
+ */
+public interface SmsbDeviceAuthMapper extends BaseMapperPlus<SmsbDeviceAuth, SmsbDeviceAuthVo> {
+
+    /**
+     * 分页查询设备鉴权列表
+     * @param page
+     * @param bo
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "true", dataPermission = "false")
+    Page<SmsbDeviceAuthVo> selectPageVoList(@Param("page") Page<SmsbDeviceAuth> page, @Param("bo") SmsbDeviceAuthBo bo);
+}

smsb-modules/smsb-device/src/main/java/com/inspur/device/service/ISmsbDeviceAuthService.java

@@ -0,0 +1,78 @@
+package com.inspur.device.service;
+
+import com.inspur.device.domain.bo.HttpHeartbeatReq;
+import com.inspur.device.domain.bo.SmsbDeviceAuthBo;
+import com.inspur.device.domain.vo.HttpHeartbeatRspVo;
+import com.inspur.device.domain.vo.SmsbDeviceAuthVo;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 设备鉴权Service接口
+ *
+ * @author Lion Li
+ * @date 2025-04-29
+ */
+public interface ISmsbDeviceAuthService {
+
+    /**
+     * 查询设备鉴权
+     *
+     * @param id 主键
+     * @return 设备鉴权
+     */
+    SmsbDeviceAuthVo queryById(Long id);
+
+    /**
+     * 分页查询设备鉴权列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备鉴权分页列表
+     */
+    TableDataInfo<SmsbDeviceAuthVo> queryPageList(SmsbDeviceAuthBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的设备鉴权列表
+     *
+     * @param bo 查询条件
+     * @return 设备鉴权列表
+     */
+    List<SmsbDeviceAuthVo> queryList(SmsbDeviceAuthBo bo);
+
+    /**
+     * 新增设备鉴权
+     *
+     * @param bo 设备鉴权
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(SmsbDeviceAuthBo bo);
+
+    /**
+     * 修改设备鉴权
+     *
+     * @param bo 设备鉴权
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(SmsbDeviceAuthBo bo);
+
+    /**
+     * 校验并批量删除设备鉴权信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 设备鉴权
+     * @param requestParam
+     * @return
+     */
+    R<String> deviceAuth(HttpHeartbeatReq requestParam);
+}

smsb-modules/smsb-device/src/main/java/com/inspur/device/service/ISmsbDeviceLoginService.java

@@ -74,5 +74,5 @@ public interface ISmsbDeviceLoginService {
      * @param requestParam
      * @return
      */
-    R<HttpHeartbeatRspVo> deviceLogin(HttpHeartbeatReq requestParam);
+    R<String> deviceLogin(HttpHeartbeatReq requestParam);
 }

smsb-modules/smsb-device/src/main/java/com/inspur/device/service/impl/SmsbDeviceAuthServiceImpl.java

@@ -0,0 +1,197 @@
+package com.inspur.device.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.inspur.device.domain.SmsbDeviceAuth;
+import com.inspur.device.domain.bo.HttpHeartbeatReq;
+import com.inspur.device.domain.bo.SmsbDeviceAuthBo;
+import com.inspur.device.domain.constants.DeviceConstants;
+import com.inspur.device.domain.vo.SmsbDeviceAuthVo;
+import com.inspur.device.mapper.SmsbDeviceAuthMapper;
+import com.inspur.device.service.ISmsbDeviceAuthService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.encrypt.utils.EncryptUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备鉴权Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-04-29
+ */
+@RequiredArgsConstructor
+@Service
+@Slf4j
+public class SmsbDeviceAuthServiceImpl implements ISmsbDeviceAuthService {
+
+    private final SmsbDeviceAuthMapper baseMapper;
+
+    /**
+     * 查询设备鉴权
+     *
+     * @param id 主键
+     * @return 设备鉴权
+     */
+    @Override
+    public SmsbDeviceAuthVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询设备鉴权列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备鉴权分页列表
+     */
+    @Override
+    public TableDataInfo<SmsbDeviceAuthVo> queryPageList(SmsbDeviceAuthBo bo, PageQuery pageQuery) {
+        // LambdaQueryWrapper<SmsbDeviceAuth> lqw = buildQueryWrapper(bo);
+        Page<SmsbDeviceAuthVo> result = baseMapper.selectPageVoList(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的设备鉴权列表
+     *
+     * @param bo 查询条件
+     * @return 设备鉴权列表
+     */
+    @Override
+    public List<SmsbDeviceAuthVo> queryList(SmsbDeviceAuthBo bo) {
+        LambdaQueryWrapper<SmsbDeviceAuth> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SmsbDeviceAuth> buildQueryWrapper(SmsbDeviceAuthBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SmsbDeviceAuth> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getDeviceIp()), SmsbDeviceAuth::getDeviceIp, bo.getDeviceIp());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdentifier()), SmsbDeviceAuth::getIdentifier, bo.getIdentifier());
+        lqw.eq(StringUtils.isNotBlank(bo.getEncryptCode()), SmsbDeviceAuth::getEncryptCode, bo.getEncryptCode());
+        lqw.eq(bo.getAuthResult() != null, SmsbDeviceAuth::getAuthResult, bo.getAuthResult());
+        lqw.eq(StringUtils.isNotBlank(bo.getAuthKey()), SmsbDeviceAuth::getAuthKey, bo.getAuthKey());
+        return lqw;
+    }
+
+    /**
+     * 新增设备鉴权
+     *
+     * @param bo 设备鉴权
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(SmsbDeviceAuthBo bo) {
+        SmsbDeviceAuth add = MapstructUtils.convert(bo, SmsbDeviceAuth.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改设备鉴权
+     *
+     * @param bo 设备鉴权
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(SmsbDeviceAuthBo bo) {
+        SmsbDeviceAuth update = MapstructUtils.convert(bo, SmsbDeviceAuth.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SmsbDeviceAuth entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除设备鉴权信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    @Override
+    public R<String> deviceAuth(HttpHeartbeatReq requestParam) {
+
+        SmsbDeviceAuth insert = new SmsbDeviceAuth();
+        String deviceIp = requestParam.getDeviceIp();
+        insert.setDeviceIp(deviceIp);
+        String encryptCode = requestParam.getEncryptCode();
+        insert.setEncryptCode(encryptCode);
+        String identifier = requestParam.getIdentifier();
+        insert.setIdentifier(identifier);
+        Integer authResult = 1;
+        String authRemark = "";
+        if (StringUtils.isEmpty(identifier) || StringUtils.isEmpty(encryptCode)) {
+            insert.setAuthResult(0);
+            authRemark = "identifier或encryptCode为空";
+            insert.setAuthRemark(authRemark);
+            baseMapper.insert(insert);
+            return R.fail(authRemark);
+        }
+        // 1 根据设备identifier查询设备鉴权Key 作为解密密钥
+        String authKey = RedisUtils.getCacheObject(DeviceConstants.REDIS_DEVICE_AUTH_KEY + identifier);
+        insert.setAuthKey(authKey);
+        if (StringUtils.isEmpty(authKey)) {
+            insert.setAuthResult(0);
+            authRemark = "未获取到解密密钥！请先登录";
+            insert.setAuthRemark(authRemark);
+            baseMapper.insert(insert);
+            return R.fail(authRemark);
+        }
+        String decryptCode = "";
+
+        try {
+            // 2 AES数据解密
+            decryptCode = EncryptUtils.decryptByAes(encryptCode, authKey);
+        } catch (Exception e) {
+            log.error("device auth error : 设备鉴权数据解密失败！", e);
+        }
+        if (StringUtils.isEmpty(decryptCode)) {
+            insert.setAuthResult(0);
+            authRemark = "设备鉴权数据解密失败";
+            insert.setAuthRemark(authRemark);
+            baseMapper.insert(insert);
+            return R.fail(authRemark);
+        }
+        // 3 解密后删除key
+        RedisUtils.deleteObject(DeviceConstants.REDIS_DEVICE_AUTH_KEY + identifier);
+        // 4 正常解密后暂无其他业务，保存返回
+        insert.setAuthResult(authResult);
+        insert.setDecryptCode(decryptCode);
+        authRemark = "设备鉴权成功";
+        insert.setAuthRemark(authRemark);
+        baseMapper.insert(insert);
+        return R.ok(authRemark);
+    }
+
+
+}

smsb-modules/smsb-device/src/main/java/com/inspur/device/service/impl/SmsbDeviceLoginServiceImpl.java

@@ -143,10 +143,7 @@ public class SmsbDeviceLoginServiceImpl implements ISmsbDeviceLoginService {
     }
 
     @Override
-    public R<HttpHeartbeatRspVo> deviceLogin(HttpHeartbeatReq requestParam) {
-        HttpHeartbeatRspVo result = new HttpHeartbeatRspVo();
-        JSONObject resultMessage = new JSONObject();
-
+    public R<String> deviceLogin(HttpHeartbeatReq requestParam) {
         SmsbDeviceLogin add = new SmsbDeviceLogin();
 
         String reqIdentifier = requestParam.getIdentifier();
@@ -160,10 +157,7 @@ public class SmsbDeviceLoginServiceImpl implements ISmsbDeviceLoginService {
         if (null == smsbDeviceVo) {
             add.setLoginResult(0);
             baseMapper.insert(add);
-            resultMessage.putOpt("code", "0");
-            resultMessage.putOpt("data", "非法设备");
-            result.setMessage(resultMessage.toString());
-            return R.ok(result);
+            return R.fail( "非法设备");
         }
         // 合法设备
         add.setLoginResult(1);
@@ -173,9 +167,6 @@ public class SmsbDeviceLoginServiceImpl implements ISmsbDeviceLoginService {
         String authKey = UUID.randomUUID().toString().replace("-","");
         RedisUtils.setCacheObject(DeviceConstants.REDIS_DEVICE_AUTH_KEY + reqIdentifier, authKey);
         // 3 接口返回 auth key
-        resultMessage.putOpt("code", "1");
-        resultMessage.putOpt("data", authKey);
-        result.setMessage(resultMessage.toString());
-        return R.ok(result);
+        return R.ok("设备登录成功",authKey);
     }
 }

smsb-modules/smsb-device/src/main/resources/mapper/device/SmsbDeviceAuthMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.inspur.device.mapper.SmsbDeviceAuthMapper">
+
+    <select id="selectPageVoList" resultType="com.inspur.device.domain.vo.SmsbDeviceAuthVo" parameterType="com.inspur.device.domain.bo.SmsbDeviceAuthBo">
+        SELECT
+            sda.*,
+            sd.NAME AS deviceName,
+            sd.serial_number,
+            sd.mac
+        FROM
+            smsb_device_auth sda
+        LEFT JOIN smsb_device sd ON sda.identifier = sd.identifier
+        WHERE 1=1
+        <if test="bo.identifier != null and bo.identifier != ''">
+            AND sda.identifier = #{bo.identifier}
+        </if>
+        <if test="bo.encryptCode != null and bo.encryptCode != ''">
+            AND sda.encrypt_code = #{bo.encryptCode}
+        </if>
+        <if test="bo.authResult != null">
+            AND sda.authResult = #{bo.authResult}
+        </if>
+        ORDER BY sda.create_time DESC
+    </select>
+
+</mapper>

smsb-modules/smsb-source/src/main/java/com/inspur/source/controller/SmsbFrontController.java

@@ -4,8 +4,8 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import com.inspur.device.domain.bo.HttpHeartbeatReq;
 import com.inspur.device.domain.vo.HttpHeartbeatRspVo;
 import com.inspur.device.domain.vo.SmsbOtaRecordVo;
+import com.inspur.device.service.ISmsbDeviceAuthService;
 import com.inspur.device.service.ISmsbDeviceLoginService;
-import com.inspur.device.service.ISmsbDeviceRunInfoService;
 import com.inspur.device.service.ISmsbDeviceService;
 import com.inspur.device.service.ISmsbOtaRecordService;
 import com.inspur.source.domain.vo.FrontPushInfoVo;
@@ -40,6 +40,9 @@ public class SmsbFrontController {
     @Autowired
     private ISmsbDeviceLoginService smsbDeviceLoginService;
 
+    @Autowired
+    private ISmsbDeviceAuthService smsbDeviceAuthService;
+
     /**
      * 根据设备identifier 获取该设备最新内容下发记录
      *
@@ -108,8 +111,20 @@ public class SmsbFrontController {
      */
     @SaIgnore
     @PostMapping("/login")
-    public R<HttpHeartbeatRspVo> deviceLogin(@RequestBody HttpHeartbeatReq requestParam) {
+    public R<String> deviceLogin(@RequestBody HttpHeartbeatReq requestParam) {
         return smsbDeviceLoginService.deviceLogin(requestParam);
     }
 
+
+    /**
+     * 前端设备登录接口
+     *
+     * @param requestParam 主键
+     */
+    @SaIgnore
+    @PostMapping("/auth")
+    public R<String> deviceAuth(@RequestBody HttpHeartbeatReq requestParam) {
+        return smsbDeviceAuthService.deviceAuth(requestParam);
+    }
+
 }

smsb-plus-ui/src/api/smsb/device/device_auth.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DeviceAuthVO, DeviceAuthForm, DeviceAuthQuery } from '@/api/smsb/device/device_auth_type';
+
+/**
+ * 查询设备鉴权列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDeviceAuth = (query?: DeviceAuthQuery): AxiosPromise<DeviceAuthVO[]> => {
+  return request({
+    url: '/smsb/device/auth/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备鉴权详细
+ * @param id
+ */
+export const getDeviceAuth = (id: string | number): AxiosPromise<DeviceAuthVO> => {
+  return request({
+    url: '/smsb/device/auth/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备鉴权
+ * @param data
+ */
+export const addDeviceAuth = (data: DeviceAuthForm) => {
+  return request({
+    url: '/smsb/device/auth',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备鉴权
+ * @param data
+ */
+export const updateDeviceAuth = (data: DeviceAuthForm) => {
+  return request({
+    url: '/smsb/device/auth',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备鉴权
+ * @param id
+ */
+export const delDeviceAuth = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/smsb/device/auth/' + id,
+    method: 'delete'
+  });
+};

smsb-plus-ui/src/api/smsb/device/device_auth_type.ts

@@ -0,0 +1,81 @@
+export interface DeviceAuthVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 设备IP
+   */
+  deviceIp: string;
+
+  /**
+   * 设备唯一标识
+   */
+  identifier: string | number;
+
+  /**
+   * 加密字符
+   */
+  encryptCode: string;
+
+  /**
+   * 解密字符
+   */
+  decryptCode: string;
+
+  /**
+   * 鉴权结果 smsb_device_auth_result
+   */
+  authResult: number;
+
+  /**
+   * 鉴权key
+   */
+  authKey: string;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+}
+
+export interface DeviceAuthForm extends BaseEntity {
+}
+
+export interface DeviceAuthQuery extends PageQuery {
+
+  /**
+   * 设备IP
+   */
+  deviceIp?: string;
+
+  /**
+   * 设备唯一标识
+   */
+  identifier?: string | number;
+
+  /**
+   * 加密字符
+   */
+  encryptCode?: string;
+
+  /**
+   * 鉴权结果 smsb_device_auth_result
+   */
+  authResult?: number;
+
+  /**
+   * 鉴权key
+   */
+  authKey?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+

smsb-plus-ui/src/views/smsb/device/index.vue

@@ -79,6 +79,7 @@
         <el-table-column label="设备型号" align="left" prop="deviceModel" width="120" :show-overflow-tooltip="true" />
         <el-table-column label="设备SN" align="left" prop="serialNumber" width="150" :show-overflow-tooltip="true" />
         <el-table-column label="设备MAC" align="left" prop="mac" width="150" />
+        <el-table-column label="设备标识" align="left" prop="identifier" width="250" :show-overflow-tooltip="true"/>
         <el-table-column label="分辨率" align="left" prop="resolution" width="150" />
         <el-table-column label="开机时间" align="left" prop="openTime" width="80" />
         <el-table-column label="关机时间" align="left" prop="closeTime" width="80" />

smsb-plus-ui/src/views/smsb/deviceAuth/index.vue

@@ -0,0 +1,213 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover" :style="{ marginTop: '10px', height: '60px' }">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="70px">
+            <el-form-item label="唯一标识" prop="identifier">
+              <el-input v-model="queryParams.identifier" placeholder="请输入设备唯一标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="加密字符" prop="encryptCode">
+              <el-input v-model="queryParams.encryptCode" placeholder="请输入加密字符" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="鉴权结果" prop="authResult">
+              <el-select v-model="queryParams.authResult" placeholder="请选择鉴权结果" clearable @keyup.enter="handleQuery">
+                <el-option v-for="dict in smsb_device_auth_result" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+
+      <el-table v-loading="loading" :data="deviceAuthList" @selection-change="handleSelectionChange">
+        <el-table-column label="主键ID" align="left" prop="id" v-if="true" width="180"
+                         :show-overflow-tooltip="true"/>
+        <el-table-column label="加密字符" align="left" prop="encryptCode" width="250" :show-overflow-tooltip="true"/>
+        <el-table-column label="解密字符" align="left" prop="decryptCode" width="250" :show-overflow-tooltip="true"/>
+        <el-table-column label="鉴权key" align="center" prop="authKey" width="150" :show-overflow-tooltip="true"/>
+        <el-table-column label="鉴权结果" align="center" prop="authResult" width="100">
+          <template #default="scope">
+            <dict-tag :options="smsb_device_auth_result" :value="scope.row.authResult"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="鉴权描述" align="left" prop="authRemark" :show-overflow-tooltip="true" width="150" />
+        <el-table-column label="设备IP" align="center" prop="deviceIp" width="150" :show-overflow-tooltip="true"/>
+        <el-table-column label="设备名称" align="left" prop="deviceName" width="220" :show-overflow-tooltip="true" />
+        <el-table-column label="设备标识" align="left" prop="identifier" width="250" :show-overflow-tooltip="true"/>
+        <el-table-column label="设备SN" align="left" prop="serialNumber" width="200" :show-overflow-tooltip="true" />
+        <el-table-column label="设备MAC" align="left" prop="mac" width="150" />
+        <el-table-column label="鉴权时间" align="center" prop="createTime" width="160" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['device:deviceAuth:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['device:deviceAuth:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改设备鉴权对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="deviceAuthFormRef" :model="form" :rules="rules" label-width="80px">
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DeviceAuth" lang="ts">
+import { listDeviceAuth, getDeviceAuth, delDeviceAuth, addDeviceAuth, updateDeviceAuth } from '@/api/smsb/device/device_auth';
+import { DeviceAuthVO, DeviceAuthQuery, DeviceAuthForm } from '@/api/smsb/device/device_auth_type';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { smsb_device_auth_result } = toRefs<any>(proxy?.useDict('smsb_device_auth_result'));
+
+const deviceAuthList = ref<DeviceAuthVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const deviceAuthFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: DeviceAuthForm = {
+}
+const data = reactive<PageData<DeviceAuthForm, DeviceAuthQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    deviceIp: undefined,
+    identifier: undefined,
+    encryptCode: undefined,
+    authResult: undefined,
+    authKey: undefined,
+    params: {
+    }
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备鉴权列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDeviceAuth(queryParams.value);
+  deviceAuthList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  deviceAuthFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DeviceAuthVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加设备鉴权";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DeviceAuthVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getDeviceAuth(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改设备鉴权";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  deviceAuthFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateDeviceAuth(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDeviceAuth(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DeviceAuthVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备鉴权编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delDeviceAuth(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('device/deviceAuth/export', {
+    ...queryParams.value
+  }, `deviceAuth_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>