设备添加站点编码

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

@@ -215,7 +215,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
             //注册rabbmit相关队列与绑定
             registerRabbitQueue(entity, platformEntity, productEntity);
             //新增设备通知第三方平台
-           // sendThirdParty(entity, productEntity, platformEntity, DeviceMethodEnum.ADD);
+            // sendThirdParty(entity, productEntity, platformEntity, DeviceMethodEnum.ADD);
         } else {
             throw new AppException("产品或平台不存在！");
         }
@@ -257,7 +257,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
             //注册rabbmit相关队列与绑定
             registerRabbitQueue(entity, platformEntity, productEntity);
             //新增设备通知第三方平台 激活后的设备才通知
-            if(entity.getDeviceStatus()>0){
+            if (entity.getDeviceStatus() > 0) {
                 sendThirdParty(entity, productEntity, platformEntity, DeviceMethodEnum.UPDATE);
             }
         }
@@ -398,16 +398,18 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
                 entity.setPlatformName(platformEntity.getPlatformName());
             }
         }
-
-
         //如果负责人与电话为空，查询站点关联
-        if(ObjectUtils.isEmpty(entity.getLeadingOfficial())){
+        if (ObjectUtils.isEmpty(entity.getLeadingOfficial()) || ObjectUtils.isEmpty(entity.getSiteCode())) {
             Rest<SitePdu> info = siteFeign.info(entity.getSiteId());
-            if(info.getCode()==YesNoEnum.YES.getValue()){
+            if (info.getCode() == YesNoEnum.YES.getValue()) {
                 entity.setLeadingOfficial(info.getData().getLeadingOfficial());
                 entity.setLeadingOfficialTelephone(info.getData().getLeadingOfficialTelephone());
+                entity.setSiteCode(info.getData().getSiteCode());
+                entity.setSiteName(info.getData().getSiteName());
             }
         }
+
+
         super.saveBefore(entity, context);
     }