Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseGgpFacilityServiceImpl.java

@@ -350,10 +350,6 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
                     .groupBy("product_code");
             List<Map<String, Object>> dmpDeviceInfoList = dmpDeviceInfoService.listMaps(query);
             if (CollectionUtils.isNotEmpty(dmpDeviceInfoList)){
-                List<String> productCodeList = new ArrayList<>();
-                for (int j = 0; j < dmpDeviceInfoList.size(); j++) {
-                    productCodeList.add(String.valueOf(dmpDeviceInfoList.get(j).get("productCode")));
-                }
                 if (CollectionUtils.isNotEmpty(dmpProductInfoList)){
                     for (int m = 0; m < dmpProductInfoList.size(); m++){
                         Map<String, Object> map2 = new HashMap<>();
@@ -378,6 +374,17 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
                     }
                 }
                 map.put("productList",list5);
+            }else {
+                if (CollectionUtils.isNotEmpty(dmpProductInfoList)) {
+                    for (int m = 0; m < dmpProductInfoList.size(); m++) {
+                        Map<String, Object> map2 = new HashMap<>();
+                        map2.put("productName", dmpProductInfoList.get(m).getProductName());
+                        map2.put("deviceCount", 0);
+                        map2.put("disposalRate", 100);
+                        list5.add(map2);
+                    }
+                    map.put("productList",list5);
+                }
             }
         }else {
             if (CollectionUtils.isNotEmpty(dmpProductInfoList)) {