救援过程修改记录

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,39 +158,45 @@ 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{
-            // 警情基本信息
-            AlertCalled alertCalled = this.getById(id);
-            LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(AlertFormValue::getAlertCalledId, id);
-            // 警情动态表单数据
-            List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
-            List<FormValue> formValue = new ArrayList<FormValue>();
-            if(list!=null&&list.size()>0) {
-                for (AlertFormValue alertFormValue : list) {
-                    FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.getBlock());
-                    formValue.add(value);
-                }
-            }
-            AlertCalledDto alertCalledDto = new AlertCalledDto();
-            BeanUtils.copyProperties(alertCalled,alertCalledDto);
-            Elevator elevator = new Elevator();
-            elevator.setRescueCode(Integer.valueOf(alertCalled.getDeviceId()));
-            elevator.setRegisterCode(alertCalled.getRegistrationCode());
-            Map<String,Object> map =  iElevatorService.selectElevatorList(elevator);
-            if(!ObjectUtils.isEmpty(map)){
-                alertCalledDto.setAddress(String.valueOf(map.get("address")));
-                alertCalledDto.setProvince(String.valueOf(map.get("province")));
-                alertCalledDto.setCity(String.valueOf(map.get("city")));
-                alertCalledDto.setDistrict(String.valueOf(map.get("district")));
-                alertCalledDto.setUseStatus(String.valueOf(map.get("useStatus")));
-                alertCalledDto.setUseSiteCategory(ObjectUtils.isEmpty(map.get("useSiteCategory")) || "null".equals(String.valueOf(map.get("useSiteCategory"))) ? null : String.valueOf(map.get("useSiteCategory")));
-                alertCalledDto.setUseUnit(String.valueOf(map.get("useUnit")));
-                alertCalledDto.setRegionCode(String.valueOf(map.get("regionCode")));
+            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<>();
+        queryWrapper.eq(AlertFormValue::getAlertCalledId, id);
+        // 警情动态表单数据
+        List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
+        List<FormValue> formValue = new ArrayList<FormValue>();
+        if(list!=null&&list.size()>0) {
+            for (AlertFormValue alertFormValue : list) {
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.getBlock());
+                formValue.add(value);
             }
+        }
+        AlertCalledDto alertCalledDto = new AlertCalledDto();
+        BeanUtils.copyProperties(alertCalled,alertCalledDto);
+        Elevator elevator = new Elevator();
+        elevator.setRescueCode(Integer.valueOf(alertCalled.getDeviceId()));
+        elevator.setRegisterCode(alertCalled.getRegistrationCode());
+        Map<String,Object> map =  iElevatorService.selectElevatorList(elevator);
+        if(!ObjectUtils.isEmpty(map)){
+            alertCalledDto.setAddress(String.valueOf(map.get("address")));
+            alertCalledDto.setProvince(String.valueOf(map.get("province")));
+            alertCalledDto.setCity(String.valueOf(map.get("city")));
+            alertCalledDto.setDistrict(String.valueOf(map.get("district")));
+            alertCalledDto.setUseStatus(String.valueOf(map.get("useStatus")));
+            alertCalledDto.setUseSiteCategory(ObjectUtils.isEmpty(map.get("useSiteCategory")) || "null".equals(String.valueOf(map.get("useSiteCategory"))) ? null : String.valueOf(map.get("useSiteCategory")));
+            alertCalledDto.setUseUnit(String.valueOf(map.get("useUnit")));
+            alertCalledDto.setRegionCode(String.valueOf(map.get("regionCode")));
+        }
 //              数据源切换
 //            LambdaQueryWrapper<Elevator> elevatorQueryWrapper = new LambdaQueryWrapper<>();
 //            elevatorQueryWrapper.eq(Elevator::getRescueCode, alertCalled.getDeviceId());
@@ -206,16 +212,13 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 //                alertCalledDto.setUseUnit(elevator.getUseUnit());
 //                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"));
-            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;
+        String voiceRecord = "";
+        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);
+        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()));