救援过程修改记录

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java

@@ -158,10 +158,16 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     @Override
     public Object selectAlertCalledById(Long id) {
         if(redisUtils.hasKey(RedisKey.TZS_ALERTCALLED_ID+id)){
-//        if(false){
             Object obj= redisUtils.get(RedisKey.TZS_ALERTCALLED_ID+id);
             return obj;
         }else{
+            AlertCalledFormDto alertCalledFormVo = getAlertCalledFormDto(id);
+            redisUtils.set(RedisKey.TZS_ALERTCALLED_ID+id, JSON.toJSON(alertCalledFormVo),time);
+            return alertCalledFormVo;
+        }
+    }
+
+    public AlertCalledFormDto getAlertCalledFormDto(Long id) {
         // 警情基本信息
         AlertCalled alertCalled = this.getById(id);
         LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
@@ -207,16 +213,13 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 //                alertCalledDto.setRegionCode(elevator.getRegionCode());
 //            }
         String voiceRecord = "";
-            VoiceRecordFile temp = voiceRecordFileServiceImpl.getOne(new LambdaQueryWrapper<VoiceRecordFile>().eq(VoiceRecordFile::getAlertId,id).eq(VoiceRecordFile::getAlertStageCode,"860").orderByAsc(VoiceRecordFile::getTelStartTime).last("limit 1"));
+        VoiceRecordFile temp = voiceRecordFileServiceImpl.getOne(new LambdaQueryWrapper<VoiceRecordFile>().eq(VoiceRecordFile::getAlertId, id).eq(VoiceRecordFile::getAlertStageCode,"860").orderByAsc(VoiceRecordFile::getTelStartTime).last("limit 1"));
         if(temp != null) {
             voiceRecord = temp.getFilePath();
         }
         AlertCalledFormDto alertCalledFormVo = new AlertCalledFormDto(alertCalledDto, formValue,voiceRecord);
-
-            redisUtils.set(RedisKey.TZS_ALERTCALLED_ID+id, JSON.toJSON(alertCalledFormVo),time);
         return alertCalledFormVo;
     }
-    }
 
     public void selectAlertCalledByIdNew(AlertPaperInfoDto alertCalled) {
         // 警情基本信息

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/RescueProcessServiceImpl.java

@@ -184,7 +184,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
                 updateMessage(rescueProcessDto, "die_num");
                try {
                    //更新警情历史记录表
-                   AlertCalledFormDto calledFormDto = (AlertCalledFormDto)iAlertCalledService.selectAlertCalledById(rescueProcessDto.getAlertId());
+                   AlertCalledFormDto calledFormDto = iAlertCalledService.getAlertCalledFormDto(rescueProcessDto.getAlertId());
                    List<FormValue> dynamicFormAlert = calledFormDto.getDynamicFormAlert();
                    HashMap<String, String> formMap = new HashMap<>();
                    dynamicFormAlert.forEach(x->formMap.put(x.getKey(),x.getValue()));