优化告警信息表-新增接口，增加报错日志的记录,优化设备信息表-新增接口，增加业务状态传值的判断取值

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmServiceImpl.java

@@ -120,10 +120,14 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                     return saveResult;
                 }
             }else {
-                throw new BusinessException("告警数据投递失败，请检查产品编码、设备编号、告警类型，是否有误;设备是否激活");
+                //throw new BusinessException("告警数据投递失败，请检查产品编码、设备编号、告警类型，是否有误;设备是否激活");
+                log.info("告警数据投递失败，请检查产品编码、设备编号、告警类型，是否有误;设备是否激活");
+                return false;
             }
         }else {
-            throw new BusinessException("告警数据投递失败，请检查产品编码、设备编号、告警类型，不能为空");
+            //throw new BusinessException("告警数据投递失败，请检查产品编码、设备编号、告警类型，不能为空");
+            log.info("告警数据投递失败，请检查产品编码、设备编号、告警类型，不能为空");
+            return false;
         }
     }
 

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

@@ -547,7 +547,10 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
             dmpDeviceInfo.setCreatedBy(SecurityUtils.getUsername());
             dmpDeviceInfo.setCreatedTime(LocalDateTime.now());
             dmpDeviceInfo.setTenantId(SecurityUtils.getTenantId());
-            dmpDeviceInfo.setServiceStatus(1);
+            if(dmpDeviceInfo.getDeviceStatus() == null) {
+                dmpDeviceInfo.setServiceStatus(1);
+            }
+
             if (StringUtils.isBlank(dmpDeviceInfo.getDeviceUuid())) {
                 dmpDeviceInfo.setDeviceUuid(UUIDUtils.uuid().substring(0, 16));
             }