Merge branch 'han' of uskycloud/usky-modules into server-165

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

@@ -235,11 +235,8 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                     .eq(DmpDeviceInfo::getProductCode,baseAlarm.getProductCode())
                     .eq(DmpDeviceInfo::getDeleteFlag,0);
             List<DmpDeviceInfo> records2 = dmpDeviceInfoService.list(lambdaQuery2);
-            LambdaQueryWrapper<BaseAlarmType> lambdaQuery3 = Wrappers.lambdaQuery();
-            lambdaQuery3.eq(BaseAlarmType::getTypeCode,baseAlarm.getAlarmType())
-                    .eq(BaseAlarmType::getDeleteFlag,0);
-            List<BaseAlarmType> records3 = baseAlarmTypeService.list(lambdaQuery3);
-            if(records.size()>0 && records3.size()>0 && records2.size()>0){
+            BaseAlarmType baseAlarmType = baseMapper.getAlarmTypeOne(baseAlarm.getAlarmType());
+            if(records.size()>0 && baseAlarmType !=null && records2.size()>0){
                 baseAlarm.setTenantId(records.get(0).getTenantId());
                 if (StringUtils.isNotBlank(baseAlarm.getHandleBy()) || StringUtils.isNotBlank(baseAlarm.getHandlePhone())) {
                     baseAlarm.setHandleStatus(1);
@@ -255,7 +252,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                         baseAlarm.setFacilityId(records1.get(0).getFacilityId());
                     }
                     baseAlarm.setDeviceName(records2.get(0).getDeviceName());
-                    baseAlarm.setTypeImg(records3.get(0).getTypeImg());
+                    baseAlarm.setTypeImg(baseAlarmType.getTypeImg());
                     webSocket.sendMessage(baseAlarm, records.get(0).getTenantId().toString());
                     return saveResult;
                 }