Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/VoiceRecordLogServiceImpl.java

@@ -8,11 +8,11 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.VoiceRecordFileDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.VoiceRecordLogDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.VoiceRecordLog;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.VoiceRecordLogMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.ICtiService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IVoiceRecordLogService;
-import com.yeejoin.amos.boot.module.tzs.api.dto.VoiceRecordLogDto;
 import com.yeejoin.amos.component.feign.config.TokenOperation;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -24,11 +24,10 @@ import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -158,6 +157,12 @@ public class VoiceRecordLogServiceImpl extends BaseService<VoiceRecordLogDto,Voi
                 json.put("alertId",model.getAlertId());
                 try {
                     emqKeeper.getMqttClient().publish(ctiMessage, json.toJSONString().getBytes(), 2, false);
+                    try {
+                        redisUtils.del(RedisKey.TZS_ALERTCALLED_ID+model.getAlertId());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        logger.error("删除redis失败:" + e.getMessage());
+                    }
                 } catch (MqttException e) {
                     logger.error("推送失败");
                 }