添加启动日志

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

@@ -355,10 +355,17 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
             entity.setDeviceMac(StrUtil.replace(entity.getDeviceMac(), ":", "-"));
         }
 
-        //产品编码唯一
+        //设备编码唯一
         DeviceEntity deviceEntity = this.selectOne(new DeviceQuery().deviceCode(entity.getDeviceCode()));
         if (!ObjectUtils.isEmpty(deviceEntity)) {
-            throw new AppException("设备编码重复！");
+            //如果原始的域当前的站点不一致，做更新处理，否则提示编码重复
+            if (!ObjectUtils.isEmpty(entity.getSiteId())&&entity.getSiteId() != deviceEntity.getSiteId()) {
+                entity.setId(deviceEntity.getId());
+                entity.setUpdateTime(new Date());
+                entity.setUpdateUserId(getContextUserId(context));
+            } else {
+                throw new AppException("设备编码重复！");
+            }
         }
 
         if (!ObjectUtils.isEmpty(entity.getProductId())) {