添加设备上线和下线的业务日志记录

device-manager-ui/admin/src/assets/mixins/tree.js

@@ -9,7 +9,7 @@ export default {
     clearTimeout(this.loadingTimer);
   },
   methods: {
-    beforeFecth() { 
+    beforeFecth() {
       return Promise.resolve();
     },
     // 表格接收数据前
@@ -18,14 +18,16 @@ export default {
     afterRender(data){},
     // 默认拉取数据
     async getTreeData() {
-     
+
     },
-    
+
 
     handleNodeClick(node) {
-      
+
     },
     renderContent: function (h, { node, data, store }) {
+      console.log("node",node)
+      console.log("data",data)
       return (
         <span>
           <i style="font-size:16px;color:#409EFF" class={data.icon}></i>
@@ -40,12 +42,6 @@ export default {
         return;
       }
       resolve(data.result);
-
-      // this.$post("/area/getListByParentId", {
-      //   parentId: node.data.id,
-      // }).then(({ data }) => {
-      //   resolve(data.result);
-      // });
     },
 
     refreshNodeBy(id) {
@@ -54,11 +50,11 @@ export default {
       node.expand(); // 主动调用展开节点方法，重新查询该节点下的所有子节点
        this.toView(this.currentNode);
     },
-    
+
   },
 
   data() {
-    return { 
+    return {
       treeProps: {
         id: "id",
         label: "label",

device-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -210,8 +210,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             //云服务版本，获取站点树
            // siteFeign.siteTree()
 
-
-
         }
 
         return siteTreeSelects;

device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.sitestat.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -225,11 +226,11 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
     public String getSiteTree(Context context) {
         if (platFormType.equalsIgnoreCase(PlatformTypeEnum.CLOUD.getValue())) {
             String token = context.getUser().getToken();
-            if (!ObjectUtils.isEmpty(token)) {
+/*            if (!ObjectUtils.isEmpty(token)) {
                 String resp = siteFeign.siteTree(token);
                 return resp;
-            }
-           /* JSONObject jsonObject = new JSONObject();
+            }*/
+            JSONObject jsonObject = new JSONObject();
             Map<String, Object> model = new HashMap<>();
             if (!ObjectUtils.isEmpty(token)) {
                 String resp = siteFeign.siteTree(token);
@@ -258,7 +259,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
                 jsonObject.put(KEY_RESULT_DATA, model);
                 jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
                 return jsonObject.toJSONString();
-            }*/
+            }
         } else {
             JSONObject jsonObject = new JSONObject();
             Map<String, Object> model = new HashMap<>();