站点树添加统计id

device-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java

@@ -17,6 +17,8 @@ import com.mortals.xhx.module.area.model.AreaEntity;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import com.mortals.xhx.module.device.model.DeviceQuery;
 import com.mortals.xhx.module.device.service.DeviceService;
+import com.mortals.xhx.module.sitestat.model.SitestatEntity;
+import com.mortals.xhx.module.sitestat.service.SitestatService;
 import com.mortals.xhx.utils.SpringUtils;
 import lombok.Data;
 import org.springframework.util.ObjectUtils;
@@ -119,6 +121,12 @@ public class SiteTreeSelect implements Serializable {
      */
     private List<SiteTreeSelect> children;
 
+
+    /**
+     * 站点统计id
+     */
+    private Long siteStatId;
+
     public SiteTreeSelect() {
     }
 
@@ -190,6 +198,7 @@ public class SiteTreeSelect implements Serializable {
             if ("site".equals(node.getType())) {
                 //统计当前站点下的所有在线 离线 设备总数。
                 DeviceService deviceService = SpringUtils.getBean(DeviceService.class);
+                SitestatService sitestatService = SpringUtils.getBean(SitestatService.class);
                 List<DeviceEntity> deviceList = deviceService.find(new DeviceQuery().siteId(DataUtil.converStr2Long(node.getId(), -1)));
                 node.setDeviceTotal(deviceList.size());
                 //未激活数量
@@ -211,8 +220,13 @@ public class SiteTreeSelect implements Serializable {
                         .filter(f -> f.getDeviceStatus() == DeviceStatusEnum.离线.getValue())
                         .count();
                 node.setOfflineTotal(deviceOfflineCount.intValue());
-            }
 
+                //设置统计id
+                SitestatEntity sitestatCache = sitestatService.getExtCache(node.getSiteCode());
+                if (!ObjectUtils.isEmpty(sitestatCache)) {
+                    node.setSiteStatId(sitestatCache.getId());
+                }
+            }
             sitePdu.setAreaCode(node.getAreaCode());
             Rest<Integer> rest = siteFeign.countSitesByArea(sitePdu);
             if (rest.getCode() == YesNoEnum.YES.getValue()) {
@@ -220,7 +234,7 @@ public class SiteTreeSelect implements Serializable {
             }
             JSONArray jsonArray = jsonObject.getJSONArray("children");
             List<SiteTreeSelect> children = new ArrayList<>();
-            if(!ObjectUtils.isEmpty(jsonArray)){
+            if (!ObjectUtils.isEmpty(jsonArray)) {
                 for (int i = 0; i < jsonArray.size(); i++) {
                     SiteTreeSelect child = JSON.parseObject(jsonArray.getJSONObject(i).toJSONString(), SiteTreeSelect.class);
                     children.add(child);

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

 package com.mortals.xhx.module.sitestat.service;
+
 import com.mortals.framework.model.Context;
-import com.mortals.framework.service.ICRUDService;
-import com.mortals.xhx.module.device.model.DeviceEntity;
+import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.xhx.module.sitestat.model.SitestatEntity;
 
-import java.util.List;
-
 /**
 * SitestatService
 *
@@ -14,7 +12,7 @@ import java.util.List;
 * @author zxfei
 * @date 2022-06-27
 */
-public interface SitestatService extends ICRUDService<SitestatEntity,Long>{
+public interface SitestatService extends ICRUDCacheService<SitestatEntity,Long> {
 
 
     String getSiteTree(Context context);

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

@@ -54,6 +54,9 @@ public class SitestatController extends BaseCRUDJsonBodyMappingController<Sitest
     }
 
 
+
+
+
     @Override
     protected void init(Map<String, Object> model, Context context) {
         super.init(model, context);