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

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

@@ -230,14 +230,14 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
             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>>() {
+                Rest<Rest<String>> rest = JSON.parseObject(resp, new TypeReference<Rest<Rest<String>>>() {
                 });
                 if(rest.getCode()==YesNoEnum.YES.getValue()){
-                    String siteTreeSelectStr = rest.getData();
-                    Rest<String> restSite = JSON.parseObject(siteTreeSelectStr, new TypeReference<Rest<String>>() {
-                    });
+                    String siteTreeSelectStr = rest.getData().getData();
+//                    Rest<String> restSite = JSON.parseObject(siteTreeSelectStr, new TypeReference<Rest<String>>() {
+//                    });
 
-                    JSONArray jsonArray = JSON.parseArray(restSite.getData());
+                    JSONArray jsonArray = JSON.parseArray(siteTreeSelectStr);
 //                    if (ObjectUtils.isEmpty(jsonArray)) {
 //                        return new ArrayList<>();
 //                    }