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

common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteFeign.java

@@ -89,6 +89,8 @@ public interface ISiteFeign extends IFeign {
     Rest<List<SitePdu>> getFlatSitesByAreaCode(@RequestBody SitePdu sitePdu);
 
 
+    @PostMapping(value = "/site/countSitesByArea")
+    Rest<Integer> countSitesByArea(@RequestBody SitePdu sitePdu);
 
 }
 
@@ -134,6 +136,11 @@ class SiteFeignFallbackFactory implements FallbackFactory<ISiteFeign> {
             public Rest<List<SitePdu>> getFlatSitesByAreaCode(SitePdu sitePdu) {
                 return Rest.fail("暂时无法获取站点子站点，请稍后再试!");
             }
+
+            @Override
+            public Rest<Integer> countSitesByArea(SitePdu sitePdu) {
+                return Rest.fail("暂时无法获取站点子站点数量，请稍后再试!");
+            }
         };
     }
 }

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

@@ -304,13 +304,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
 
         Set<TopicPartitionInfo> set = new HashSet<>();
         set.add(topicPartitionInfo);
-/*        if (status == YesNoEnum.YES.getValue()) {
-            //开启
-            consumerService.getMainConsumer().subscribe(set);
-        } else {
-            //关闭
-            consumerService.getMainConsumer().unsubscribe(set);
-        }*/
+
     }
 
 
@@ -346,17 +340,13 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
 
     @Override
     public Rest<String> sendThirdParty(DeviceEntity entity, ProductEntity productEntity, PlatformEntity platformEntity, DeviceMethodEnum update) {
-
        //todo 修改为异步发送消息，当前消息存放到redis的队列中
-
         DeviceReq deviceReq = new DeviceReq();
         BeanUtils.copyProperties(entity, deviceReq, BeanUtil.getNullPropertyNames(entity));
         deviceReq.setDeviceStatus(update.getValue());
         deviceReq.setProductCode(productEntity.getProductCode());
         deviceReq.setDeviceInBuilding(entity.getDeviceInBuilding() == null ? 0 : entity.getDeviceInBuilding());
         deviceReq.setDeviceInFloor(entity.getDeviceInFloor() == null ? 0 : entity.getDeviceInFloor());
-
-
         //http://192.168.0.98:8090/inter/device/deviceIn
         //判断是否是php，如果不是 则是java 则内部调用
         if ("smartOffice".equals(platformEntity.getPlatformSn())) {

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

 package com.mortals.xhx.module.site.model;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.DefaultJSONParser;
+import com.alibaba.fastjson.parser.JSONToken;
+import com.alibaba.fastjson.parser.deserializer.ObjectDeserializer;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.util.DataUtil;
+import com.mortals.xhx.common.code.DeviceStatusEnum;
+import com.mortals.xhx.common.code.EnabledEnum;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.pdu.site.SitePdu;
+import com.mortals.xhx.feign.site.ISiteFeign;
 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.utils.SpringUtils;
 import lombok.Data;
 import org.springframework.util.ObjectUtils;
 
 import java.io.Serializable;
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -30,6 +48,11 @@ public class SiteTreeSelect implements Serializable {
      */
     private String siteCode;
 
+    /**
+     * 站点详细地址
+     */
+    private String detailAddress;
+
     /**
      * 节点名称
      */
@@ -38,6 +61,10 @@ public class SiteTreeSelect implements Serializable {
      * 区域编码
      */
     private String areaCode;
+    /**
+     * 为区域时 层级
+     */
+    private Integer level;
     /**
      * 是否叶子节点
      */
@@ -62,11 +89,39 @@ public class SiteTreeSelect implements Serializable {
      */
     private String icon;
 
+    /**
+     * 设备总数
+     */
+    private Integer deviceTotal;
+
+    /**
+     * 在线总数
+     */
+    private Integer offlineTotal;
+
+    /**
+     * 离线总数
+     */
+    private Integer onlineTotal;
+    /**
+     * 未激活设备数量
+     */
+    private Integer UnActiveTotal;
+
+    /**
+     * 子节点数量
+     */
+    private Integer siteCount;
+
+
     /**
      * 子节点
      */
     private List<SiteTreeSelect> children;
 
+    public SiteTreeSelect() {
+    }
+
     public SiteTreeSelect(AreaEntity entity) {
         //如果是站点，则替换名称和id
 
@@ -93,6 +148,7 @@ public class SiteTreeSelect implements Serializable {
             this.siteCode = collect.stream().map(item -> item.getSiteCode()).collect(Collectors.joining(","));
             this.type = "site";
             this.icon = "el-icon-wind-power";
+            this.detailAddress = collect.stream().map(item -> item.getDetailAddress()).collect(Collectors.joining(","));
             this.longitude = collect.stream().findFirst().map(item -> item.getLongitude()).orElseGet(() -> "");
             this.latitude = collect.stream().findFirst().map(item -> item.getLatitude()).orElseGet(() -> "");
         } else {
@@ -101,6 +157,7 @@ public class SiteTreeSelect implements Serializable {
             this.type = "area";
             this.icon = "el-icon-place";
         }
+        this.level = entity.getAreaLevel();
         if ("False".equalsIgnoreCase(entity.getHaveSonArea())) {
             this.isLeaf = true;
             //this.children = new ArrayList();
@@ -113,16 +170,69 @@ public class SiteTreeSelect implements Serializable {
 
     }
 
-    public SiteTreeSelect(SiteEntity entity) {
-        this.id = entity.getId().toString();
-        this.label = entity.getSiteName();
-        this.isLeaf = true;
-        this.type = "site";
-        this.icon = "el-icon-document";
-
-        this.longitude = entity.getLongitude();
-        this.latitude = entity.getLatitude();
+    // 反序列化器
+    public static class Deserializer implements ObjectDeserializer {
+        @Override
+        public SiteTreeSelect deserialze(DefaultJSONParser parser, Type type, Object fieldName) {
+            SiteTreeSelect node = new SiteTreeSelect();
+            JSONObject jsonObject = parser.parseObject();
+            node.setId(jsonObject.getString("id"));
+            node.setSiteCode(jsonObject.getString("siteCode"));
+            node.setLabel(jsonObject.getString("label"));
+            node.setAreaCode(jsonObject.getString("areacode"));
+            node.setIsLeaf(jsonObject.getBoolean("isLeaf"));
+            node.setLongitude(jsonObject.getString("longitude"));
+            node.setLatitude(jsonObject.getString("latitude"));
+            node.setType(jsonObject.getString("type"));
+            node.setIcon(jsonObject.getString("icon"));
+            ISiteFeign siteFeign = SpringUtils.getBean(ISiteFeign.class);
+            SitePdu sitePdu = new SitePdu();
+            if ("site".equals(node.getType())) {
+                //统计当前站点下的所有在线 离线 设备总数。
+                DeviceService deviceService = SpringUtils.getBean(DeviceService.class);
+                List<DeviceEntity> deviceList = deviceService.find(new DeviceQuery().siteId(DataUtil.converStr2Long(node.getId(), -1)));
+                node.setDeviceTotal(deviceList.size());
+                //未激活数量
+                Long deviceUnActiveCount = deviceList.parallelStream()
+                        .filter(f -> f.getDeviceStatus() == DeviceStatusEnum.未激活.getValue())
+                        .count();
+                node.setUnActiveTotal(deviceUnActiveCount.intValue());
+                Long deviceOnlineCount = deviceList.parallelStream()
+                        .filter(f -> f.getDeviceStatus() > DeviceStatusEnum.未激活.getValue())
+                        .filter(f -> f.getEnabled() == EnabledEnum.启用.getValue())
+                        .filter(f -> f.getDeviceStatus() == DeviceStatusEnum.在线.getValue())
+                        .count();
+
+                node.setOnlineTotal(deviceOnlineCount.intValue());
+                //离线数量
+                Long deviceOfflineCount = deviceList.parallelStream()
+                        .filter(f -> f.getDeviceStatus() > DeviceStatusEnum.未激活.getValue())
+                        .filter(f -> f.getEnabled() == EnabledEnum.启用.getValue())
+                        .filter(f -> f.getDeviceStatus() == DeviceStatusEnum.离线.getValue())
+                        .count();
+                node.setOfflineTotal(deviceOfflineCount.intValue());
+            }
+            //todo 统计当前区域下的所有站点数量
+
+            sitePdu.setAreaCode(node.getAreaCode());
+            Rest<Integer> rest = siteFeign.countSitesByArea(sitePdu);
+            if (rest.getCode() == YesNoEnum.YES.getValue()) {
+                node.setSiteCount(rest.getData());
+            }
+            JSONArray jsonArray = jsonObject.getJSONArray("children");
+            List<SiteTreeSelect> children = new ArrayList<>();
+            for (int i = 0; i < jsonArray.size(); i++) {
+                SiteTreeSelect child = JSON.parseObject(jsonArray.getJSONObject(i).toJSONString(), SiteTreeSelect.class);
+                children.add(child);
+            }
+            node.setChildren(children);
+            return node;
+        }
 
+        @Override
+        public int getFastMatchToken() {
+            return JSONToken.LBRACE;
+        }
     }
 
 }
\ No newline at end of file

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

@@ -6,8 +6,10 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.common.code.PlatformTypeEnum;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.common.utils.SyncTreeSiteThread;
+import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.feign.user.IUserFeign;
 import com.mortals.xhx.module.area.model.AreaEntity;
 import com.mortals.xhx.module.area.model.AreaQuery;
@@ -19,6 +21,7 @@ import com.mortals.xhx.module.site.model.SiteTreeSelect;
 import com.mortals.xhx.module.site.service.SiteService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -46,6 +49,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
     private AreaService areaService;
     @Autowired
     private IUserFeign userFeign;
+    @Value("${platform.type:cloud}")
+    private String platFormType;//版本，默认云服务版本
+    @Autowired
+    private ISiteFeign siteFeign;
 
     @Override
     protected void validData(SiteEntity entity, Context context) throws AppException {
@@ -189,13 +196,25 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
     @Override
     public List<SiteTreeSelect> getSiteTree(Context context) {
-        List<SiteTreeSelect> siteTreeSelects = siteTreeMap.get(context.getUser().getId());
-        //如果所属站点为空返回全节点树
-        if (!ObjectUtils.isEmpty(siteTreeSelects)) {
-            return siteTreeSelects;
-        } else {
-            return siteTreeMap.get(0);
+        //判断是单机还是云
+        List<SiteTreeSelect> siteTreeSelects =new ArrayList<>();
+        if (platFormType.equalsIgnoreCase(PlatformTypeEnum.STANDALONE.getValue())) {
+             siteTreeSelects = siteTreeMap.get(context.getUser().getId());
+            //如果所属站点为空返回全节点树
+            if (!ObjectUtils.isEmpty(siteTreeSelects)) {
+                return siteTreeSelects;
+            } else {
+                return siteTreeMap.get(0);
+            }
+        }else{
+            //云服务版本，获取站点树
+           // siteFeign.siteTree()
+
+
+
         }
+
+        return siteTreeSelects;
     }
 
     @Override
@@ -282,20 +301,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
     @Override
     public List<SiteEntity> getListAllInfoByQuery(SiteQuery query, Context context) throws AppException {
         List<SiteEntity> list = this.find(query, context);
-//        if (CollectionUtils.isNotEmpty(list)) {
-//            list.stream().forEach(item -> {
-//                ModelQuery modelQuery = new ModelQuery();
-//                List<String> modelIds = StringUtils.converStr2List(item.getModelIds());
-//                List<Long> ids = modelIds.stream().map(s -> DataUtil.converStr2Long(s.trim(), 0)).collect(Collectors.toList());
-//                if (ids.isEmpty()) {
-//                    ids.add(0l);
-//                }
-//                modelQuery.setIdList(ids);
-//                List<ModelEntity> modelEntityList = modelService.find(modelQuery);
-//                item.setModelList(modelEntityList);
-//            });
-//        }
-
         return list;
     }
 
@@ -308,16 +313,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
     @Override
     public void changeUrlPath(SiteEntity siteEntity) {
-//        if (!ObjectUtils.isEmpty(siteEntity) && !ObjectUtils.isEmpty(siteEntity.getLogoPath())) {
-//            String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_IMAGE_URL, "http://192.168.0.98:11091");
-//            String fullPath = URLUtil.completeUrl(domain, siteEntity.getLogoPath());
-//            siteEntity.setLogoFullPath(fullPath);
-//        }
 
-//        if (!ObjectUtils.isEmpty(siteEntity) && !ObjectUtils.isEmpty(siteEntity.getModelIds())) {
-//            List<Long> modelIdlist = StrUtil.split(siteEntity.getModelIds(), ",".charAt(0), -1, true, (String str) -> Long.parseLong(str));
-//            List<ModelEntity> collect =modelService.find(new ModelQuery().idList(modelIdlist));
-//            siteEntity.setModelList(collect);
-//        }
     }
 }
\ No newline at end of file

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

 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;
@@ -226,6 +228,22 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
             String token = context.getUser().getToken();
             if (!ObjectUtils.isEmpty(token)) {
                 String resp = siteFeign.siteTree(token);
+                Rest<String> rest = JSON.parseObject(resp, new TypeReference<Rest<String>>() {
+                });
+                if(rest.getCode()==YesNoEnum.YES.getValue()){
+                    String siteTreeSelectStr = rest.getData();
+
+                    JSONArray jsonArray = JSON.parseArray(siteTreeSelectStr);
+//                    if (ObjectUtils.isEmpty(jsonArray)) {
+//                        return new ArrayList<>();
+//                    }
+                    List<SiteTreeSelect> collect = jsonArray.stream().map(item -> {
+                        SiteTreeSelect siteTreeSelect = JSON.parseObject(item.toString(), SiteTreeSelect.class);
+                        return siteTreeSelect;
+                    }).collect(Collectors.toList());
+
+                }
+
                 return resp;
             }
         } else {
@@ -277,4 +295,21 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
         }
 
     }
+
+
+    public static void main(String[] args) {
+
+        String siteTreeSelectStr="[{\"areaCode\":\"511500000000\",\"children\":[{\"areaCode\":\"511502000000\",\"children\":[{\"areaCode\":\"511502012000\",\"children\":[{\"areaCode\":\"511502012001\",\"icon\":\"el-icon-wind-power\",\"id\":\"4\",\"isLeaf\":true,\"label\":\"东街站点\",\"latitude\":\"2\",\"longitude\":\"1\",\"siteCode\":\"511502012001-0001\",\"type\":\"site\"}],\"icon\":\"el-icon-place\",\"id\":\"1b01f5486d63467aaa24eafbee797b47\",\"isLeaf\":false,\"label\":\"合江门街道\",\"type\":\"area\"}],\"icon\":\"el-icon-wind-power\",\"id\":\"2\",\"isLeaf\":false,\"label\":\"翠屏区市民中心\",\"latitude\":\"31.467450\",\"longitude\":\"104.679114\",\"siteCode\":\"511502000000-0001\",\"type\":\"site\"},{\"areaCode\":\"511521000000\",\"children\":[],\"icon\":\"el-icon-wind-power\",\"id\":\"3\",\"isLeaf\":false,\"label\":\"徐州区办事处\",\"latitude\":\"28.758065\",\"longitude\":\"104.647877\",\"siteCode\":\"511521000000-0001\",\"type\":\"site\"}],\"icon\":\"el-icon-wind-power\",\"id\":\"1\",\"isLeaf\":false,\"label\":\"四川恒升信达科技有限公司\",\"latitude\":\"30.595081\",\"longitude\":\"104.062983\",\"siteCode\":\"511500000000-0001\",\"type\":\"site\"}]";
+
+        JSONArray jsonArray = JSON.parseArray(siteTreeSelectStr);
+
+        List<SiteTreeSelect> collect = jsonArray.stream().map(item -> {
+            SiteTreeSelect siteTreeSelect = JSON.parseObject(item.toString(), SiteTreeSelect.class);
+            return siteTreeSelect;
+        }).collect(Collectors.toList());
+
+        System.out.println(JSON.toJSONString(collect));
+
+    }
+
 }
\ No newline at end of file