Commit cae84557 authored by 赵啸非's avatar 赵啸非

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

parent d131b314
...@@ -26,6 +26,8 @@ export default { ...@@ -26,6 +26,8 @@ export default {
}, },
renderContent: function (h, { node, data, store }) { renderContent: function (h, { node, data, store }) {
console.log("node",node)
console.log("data",data)
return ( return (
<span> <span>
<i style="font-size:16px;color:#409EFF" class={data.icon}></i> <i style="font-size:16px;color:#409EFF" class={data.icon}></i>
...@@ -40,12 +42,6 @@ export default { ...@@ -40,12 +42,6 @@ export default {
return; return;
} }
resolve(data.result); resolve(data.result);
// this.$post("/area/getListByParentId", {
// parentId: node.data.id,
// }).then(({ data }) => {
// resolve(data.result);
// });
}, },
refreshNodeBy(id) { refreshNodeBy(id) {
......
...@@ -210,8 +210,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -210,8 +210,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
//云服务版本,获取站点树 //云服务版本,获取站点树
// siteFeign.siteTree() // siteFeign.siteTree()
} }
return siteTreeSelects; return siteTreeSelects;
......
...@@ -3,6 +3,7 @@ package com.mortals.xhx.module.sitestat.service.impl; ...@@ -3,6 +3,7 @@ package com.mortals.xhx.module.sitestat.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
...@@ -225,11 +226,11 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si ...@@ -225,11 +226,11 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
public String getSiteTree(Context context) { public String getSiteTree(Context context) {
if (platFormType.equalsIgnoreCase(PlatformTypeEnum.CLOUD.getValue())) { if (platFormType.equalsIgnoreCase(PlatformTypeEnum.CLOUD.getValue())) {
String token = context.getUser().getToken(); String token = context.getUser().getToken();
if (!ObjectUtils.isEmpty(token)) { /* if (!ObjectUtils.isEmpty(token)) {
String resp = siteFeign.siteTree(token); String resp = siteFeign.siteTree(token);
return resp; return resp;
} }*/
/* JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
Map<String, Object> model = new HashMap<>(); Map<String, Object> model = new HashMap<>();
if (!ObjectUtils.isEmpty(token)) { if (!ObjectUtils.isEmpty(token)) {
String resp = siteFeign.siteTree(token); String resp = siteFeign.siteTree(token);
...@@ -258,7 +259,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si ...@@ -258,7 +259,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
jsonObject.put(KEY_RESULT_DATA, model); jsonObject.put(KEY_RESULT_DATA, model);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE); jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
return jsonObject.toJSONString(); return jsonObject.toJSONString();
}*/ }
} else { } else {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
Map<String, Object> model = new HashMap<>(); Map<String, Object> model = new HashMap<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment