修改pom文件

device-manager-ui/admin/src/views/device/list.vue

 <template>
   <div class="page">
-    <LayoutTable :data="tableData" :config="tableConfig"> </LayoutTable>
+    <LayoutTable :data="tableData" :config="tableConfig">
+        <el-tag slot="table-body-head" style="margin:5px" type="success">当前在线设备：{{tableData.onlineCount}}个</el-tag>
+
+        <el-tag slot="table-body-head" style="margin:5px" type="danger">当前离线设备：{{tableData.offlineCount}}个</el-tag>
+        
+        
+    </LayoutTable>
 
     <dialog-show ref="dialogform" @ok="getData" />
   </div>
@@ -23,21 +29,21 @@ export default {
       let obj = JSON.parse(data);
       if (obj.type == "SEND_TO_ALL_REQUEST") {
         let msg = "";
-        let content=JSON.parse(obj.body.content)
+        let content = JSON.parse(obj.body.content);
         if (content.deviceOnlineStatus == 1) {
-          msg = "设备:" + content.deviceCode + " 上线！";
+          msg = _this.tableData.dict[content.deviceType]+ "设备:" + content.deviceCode + " 上线！";
         } else {
-          msg = "设备:" + content.deviceCode + " 离线！";
+          msg = _this.tableData.dict[content.deviceType]+"设备:" + content.deviceCode + " 离线！";
         }
 
         _this.$notify({
           title: "警告",
           message: msg,
           type: "warning",
-          duration: 8000
+          duration: 8000,
         });
 
-        _this.getData()
+        _this.getData();
       }
 
       console.log(data);
@@ -65,11 +71,22 @@ export default {
     return {
       config: {
         getsocketData: null,
-        search: [],
+        search: [
+                 {
+            name: 'deviceNum',
+            type: 'text',
+            label: '设备编号',
+          },
+          {
+            name: 'deviceOnlineStatus',
+            type: 'select',
+            label: '在线状态',
+          },
+        ],
         columns: [
           { type: "selection", width: 60 },
 
-          { label: "设备名称", prop: "deviceName" },
+        //   { label: "设备名称", prop: "deviceName" },
 
           { label: "设备编码", prop: "deviceCode" },
 

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java

 package com.mortals.xhx.module.device.web;
 
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.DeviceOnlineStatusEnum;
+import com.mortals.xhx.common.code.DeviceTypeEnum;
 import com.mortals.xhx.module.firm.model.FirmQuery;
 import com.mortals.xhx.module.firm.service.FirmService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,12 +20,10 @@ import com.mortals.xhx.module.device.model.DeviceQuery;
 import com.mortals.xhx.module.device.service.DeviceService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Collectors;
 import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import static com.mortals.framework.ap.SysConstains.*;
@@ -46,12 +48,28 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic
         super.setModuleDesc( "设备");
     }
 
+    @Override
+    protected void doListBefore(HttpServletRequest request, HttpServletResponse response, DeviceForm form, Map<String, Object> model, Context context) throws AppException {
+        form.getQuery().setOrderColList(new ArrayList<OrderCol>() {
+            {
+                add(new OrderCol("createTime", OrderCol.DESCENDING));
+            }
+        });
+
+        super.doListBefore(request, response, form, model, context);
+    }
+
     @Override
     protected void init(HttpServletRequest request, HttpServletResponse response, DeviceForm form, Map<String, Object> model, Context context) {
         this.addDict(model, "deviceType", paramService.getParamBySecondOrganize("Device","deviceType"));
         this.addDict(model, "deviceOnlineStatus", paramService.getParamBySecondOrganize("Device","deviceOnlineStatus"));
         this.addDict(model, "status", paramService.getParamBySecondOrganize("Device","status"));
         this.addDict(model, "deviceFirmId", firmService.find(new FirmQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getFirmName())));
+
+        Map<Boolean, Long> collect = this.service.find(new DeviceQuery()).stream().collect(Collectors.partitioningBy(item -> (item.getDeviceOnlineStatus() == DeviceOnlineStatusEnum.在线.getValue()), Collectors.counting()));
+
+        model.put("onlineCount", collect.get(true));
+        model.put("offlineCount", collect.get(false));
         super.init(request, response, form, model, context);
     }