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

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

@@ -226,6 +226,8 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
     public String getSiteTree(Context context) {
         if (platFormType.equalsIgnoreCase(PlatformTypeEnum.CLOUD.getValue())) {
             String token = context.getUser().getToken();
+            JSONObject jsonObject = new JSONObject();
+            Map<String, Object> model = new HashMap<>();
             if (!ObjectUtils.isEmpty(token)) {
                 String resp = siteFeign.siteTree(token);
                 Rest<String> rest = JSON.parseObject(resp, new TypeReference<Rest<String>>() {
@@ -241,10 +243,15 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
                         SiteTreeSelect siteTreeSelect = JSON.parseObject(item.toString(), SiteTreeSelect.class);
                         return siteTreeSelect;
                     }).collect(Collectors.toList());
+                    model.put("siteTree", JSON.toJSONString(collect));
+                    jsonObject.put(KEY_RESULT_DATA, model);
+                    jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+                    return jsonObject.toJSONString();
 
                 }
-
-                return resp;
+                jsonObject.put(KEY_RESULT_DATA, model);
+                jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
+                return jsonObject.toJSONString();
             }
         } else {
             JSONObject jsonObject = new JSONObject();

device-manager/src/test/java/com/mortals/httpclient/system.http

@@ -54,3 +54,6 @@ Accept: application/json
 
 
 
+
+
+