Merge remote-tracking branch 'origin/master'

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

@@ -620,6 +620,19 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
                     entity.setPlatformName(platformEntity.getPlatformName());
                 }
             }
+        }else if (!ObjectUtils.isEmpty(entity.getProductName())) {
+            ProductEntity productEntity = productService.selectOne(new ProductQuery().productName(entity.getProductName()));
+            if (!ObjectUtils.isEmpty(productEntity)) {
+                entity.setProductId(productEntity.getId());
+                entity.setProductCode(productEntity.getProductCode());
+                //根据产品查询平台
+                if (!ObjectUtils.isEmpty(productEntity.getPlatformId())) {
+                    PlatformEntity platformEntity = platformService.getCache(productEntity.getPlatformId().toString());
+                    entity.setPlatformId(platformEntity.getId());
+                    entity.setPlatformCode(platformEntity.getPlatformSn());
+                    entity.setPlatformName(platformEntity.getPlatformName());
+                }
+            }
         }
         if (!ObjectUtils.isEmpty(entity.getPlatformCode())) {
             PlatformEntity platformEntity = platformService.selectOne(new PlatformQuery().platformSn(entity.getPlatformCode()));