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

@@ -303,6 +303,9 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
         map.put("facilityAddress", baseGgpFacilityList.get(0).getFacilityAddress());
         map.put("contact", baseGgpFacilityList.get(0).getContact());
         map.put("contactPhone", baseGgpFacilityList.get(0).getContactPhone());
+        LambdaQueryWrapper<DmpProductInfo> queryWrapper2 = Wrappers.lambdaQuery();
+        queryWrapper2.eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
+        List<DmpProductInfo> dmpProductInfoList = dmpProductInfoService.list(queryWrapper2);
         if (CollectionUtils.isNotEmpty(baseFacilityDeviceList)) {
             List<String> deviceIdList = new ArrayList<>();
             for (int i = 0; i < baseFacilityDeviceList.size(); i++) {
@@ -351,9 +354,6 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
                 for (int j = 0; j < dmpDeviceInfoList.size(); j++) {
                     productCodeList.add(String.valueOf(dmpDeviceInfoList.get(j).get("productCode")));
                 }
-                LambdaQueryWrapper<DmpProductInfo> queryWrapper2 = Wrappers.lambdaQuery();
-                queryWrapper2.eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
-                List<DmpProductInfo> dmpProductInfoList = dmpProductInfoService.list(queryWrapper2);
                 if (CollectionUtils.isNotEmpty(dmpProductInfoList)){
                     for (int m = 0; m < dmpProductInfoList.size(); m++){
                         Map<String, Object> map2 = new HashMap<>();
@@ -379,6 +379,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);
+            }
         }
         list.add(map);
         return list;