|
@@ -95,6 +95,7 @@ public class DevicesSoundSensorsServiceImpl extends ServiceImpl<DevicesSoundSens
|
|
|
devicesSoundSensors.setDeptUuid(soundSensors.getDeptUuid());
|
|
|
|
|
|
if("file".equals(soundSensors.getSoundSensorType())){
|
|
|
+ System.out.println("获取:"+soundSensors.getSoundFileUUid().toString());
|
|
|
Object o = RedisUtils.get(soundSensors.getSoundFileUUid());
|
|
|
|
|
|
devicesSoundSensors.setStreamUrl(o.toString());
|
|
@@ -122,11 +123,17 @@ public class DevicesSoundSensorsServiceImpl extends ServiceImpl<DevicesSoundSens
|
|
|
//对文件进行立刻通知算法解析(如果是文件类型,通知算法解析)
|
|
|
|
|
|
if("file".equals(soundSensors.getSoundSensorType())){
|
|
|
- QueryWrapper<Skills> skillsQueryWrapper = new QueryWrapper<>();
|
|
|
- skillsQueryWrapper.eq("uuid",soundSensors.getSkillUuid()).last("limit 1");
|
|
|
- Skills skills = skillsServiceImpl.getBaseMapper().selectOne(skillsQueryWrapper);
|
|
|
-
|
|
|
- this.analysisSoundFile(devicesSoundSensors.getSrcUrl(),skills.getName(), devicesSoundSensors.getUuid(),
|
|
|
+// QueryWrapper<Skills> skillsQueryWrapper = new QueryWrapper<>();
|
|
|
+// skillsQueryWrapper.eq("uuid",soundSensors.getSkillUuid()).last("limit 1");
|
|
|
+// Skills skills = skillsServiceImpl.getBaseMapper().selectOne(skillsQueryWrapper);
|
|
|
+ //应现场环境,改成固定值
|
|
|
+ List<Skills> skillByName = skillsServiceImpl.getSkillByName(null);
|
|
|
+
|
|
|
+ String skillName = "未命名技能";
|
|
|
+ for (Skills skills : skillByName) {
|
|
|
+ if (skills.getUuid().equals(soundSensors.getSkillUuid())) skillName = skills.getName();
|
|
|
+ }
|
|
|
+ this.analysisSoundFile(devicesSoundSensors.getSrcUrl(),skillName, devicesSoundSensors.getUuid(),
|
|
|
devicesSoundSensors.getName(),soundSensors.getSkillUuid());
|
|
|
}
|
|
|
if (insert > 0){
|