Переглянути джерело

fix: netty heart record and device info show

lihao16 6 місяців тому
батько
коміт
d791b3e850

+ 1 - 1
smsb-modules/smsb-netty/src/main/java/com/inspur/netty/client/NettyClientController.java

@@ -27,7 +27,7 @@ public class NettyClientController {
     @Autowired
     private ScheduledExecutorService scheduledExecutorService;
 
-    private static ReusableNettyClient nettyClient = new ReusableNettyClient("127.0.0.1", 8900);
+    private static ReusableNettyClient nettyClient = new ReusableNettyClient("127.0.0.1", 8990);
 
     @SaIgnore
     @GetMapping("/init")

+ 24 - 1
smsb-modules/smsb-netty/src/main/java/com/inspur/netty/handler/HeartServerHandler.java

@@ -1,5 +1,8 @@
 package com.inspur.netty.handler;
 
+import com.inspur.device.domain.SmsbDeviceHeartRecord;
+import com.inspur.device.mapper.SmsbDeviceHeartRecordMapper;
+import com.inspur.device.mapper.SmsbDeviceMapper;
 import com.inspur.netty.message.push.PushMessageType;
 import com.inspur.netty.message.receive.ReceiveMessageType;
 import com.inspur.netty.util.NettyConstants;
@@ -11,6 +14,7 @@ import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 
@@ -25,6 +29,9 @@ import java.util.Map;
 @Slf4j
 public class HeartServerHandler extends ChannelInboundHandlerAdapter {
 
+    private static final SmsbDeviceHeartRecordMapper smsbDeviceHeartRecordMapper = SpringUtils.getBean(SmsbDeviceHeartRecordMapper.class);
+
+
     @Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
         if (evt instanceof IdleStateEvent) {
@@ -70,12 +77,28 @@ public class HeartServerHandler extends ChannelInboundHandlerAdapter {
             ByteBuf byteBuf = Unpooled.copiedBuffer(heartbeatReplay + NettyConstants.DATA_PACK_SEPARATOR, Charset.forName("utf-8"));
             ctx.channel().writeAndFlush(byteBuf);
             log.debug("HeartServerHandler: 心跳消息已返回 : " + ctx.channel().id() + "identifier = " + identifier);
+            Long lastNettyHeartTime = RedisUtils.getCacheObject(NettyConstants.DEVICE_LAST_HEART_PREFIX + identifier);
             // redis cache device last heart time
-            RedisUtils.setCacheObject(NettyConstants.DEVICE_LAST_HEART_PREFIX + identifier, System.currentTimeMillis());
+            Long currentNettyHeartTime = System.currentTimeMillis();
+            RedisUtils.setCacheObject(NettyConstants.DEVICE_LAST_HEART_PREFIX + identifier, currentNettyHeartTime);
+            buildAndInsertHeart(identifier, lastNettyHeartTime, currentNettyHeartTime);
         }else {
             ctx.fireChannelRead(message);
         }
     }
+
+    private void buildAndInsertHeart(String identifier, Long lastNettyHeartTime, Long currentNettyHeartTime) {
+        SmsbDeviceHeartRecord smsbDeviceHeartRecord = new SmsbDeviceHeartRecord();
+        smsbDeviceHeartRecord.setHeartType(2);
+        if (lastNettyHeartTime == null) {
+            smsbDeviceHeartRecord.setTimeInterval(0L);
+        }else {
+            smsbDeviceHeartRecord.setTimeInterval(currentNettyHeartTime - lastNettyHeartTime);
+        }
+        smsbDeviceHeartRecord.setIdentifier(identifier);
+        smsbDeviceHeartRecordMapper.insert(smsbDeviceHeartRecord);
+
+    }
     /*@Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
         log.info("HeartServerHandler: " + ctx.channel().id() + " : 已经一分钟未收到客户端的消息!");

+ 2 - 0
smsb-plus-ui/src/api/smsb/device/device_run_type.ts

@@ -49,6 +49,8 @@ export interface DeviceRunInfoVO {
    */
   ramUsageOfByte: string;
 
+  ramUsage: number;
+
   /**
    * 系统构建时间
    */

+ 48 - 43
smsb-plus-ui/src/views/smsb/device/index.vue

@@ -196,9 +196,9 @@
       </template>
     </el-dialog>
     <!--设备详情弹窗-->
-    <el-dialog v-model="viewDialog.visible" :title="viewDialog.title" width="1000px" style="height: 800px"
+    <el-dialog v-model="viewDialog.visible" :title="viewDialog.title" width="900px" style="height: 700px"
                append-to-body>
-      <el-tabs v-model="activeName" style="height: 600px" @tab-click="handleClickTab">
+      <el-tabs v-model="activeName" style="height: 500px" @tab-click="handleClickTab">
         <el-tab-pane label="设备详情" name="info">
           <div>
             <span>设备名称:{{ deviceRunInfo.deviceBase.name }}</span>
@@ -216,48 +216,43 @@
             <span style="margin-left: 50px">创建时间:{{ deviceRunInfo.deviceBase.createTime }}</span>
           </div>
           <!-- 音量 -->
-          <div style="margin-top: 20px">
-
+          <div class="slider-block">
+            <span style="width: 50px">音量</span>
+            <el-slider v-model="deviceRunInfo.volume" :disabled="true" :step="10" show-stops/>
           </div>
           <!-- 亮度 -->
-          <div style="margin-top: 20px; display: flex; align-items: center;">
-            亮度:
-            <el-progress :show-text="false" :stroke-width="26" :percentage="deviceRunInfo.bright"
-                         style="margin-left: 10px;"/>
+          <div class="slider-block">
+            <span style="width: 50px">亮度</span>
+            <el-slider v-model="deviceRunInfo.bright" :disabled="true" :step="10" show-stops/>
+          </div>
+
+          <div>
+            <span style="display: flex;">
+              <!-- cpu -->
+              <div class="slider-block">
+                <span style="width: 50px">CPU</span>
+                <el-progress type="circle" :percentage="deviceRunInfo.cpuUsage"/>
+              </div>
+              <div class="slider-block">
+                <span style="width: 50px;margin-left: 20px">内存</span>
+                <el-progress type="circle" :percentage="deviceRunInfo.ramUsage"/>
+              </div>
+              <div class="slider-block">
+                <span style="width: 50px;margin-left: 20px">存储</span>
+                <el-progress type="circle" :percentage="deviceRunInfo.externalUsage"/>
+              </div>
+            </span>
+          </div>
+          <div style="margin-top: 20px">
+            <span>系统构建时间:{{ deviceRunInfo.systemBuildDate }}</span>
+            <span style="margin-left: 50px">系统构建版本:{{ deviceRunInfo.systemBuildVersion }}</span>
+            <br/>
+          </div>
+          <div style="margin-top: 20px">
+            <span>版本CODE:{{ deviceRunInfo.versionCode }}</span>
+            <span style="margin-left: 50px">应用版本:{{ deviceRunInfo.versionName }}</span>
+            <br/>
           </div>
-          <!--          <div>
-                      <div style="display: flex; justify-content: space-around; align-items: center">
-                        <div style="text-align: center">
-                          <div style="position: relative">
-                            CPU :
-                            <el-progress type="circle" :percentage="deviceRunInfo.cpuUsage"></el-progress>
-                            <div style="position: absolute; top: -30px; left: 50%; transform: translateX(-50%)">
-                              {{ deviceRunInfo.cpuUsage }}%
-                            </div>
-                          </div>
-                        </div>
-                        <div style="text-align: center">
-                          <div style="position: relative">
-                            内存 :
-                            <el-progress type="circle" :percentage="deviceRunInfo.ramUsageOfByte"></el-progress>
-                            <div style="position: absolute; top: -30px; left: 50%; transform: translateX(-50%)">
-                              {{ deviceRunInfo.ramUsageOfByte }}%
-                            </div>
-                          </div>
-                        </div>
-                        <div style="text-align: center">
-                          <div style="position: relative">
-                            硬盘 :
-                            <el-progress type="circle" :percentage="deviceRunInfo.externalUsage"></el-progress>
-                            <div style="position: absolute; top: -30px; left: 50%; transform: translateX(-50%)">
-                              {{ deviceRunInfo.externalUsage }}%
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                      <div>系统信息 : {{ deviceRunInfo.systemBuildVersion }}</div>
-                      <div>APK版本 : {{ deviceRunInfo.versionName }}</div>
-                    </div>-->
         </el-tab-pane>
         <el-tab-pane label="远程操作" name="control">
           <el-button :loading="buttonLoading" type="primary" @click="handleControl('reboot')">设备重启</el-button>
@@ -294,7 +289,7 @@
       </el-tabs>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="cancel">取 消</el-button>
+          <el-button @click="cancel">关 闭</el-button>
         </div>
       </template>
     </el-dialog>
@@ -392,7 +387,8 @@ const deviceRunInfo = reactive<DeviceRunInfoVO>({
   systemBuildVersion: undefined,
   versionCode: undefined,
   versionName: undefined,
-  createTime: undefined
+  createTime: undefined,
+  ramUsage: undefined,
 });
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -628,6 +624,7 @@ const handleInfo = async (row?: DeviceVO) => {
   deviceId.value = row?.id || ids.value[0];
   const runInfo = await getDeviceRunInfo(deviceId.value);
   Object.assign(deviceRunInfo, runInfo.data);
+  deviceRunInfo.ramUsage = (parseFloat(deviceRunInfo.ramUsageOfByte) * 100 / parseFloat(deviceRunInfo.ramTotalOfByte)).toFixed(1)
   viewDialog.title = '设备详情';
   viewDialog.visible = true;
   console.log(deviceRunInfo);
@@ -752,3 +749,11 @@ onMounted(() => {
   getDeviceStatistics();
 });
 </script>
+<style>
+.slider-block {
+  max-width: 600px;
+  display: flex;
+  align-items: center;
+  margin-top: 20px;
+}
+</style>

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

@@ -46,7 +46,7 @@
         <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="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" />

+ 218 - 0
smsb-plus-ui/src/views/smsb/nettyHeart/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="left" 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: 2,
+    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>