Merge pull request '大屏设备数据接口bug修复' (#23) from zzw-one into master

Reviewed-on: #23

ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/asset/AssetServiceImpl.java

@@ -26,19 +26,28 @@ public class AssetServiceImpl implements AssetService {
     @Override
     public List<Map<String, String>> countAsset() {
         List<Asset> assetList = assetRepository.findAll();
-        int[] assetTypeCounts = new int[3];
+        int[] assetTypeCounts = new int[6];
         Map<String, String> map = new LinkedHashMap<>();
         for (Asset asset : assetList) {
             String assettype = asset.getAssettype();
             switch (assettype) {
                 case "C":
                     assetTypeCounts[0]++;
+                    if ("1".equals(asset.getIsOnline())){
+                        assetTypeCounts[3]++;
+                    }
                     break;
                 case "D":
                     assetTypeCounts[1]++;
+                    if ("1".equals(asset.getIsOnline())){
+                        assetTypeCounts[4]++;
+                    }
                     break;
                 case "F":
                     assetTypeCounts[2]++;
+                    if ("1".equals(asset.getIsOnline())){
+                        assetTypeCounts[5]++;
+                    }
                     break;
                 default:
                     break;
@@ -52,6 +61,15 @@ public class AssetServiceImpl implements AssetService {
             Map<String, String> map1=new LinkedHashMap<>();
             map1.put("assettype",stringStringEntry.getKey());
             map1.put("count",stringStringEntry.getValue());
+            if ("其他电子设备".equals(stringStringEntry.getKey())){
+                map1.put("onlineCount",String.valueOf(assetTypeCounts[3]));
+            }
+            if ("运输设备".equals(stringStringEntry.getKey())){
+                map1.put("onlineCount",String.valueOf(assetTypeCounts[4]));
+            }
+            if ("手持机".equals(stringStringEntry.getKey())){
+                map1.put("onlineCount",String.valueOf(assetTypeCounts[5]));
+            }
             mapList.add(map1);
         }
         return mapList;