*）指令流增加接警录音

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -35,37 +35,12 @@ import com.yeejoin.amos.boot.module.common.api.service.IDutyPersonService;
 import com.yeejoin.amos.boot.module.common.api.service.IFireTeamService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCallCommandDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCallePowerTransferRo;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledFormDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledMobDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledPowerInfoDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedExtDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedZHDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.InstructionsZHDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerData;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyZHDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PushMessageWebAndAppRo;
-import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateExtendDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.*;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
-import com.yeejoin.amos.boot.module.jcs.api.enums.AlertBusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jcs.api.enums.AlertSchedulingTypeEnum;
-import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
-import com.yeejoin.amos.boot.module.jcs.api.enums.AlertSubmitTypeEnum;
-import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum;
-import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
+import com.yeejoin.amos.boot.module.jcs.api.enums.*;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferCompanyMapper;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
@@ -82,7 +57,6 @@ import org.apache.poi.xwpf.usermodel.XWPFTable;
 import org.apache.poi.xwpf.usermodel.XWPFTableRow;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttPersistenceException;
-import org.joda.time.DateTime;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.STJc.Enum;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,29 +67,12 @@ import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.lang.reflect.Field;
 import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
@@ -162,6 +119,9 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
     PowerTransferMapper powerTransferMapper;
 
     @Autowired
+    VoiceRecordFileServiceImpl voiceRecordFileService;
+
+    @Autowired
     private EmqKeeper emqKeeper;
     @Value("${mqtt.topic.alert.reporting}")
     private String topic;
@@ -1075,6 +1035,13 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
 
         List<InstructionsZHDto> listInstructionsZHDto = new ArrayList<>();
 
+        //获取接警录音
+        List<VoiceRecordFileDto> voiceRecordFileDtos = voiceRecordFileService.listByAlertId(id);
+        voiceRecordFileDtos.stream().forEach(voiceRecordFileDto -> {
+            InstructionsZHDto instruct = new InstructionsZHDto(voiceRecordFileDto.getSequenceNbr(), "接警录音", voiceRecordFileDto.getRecDate(), voiceRecordFileDto.getFilePath(),null);
+            listInstructionsZHDto.add(instruct);
+        });
+
         //获取调派记录
         List<PowerTransferCompanyZHDto> listPowerTransferCompanyZHDto = powerTransferCompanyMapper.listPowerTransferCompanyZHDto(id);