feat: device heartbeat record and device http api

smsb-modules/smsb-device/src/main/java/com/inspur/device/controller/SmsbDeviceHeartRecordController.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.SmsbDeviceHeartRecordVo;
+import com.inspur.device.domain.bo.SmsbDeviceHeartRecordBo;
+import com.inspur.device.service.ISmsbDeviceHeartRecordService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 设备心跳
+ *
+ * @author Hao Li
+ * @date 2025-04-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/smsb/device/heart")
+public class SmsbDeviceHeartRecordController extends BaseController {
+
+    private final ISmsbDeviceHeartRecordService smsbDeviceHeartRecordService;
+
+    /**
+     * 查询设备心跳列表
+     */
+    @SaCheckPermission("device:heart:list")
+    @GetMapping("/list")
+    public TableDataInfo<SmsbDeviceHeartRecordVo> list(SmsbDeviceHeartRecordBo bo, PageQuery pageQuery) {
+        return smsbDeviceHeartRecordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出设备心跳列表
+     */
+    @SaCheckPermission("device:heart:export")
+    @Log(title = "设备心跳", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SmsbDeviceHeartRecordBo bo, HttpServletResponse response) {
+        List<SmsbDeviceHeartRecordVo> list = smsbDeviceHeartRecordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备心跳", SmsbDeviceHeartRecordVo.class, response);
+    }
+
+    /**
+     * 获取设备心跳详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("device:heart:query")
+    @GetMapping("/{id}")
+    public R<SmsbDeviceHeartRecordVo> getInfo(@NotNull(message = "主键不能为空")
+                                              @PathVariable Long id) {
+        return R.ok(smsbDeviceHeartRecordService.queryById(id));
+    }
+
+    /**
+     * 新增设备心跳
+     */
+    @SaCheckPermission("device:heart:add")
+    @Log(title = "设备心跳", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SmsbDeviceHeartRecordBo bo) {
+        return toAjax(smsbDeviceHeartRecordService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备心跳
+     */
+    @SaCheckPermission("device:heart:edit")
+    @Log(title = "设备心跳", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SmsbDeviceHeartRecordBo bo) {
+        return toAjax(smsbDeviceHeartRecordService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备心跳
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("device:heart:remove")
+    @Log(title = "设备心跳", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(smsbDeviceHeartRecordService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,68 @@
+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 com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.io.Serial;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 设备心跳对象 smsb_device_heart_record
+ *
+ * @author Hao Li
+ * @date 2025-04-28
+ */
+@Data
+@TableName("smsb_device_heart_record")
+public class SmsbDeviceHeartRecord {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 设备唯一标识
+     */
+    private String identifier;
+
+    /**
+     * 设备IP
+     */
+    private String clientIp;
+
+    /**
+     * 心跳类型 1-http 2-Netty
+     */
+    private Integer heartType;
+
+    /**
+     * 心跳间隔
+     */
+    private Long timeInterval;
+
+    /**
+     * 创建时间
+     */
+    @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/bo/SmsbDeviceHeartRecordBo.java

@@ -0,0 +1,60 @@
+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.SmsbDeviceHeartRecord;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 设备心跳业务对象 smsb_device_heart_record
+ *
+ * @author Hao Li
+ * @date 2025-04-28
+ */
+@Data
+@AutoMapper(target = SmsbDeviceHeartRecord.class, reverseConvertGenerate = false)
+public class SmsbDeviceHeartRecordBo {
+
+    private Long id;
+
+    /**
+     * 设备唯一标识
+     */
+    private String identifier;
+
+    /**
+     * 设备IP
+     */
+    private String clientIp;
+
+    /**
+     * 心跳类型 1-http 2-Netty
+     */
+    private Integer heartType;
+
+    /**
+     * 心跳间隔
+     */
+    private Long timeInterval;
+
+    /**
+     * 创建时间
+     */
+    @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/SmsbDeviceHeartRecordVo.java

@@ -0,0 +1,84 @@
+package com.inspur.device.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.inspur.device.domain.SmsbDeviceHeartRecord;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 设备心跳视图对象 smsb_device_heart_record
+ *
+ * @author Hao Li
+ * @date 2025-04-28
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SmsbDeviceHeartRecord.class)
+public class SmsbDeviceHeartRecordVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 设备唯一标识
+     */
+    @ExcelProperty(value = "设备唯一标识")
+    private String identifier;
+
+    /**
+     * 设备IP
+     */
+    @ExcelProperty(value = "设备IP")
+    private String clientIp;
+
+    /**
+     * 心跳类型 1-http 2-Netty
+     */
+    @ExcelProperty(value = "心跳类型 1-http 2-Netty")
+    private Integer heartType;
+
+    /**
+     * 心跳间隔
+     */
+    @ExcelProperty(value = "心跳间隔")
+    private Long timeInterval;
+
+    /**
+     * 心跳时间
+     */
+    @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/SmsbDeviceHeartRecordMapper.java

@@ -0,0 +1,19 @@
+package com.inspur.device.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.inspur.device.domain.SmsbDeviceHeartRecord;
+import com.inspur.device.domain.bo.SmsbDeviceHeartRecordBo;
+import com.inspur.device.domain.vo.SmsbDeviceHeartRecordVo;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 设备心跳Mapper接口
+ *
+ * @author Hao Li
+ * @date 2025-04-28
+ */
+public interface SmsbDeviceHeartRecordMapper extends BaseMapperPlus<SmsbDeviceHeartRecord, SmsbDeviceHeartRecordVo> {
+
+    Page<SmsbDeviceHeartRecordVo> selectPageVoList(@Param("page") Page<SmsbDeviceHeartRecord> build, @Param("bo") SmsbDeviceHeartRecordBo bo);
+}

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

@@ -0,0 +1,68 @@
+package com.inspur.device.service;
+
+import com.inspur.device.domain.bo.SmsbDeviceHeartRecordBo;
+import com.inspur.device.domain.vo.SmsbDeviceHeartRecordVo;
+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 Hao Li
+ * @date 2025-04-28
+ */
+public interface ISmsbDeviceHeartRecordService {
+
+    /**
+     * 查询设备心跳
+     *
+     * @param id 主键
+     * @return 设备心跳
+     */
+    SmsbDeviceHeartRecordVo queryById(Long id);
+
+    /**
+     * 分页查询设备心跳列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备心跳分页列表
+     */
+    TableDataInfo<SmsbDeviceHeartRecordVo> queryPageList(SmsbDeviceHeartRecordBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的设备心跳列表
+     *
+     * @param bo 查询条件
+     * @return 设备心跳列表
+     */
+    List<SmsbDeviceHeartRecordVo> queryList(SmsbDeviceHeartRecordBo bo);
+
+    /**
+     * 新增设备心跳
+     *
+     * @param bo 设备心跳
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(SmsbDeviceHeartRecordBo bo);
+
+    /**
+     * 修改设备心跳
+     *
+     * @param bo 设备心跳
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(SmsbDeviceHeartRecordBo bo);
+
+    /**
+     * 校验并批量删除设备心跳信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,133 @@
+package com.inspur.device.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.inspur.device.domain.bo.SmsbDeviceHeartRecordBo;
+import com.inspur.device.domain.vo.SmsbDeviceHeartRecordVo;
+import com.inspur.device.domain.SmsbDeviceHeartRecord;
+import com.inspur.device.mapper.SmsbDeviceHeartRecordMapper;
+import com.inspur.device.service.ISmsbDeviceHeartRecordService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 设备心跳Service业务层处理
+ *
+ * @author Hao Li
+ * @date 2025-04-28
+ */
+@RequiredArgsConstructor
+@Service
+public class SmsbDeviceHeartRecordServiceImpl implements ISmsbDeviceHeartRecordService {
+
+    private final SmsbDeviceHeartRecordMapper baseMapper;
+
+    /**
+     * 查询设备心跳
+     *
+     * @param id 主键
+     * @return 设备心跳
+     */
+    @Override
+    public SmsbDeviceHeartRecordVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询设备心跳列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备心跳分页列表
+     */
+    @Override
+    public TableDataInfo<SmsbDeviceHeartRecordVo> queryPageList(SmsbDeviceHeartRecordBo bo, PageQuery pageQuery) {
+        // LambdaQueryWrapper<SmsbDeviceHeartRecord> lqw = buildQueryWrapper(bo);
+        Page<SmsbDeviceHeartRecordVo> result = baseMapper.selectPageVoList(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的设备心跳列表
+     *
+     * @param bo 查询条件
+     * @return 设备心跳列表
+     */
+    @Override
+    public List<SmsbDeviceHeartRecordVo> queryList(SmsbDeviceHeartRecordBo bo) {
+        LambdaQueryWrapper<SmsbDeviceHeartRecord> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SmsbDeviceHeartRecord> buildQueryWrapper(SmsbDeviceHeartRecordBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SmsbDeviceHeartRecord> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getIdentifier()), SmsbDeviceHeartRecord::getIdentifier, bo.getIdentifier());
+        lqw.eq(StringUtils.isNotBlank(bo.getClientIp()), SmsbDeviceHeartRecord::getClientIp, bo.getClientIp());
+        lqw.eq(bo.getHeartType() != null, SmsbDeviceHeartRecord::getHeartType, bo.getHeartType());
+        lqw.eq(bo.getTimeInterval() != null, SmsbDeviceHeartRecord::getTimeInterval, bo.getTimeInterval());
+        lqw.eq(bo.getCreateTime() != null, SmsbDeviceHeartRecord::getCreateTime, bo.getCreateTime());
+        return lqw;
+    }
+
+    /**
+     * 新增设备心跳
+     *
+     * @param bo 设备心跳
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(SmsbDeviceHeartRecordBo bo) {
+        SmsbDeviceHeartRecord add = MapstructUtils.convert(bo, SmsbDeviceHeartRecord.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改设备心跳
+     *
+     * @param bo 设备心跳
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(SmsbDeviceHeartRecordBo bo) {
+        SmsbDeviceHeartRecord update = MapstructUtils.convert(bo, SmsbDeviceHeartRecord.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SmsbDeviceHeartRecord entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除设备心跳信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

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

@@ -8,12 +8,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.hash.Hashing;
 import com.inspur.device.domain.SmsbDevice;
+import com.inspur.device.domain.SmsbDeviceHeartRecord;
 import com.inspur.device.domain.SmsbDeviceRunInfo;
 import com.inspur.device.domain.bo.HttpHeartbeatReq;
 import com.inspur.device.domain.bo.SmsbDeviceBo;
 import com.inspur.device.domain.constants.DeviceConstants;
 import com.inspur.device.domain.constants.ResultCodeEnum;
 import com.inspur.device.domain.vo.*;
+import com.inspur.device.mapper.SmsbDeviceHeartRecordMapper;
 import com.inspur.device.mapper.SmsbDeviceMapper;
 import com.inspur.device.mapper.SmsbDeviceRunInfoMapper;
 import com.inspur.device.service.ISmsbDeviceManufacturerService;
@@ -61,12 +63,12 @@ public class SmsbDeviceServiceImpl implements ISmsbDeviceService {
 
     private final SmsbDeviceMapper baseMapper;
 
-    private final ISmsbProductService smsbProductService;
-
     private final ISmsbDeviceManufacturerService deviceManufacturerService;
 
     private final SmsbDeviceRunInfoMapper smsbDeviceRunInfoMapper;
 
+    private final SmsbDeviceHeartRecordMapper smsbDeviceHeartRecordMapper;
+
     /**
      * 查询设备
      *
@@ -378,14 +380,28 @@ public class SmsbDeviceServiceImpl implements ISmsbDeviceService {
             return R.fail("设备不存在");
         }
         Long currentTime = System.currentTimeMillis();
-        // 1 缓存设备最后一次http 心跳时间
+        // 1 最后一次心跳时间
+        Long lastHttpHeartTime = RedisUtils.getCacheObject(DeviceConstants.REDIS_DEVICE_HEARTBEAT_HTTP_KEY + requestParam.getIdentifier());
+        // 2 缓存设备最后一次http 心跳时间
         RedisUtils.setCacheObject(DeviceConstants.REDIS_DEVICE_HEARTBEAT_HTTP_KEY + requestParam.getIdentifier(), currentTime);
-        // 2 更新设备状态 若设备未在线 更新为在线
+        // 3 更新设备状态 若设备未在线 更新为在线
         if (smsbDeviceVo.getOnlineStatus().equals(DeviceConstants.DEVICE_STATUS_ONLINE.longValue())) {
             smsbDeviceVo.setOnlineStatus(DeviceConstants.DEVICE_STATUS_ONLINE.longValue());
             smsbDeviceVo.setLastOnline(DateUtils.getNowDate());
             updateDeviceStatus(smsbDeviceVo);
         }
+        // 4 记录设备心跳日志
+        SmsbDeviceHeartRecord smsbDeviceHeartRecord = new SmsbDeviceHeartRecord();
+        smsbDeviceHeartRecord.setIdentifier(requestParam.getIdentifier());
+        smsbDeviceHeartRecord.setClientIp(requestParam.getDeviceIp());
+        smsbDeviceHeartRecord.setHeartType(1);
+        if (null != lastHttpHeartTime) {
+            smsbDeviceHeartRecord.setTimeInterval(currentTime - lastHttpHeartTime);
+        }else {
+            smsbDeviceHeartRecord.setTimeInterval(0L);
+        }
+        smsbDeviceHeartRecordMapper.insert(smsbDeviceHeartRecord);
+
         return R.ok();
     }
 }

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

@@ -0,0 +1,27 @@
+<?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.SmsbDeviceHeartRecordMapper">
+    <select id="selectPageVoList" parameterType="com.inspur.device.domain.bo.SmsbDeviceHeartRecordBo" resultType="com.inspur.device.domain.vo.SmsbDeviceHeartRecordVo">
+        SELECT
+            sdh.*,
+            sd.NAME AS deviceName,
+            sd.serial_number,
+            sd.mac
+        FROM
+            smsb_device_heart_record sdh
+        LEFT JOIN smsb_device sd ON sdh.identifier = sd.identifier
+        WHERE 1=1
+        <if test="bo.identifier != null and bo.identifier != ''">
+            AND sdh.identifier = #{bo.identifier}
+        </if>
+        <if test="bo.clientIp != null and bo.clientIp != ''">
+            AND sdh.reqIp = #{bo.clientIp}
+        </if>
+        <if test="bo.heartType != null">
+            AND sdh.heart_type = #{bo.heartType}
+        </if>
+        ORDER BY sdh.create_time DESC
+    </select>
+</mapper>

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

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DeviceHeartRecordVO, DeviceHeartRecordForm, DeviceHeartRecordQuery } from '@/api/smsb/device/device_heart_type';
+
+/**
+ * 查询设备心跳列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDeviceHeartRecord = (query?: DeviceHeartRecordQuery): AxiosPromise<DeviceHeartRecordVO[]> => {
+  return request({
+    url: 'smsb/device/heart/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备心跳详细
+ * @param id
+ */
+export const getDeviceHeartRecord = (id: string | number): AxiosPromise<DeviceHeartRecordVO> => {
+  return request({
+    url: 'smsb/device/heart/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备心跳
+ * @param data
+ */
+export const addDeviceHeartRecord = (data: DeviceHeartRecordForm) => {
+  return request({
+    url: 'smsb/device/heart',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备心跳
+ * @param data
+ */
+export const updateDeviceHeartRecord = (data: DeviceHeartRecordForm) => {
+  return request({
+    url: '/device/deviceHeartRecord',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备心跳
+ * @param id
+ */
+export const delDeviceHeartRecord = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/device/deviceHeartRecord/' + id,
+    method: 'delete'
+  });
+};

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

@@ -0,0 +1,71 @@
+export interface DeviceHeartRecordVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 设备唯一标识
+   */
+  identifier: string | number;
+
+  /**
+   * 设备IP
+   */
+  clientIp: string;
+
+  /**
+   * 心跳类型 1-http 2-Netty
+   */
+  heartType: number;
+
+  /**
+   * 心跳间隔
+   */
+  timeInterval: number;
+
+  /**
+   * 心跳时间
+   */
+  createTime: string;
+
+}
+
+export interface DeviceHeartRecordForm extends BaseEntity {
+}
+
+export interface DeviceHeartRecordQuery extends PageQuery {
+
+  /**
+   * 设备唯一标识
+   */
+  identifier?: string | number;
+
+  /**
+   * 设备IP
+   */
+  clientIp?: string;
+
+  /**
+   * 心跳类型 1-http 2-Netty
+   */
+  heartType?: number;
+
+  /**
+   * 心跳间隔
+   */
+  timeInterval?: number;
+
+  /**
+   * 心跳时间
+   */
+  createTime?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+

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

@@ -70,7 +70,7 @@
                         </el-tooltip>-->
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                         v-hasPermi="['device:deviceLogin:remove']"></el-button>
+                         v-hasPermi="['device:login:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>

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

@@ -0,0 +1,218 @@
+<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="设备IP" prop="clientIp">
+              <el-input v-model="queryParams.clientIp" placeholder="请输入设备IP" clearable @keyup.enter="handleQuery" />
+            </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">
+<!--      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['device:deviceHeartRecord:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['device:deviceHeartRecord:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['device:deviceHeartRecord:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['device:deviceHeartRecord:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>-->
+
+      <el-table v-loading="loading" :data="deviceHeartRecordList" @selection-change="handleSelectionChange">
+<!--        <el-table-column type="selection" width="55" align="center" />-->
+        <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="identifier" width="250" :show-overflow-tooltip="true"/>
+        <el-table-column label="设备IP" align="left" prop="clientIp" width="150" :show-overflow-tooltip="true"/>
+<!--        <el-table-column label="心跳类型 1-http 2-Netty" align="center" prop="heartType" />-->
+        <el-table-column label="心跳间隔" align="center" prop="timeInterval" width="100" />
+        <el-table-column label="心跳时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="设备名称" align="left" prop="deviceName" :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" class-name="small-padding fixed-width" width="100">
+          <template #default="scope">
+<!--            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['device:deviceHeartRecord:edit']"></el-button>
+            </el-tooltip>-->
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['device:heart: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="deviceHeartRecordFormRef" :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="DeviceHeartRecord" lang="ts">
+import { listDeviceHeartRecord, getDeviceHeartRecord, delDeviceHeartRecord, addDeviceHeartRecord, updateDeviceHeartRecord } from '@/api/smsb/device/device_heart';
+import { DeviceHeartRecordVO, DeviceHeartRecordQuery, DeviceHeartRecordForm } from '@/api/smsb/device/device_heart_type';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const deviceHeartRecordList = ref<DeviceHeartRecordVO[]>([]);
+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 deviceHeartRecordFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: DeviceHeartRecordForm = {
+}
+const data = reactive<PageData<DeviceHeartRecordForm, DeviceHeartRecordQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    identifier: undefined,
+    clientIp: undefined,
+    heartType: 1,
+    timeInterval: undefined,
+    createTime: undefined,
+    params: {
+    }
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备心跳列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDeviceHeartRecord(queryParams.value);
+  deviceHeartRecordList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  deviceHeartRecordFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DeviceHeartRecordVO[]) => {
+  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?: DeviceHeartRecordVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getDeviceHeartRecord(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改设备心跳";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  deviceHeartRecordFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateDeviceHeartRecord(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDeviceHeartRecord(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DeviceHeartRecordVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备心跳编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delDeviceHeartRecord(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('device/deviceHeartRecord/export', {
+    ...queryParams.value
+  }, `deviceHeartRecord_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>