2022-10-24 添加音乐合成类型，1是预案音乐，2是疏散音乐

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabAudioSynthesis.java

@@ -32,6 +32,9 @@ public class LabAudioSynthesis extends BaseEntity
     /** 预案id */
     @ApiModelProperty(value = "预案id")
     private Long riskPlanId;
+    /** 场景类型(1是预案，2是疏散) */
+    @ApiModelProperty(value = "场景类型(1是预案，2是疏散)")
+    private Integer sceneType;
     /** 音乐地址 */
     @Excel(name = "音乐地址")
     @Length(message = "音乐地址长度不能超过100")

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabExitLineServiceImpl.java

@@ -362,8 +362,11 @@ public class LabExitLineServiceImpl implements ILabExitLineService
 
         //todo 关闭喇叭
         try{
-            LabAudioSynthesis audioSyntheses = labAudioSynthesisMapper.selectLabAudioSynthesisById(5L);
-            if(com.zd.common.core.utils.StringUtils.isNotNull(audioSyntheses)){
+            LabAudioSynthesis audioSyn = new LabAudioSynthesis();
+            audioSyn.setSceneType(2);
+            List<LabAudioSynthesis> audioSynList = labAudioSynthesisMapper.selectLabAudioSynthesisList(audioSyn);
+            if(audioSynList.size()>0){
+                LabAudioSynthesis audioSyntheses = audioSynList.get(0);
                 R deviceList = remoteSpeakService.getDeviceList(1,10,5L);
                 if(deviceList.getCode()==200){
                     List<Map<String,Object>> mapList = (List <Map <String, Object>>) deviceList.getData();
@@ -511,8 +514,11 @@ public class LabExitLineServiceImpl implements ILabExitLineService
         //这里查询预案下的合成音乐
         if(redisService.getCacheObject("subjectByExit"+subId)==null){
             try{
-                LabAudioSynthesis audioSyntheses = labAudioSynthesisMapper.selectLabAudioSynthesisById(5L);
-                if(com.zd.common.core.utils.StringUtils.isNotNull(audioSyntheses)){
+                LabAudioSynthesis audioSyn = new LabAudioSynthesis();
+                audioSyn.setSceneType(2);
+                List<LabAudioSynthesis> audioSynList = labAudioSynthesisMapper.selectLabAudioSynthesisList(audioSyn);
+                if(audioSynList.size()>0){
+                    LabAudioSynthesis audioSyntheses = audioSynList.get(0);
                     //获取喇叭列表
                     R deviceList = remoteSpeakService.getDeviceList(1,10, 5L);
                     if(deviceList.getCode()==200){

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabAudioSynthesisMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.zd.laboratory.domain.LabAudioSynthesis" id="LabAudioSynthesisResult">
         <result property="id"    column="id"    />
         <result property="riskPlanId"    column="risk_plan_id"    />
+        <result property="sceneType"    column="scene_type"    />
         <result property="musicUrl"    column="music_url"    />
         <result property="musicVolume"    column="music_volume"    />
         <result property="bgmusicUrl"    column="bgmusic_url"    />
@@ -18,21 +19,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectLabAudioSynthesisVo">
-        select id, risk_plan_id, music_url, music_volume, bgmusic_url, bgmusic_volume, new_music_url, user_id, create_by, create_time from lab_audio_synthesis
+        select id, risk_plan_id, scene_type, music_url, music_volume, bgmusic_url, bgmusic_volume, new_music_url, user_id, create_by, create_time from lab_audio_synthesis
     </sql>
     <sql id="selectLabAudioSynthesisListVo">
-        select t.id, t.risk_plan_id, t.music_url, t.music_volume, t.bgmusic_url, t.bgmusic_volume, t.new_music_url, t.user_id, t.create_by, t.create_time from lab_audio_synthesis as t
+        select t.id, t.risk_plan_id, t.scene_type, t.music_url, t.music_volume, t.bgmusic_url, t.bgmusic_volume, t.new_music_url, t.user_id, t.create_by, t.create_time from lab_audio_synthesis as t
     </sql>
     <select id="selectLabAudioSynthesisList" parameterType="com.zd.laboratory.domain.LabAudioSynthesis" resultMap="LabAudioSynthesisResult">
         <include refid="selectLabAudioSynthesisVo"/>
         <where>
             <if test="riskPlanId != null  and riskPlanId != ''"> and risk_plan_id = #{riskPlanId}</if>
+            <if test="sceneType != null  and sceneType != ''"> and scene_type = #{sceneType}</if>
             <if test="musicUrl != null  and musicUrl != ''"> and music_url = #{musicUrl}</if>
             <if test="musicVolume != null "> and music_volume = #{musicVolume}</if>
             <if test="bgmusicUrl != null  and bgmusicUrl != ''"> and bgmusic_url = #{bgmusicUrl}</if>
             <if test="bgmusicVolume != null "> and bgmusic_volume = #{bgmusicVolume}</if>
             <if test="newMusicUrl != null  and newMusicUrl != ''"> and new_music_url = #{newMusicUrl}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="getListByIds" resultMap="LabAudioSynthesisResult">
@@ -55,6 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
     <if test="riskPlanId != null">risk_plan_id,</if>
 
+    <if test="sceneType != null">scene_type,</if>
+
     <if test="musicUrl != null">music_url,</if>
 
     <if test="musicVolume != null">music_volume,</if>
@@ -74,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
     <if test="riskPlanId != null">#{riskPlanId},</if>
+    <if test="sceneType != null">#{sceneType},</if>
     <if test="musicUrl != null">#{musicUrl},</if>
     <if test="musicVolume != null">#{musicVolume},</if>
     <if test="bgmusicUrl != null">#{bgmusicUrl},</if>
@@ -89,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update lab_audio_synthesis
         <trim prefix="SET" suffixOverrides=",">
             <if test="riskPlanId != null">risk_plan_id = #{riskPlanId},</if>
+            <if test="sceneType != null">scene_type = #{sceneType},</if>
             <if test="musicUrl != null">music_url = #{musicUrl},</if>
             <if test="musicVolume != null">music_volume = #{musicVolume},</if>
             <if test="bgmusicUrl != null">bgmusic_url = #{bgmusicUrl},</if>