Skip to content

A
amos-boot-biz
Commit 45096d09 authored by H2T's avatar H2T
Browse files
Options

96333bug修改

parent 5450ef00
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 43 deletions
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/AlertCalledController.java
View file @ 45096d09
......@@ -147,31 +147,8 @@ public class AlertCalledController extends BaseController {
}
AgencyUserModel userModel = reginParams.getUserModel();
alertCalledObjsDto = iAlertCalledService.createAlertCalled(alertCalledObjsDto, userModel);
try {
//更新警情历史记录表
AlertCalledDto alertCalledDto = alertCalledObjsDto.getAlertCalledDto();
List<AlertFormValue> alertFormValue = alertCalledObjsDto.getAlertFormValue();
HashMap<String, String> formMap = new HashMap<>();
alertFormValue.forEach(x-> formMap.put(x.getFieldCode(),x.getFieldValue()));
AlertFormRecordDto alertFormRecordDto = new AlertFormRecordDto();
alertFormRecordDto.setAlertCalledId(alertCalledDto.getSequenceNbr());
alertFormRecordDto.setAlertTypeCode(alertCalledDto.getAlertSourceCode());
alertFormRecordDto.setName(alertCalledDto.getEmergencyPerson());
alertFormRecordDto.setPhone(alertCalledDto.getContactPhone());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
alertFormRecordDto.setTrappedTime(sdf.parse(formMap.getOrDefault("trapped_time", new Date().toString())));
alertFormRecordDto.setTrappedNum(Integer.parseInt(formMap.getOrDefault("trapped_num", "0")));
alertFormRecordDto.setInjuredNum(Integer.parseInt(formMap.getOrDefault("injured_num", "0")));
alertFormRecordDto.setDieNum(Integer.parseInt(formMap.getOrDefault("die_num", "0")));
alertFormRecordDto.setTrappedFloorNum(Integer.parseInt(formMap.getOrDefault("trapped_floor_num", "0")));
alertFormRecordDto.setIsLight("是".equals(formMap.getOrDefault("is_light","是")) ? 1 : 0);
alertFormRecordDto.setDescription((String) formMap.getOrDefault("desc", ""));
alertFormRecordDto.setSourcesInfo(SourcesInfoEnum.Submit.getCode().toString());
alertFormRecordService.saveAlertFormRecord(alertFormRecordDto);
}catch (Exception e){
e.printStackTrace();
}
//更新警情历史记录表
saveAlertCallRecord(alertCalledObjsDto);
// 坐席接警后，辅屏由常态化切换为处置态
JSONObject jsonObject = new JSONObject();
......@@ -195,6 +172,40 @@ public class AlertCalledController extends BaseController {
return ResponseHelper.buildResponse(alertCalledObjsDto.getAlertCalledDto());
}
private void saveAlertCallRecord(AlertCalledObjsDto alertCalledObjsDto) {
try {
AlertCalledDto alertCalledDto = alertCalledObjsDto.getAlertCalledDto();
List<AlertFormValue> alertFormValue = alertCalledObjsDto.getAlertFormValue();
HashMap<String, String> formMap = new HashMap<>();
alertFormValue.forEach(x-> formMap.put(x.getFieldCode(),x.getFieldValue()));
AlertFormRecordDto alertFormRecordDto = new AlertFormRecordDto();
alertFormRecordDto.setAlertCalledId(alertCalledDto.getSequenceNbr());
alertFormRecordDto.setAlertTypeCode(alertCalledDto.getAlertSourceCode());
alertFormRecordDto.setName(alertCalledDto.getEmergencyPerson());
alertFormRecordDto.setPhone(alertCalledDto.getContactPhone());
if (AlertStageEnums.KRJY.getId().equals(alertCalledDto.getAlarmTypeCode())){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
alertFormRecordDto.setTrappedTime(sdf.parse(formMap.getOrDefault("trapped_time", new Date().toString())));
alertFormRecordDto.setTrappedNum(Integer.parseInt(formMap.getOrDefault("trapped_num", "0")));
alertFormRecordDto.setInjuredNum(Integer.parseInt(formMap.getOrDefault("injured_num", "0")));
alertFormRecordDto.setDieNum(Integer.parseInt(formMap.getOrDefault("die_num", "0")));
alertFormRecordDto.setTrappedFloorNum(Integer.parseInt(formMap.getOrDefault("trapped_floor_num", "0")));
alertFormRecordDto.setIsLight("是".equals(formMap.getOrDefault("is_light","是")) ? 1 : 0);
alertFormRecordDto.setDescription(formMap.getOrDefault("desc", ""));
}
if (AlertStageEnums.GZWX.getId().equals(alertCalledDto.getAlarmTypeCode())){
alertFormRecordDto.setFaultReport(formMap.getOrDefault("fault_report", ""));
}
if (AlertStageEnums.TSZX.getId().equals(alertCalledDto.getAlarmTypeCode())){
alertFormRecordDto.setComplaintConsulttation(formMap.getOrDefault("complaint_consulttation", ""));
}
alertFormRecordDto.setSourcesInfo(SourcesInfoEnum.Submit.getCode().toString());
alertFormRecordService.saveAlertFormRecord(alertFormRecordDto);
}catch (Exception e){
e.printStackTrace();
}
}
/**
* 公众号投诉建议与故障报销
*
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/RepairConsultController.java
View file @ 45096d09
......@@ -93,7 +93,7 @@ public class RepairConsultController extends BaseController {
String formattedDate = sdf.format(currentDate);
TreeMap<Object, Object> map = new TreeMap<>();
map.put("rec_user_id", reginParams.getUserModel().getUserId());
map.put("rec_user_name", reginParams.getUserModel().getUserName());
map.put("rec_user_name", reginParams.getUserModel().getRealName());
map.put("rec_date", formattedDate);
map.put("remark", model.getRemarks());
list.add(map);
......
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
View file @ 45096d09
......@@ -29,10 +29,12 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
/**
* 救援过程表服务实现类
......@@ -181,7 +183,6 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
} else {
if (Boolean.TRUE.equals(rescueProcessDto.getCasualtiesStatus())){
try {
//更新警情历史记录表
AlertCalledFormDto calledFormDto = iAlertCalledService.getAlertCalledFormDto(rescueProcessDto.getAlertId());
List<FormValue> dynamicFormAlert = calledFormDto.getDynamicFormAlert();
HashMap<String, String> formMap = new HashMap<>();
......@@ -190,22 +191,8 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
//更新动态表单
updateMessage(rescueProcessDto, "injured_num");
updateMessage(rescueProcessDto, "die_num");
AlertCalledDto alertCalledDto = calledFormDto.getAlertCalledDto();
AlertFormRecordDto alertFormRecordDto = new AlertFormRecordDto();
alertFormRecordDto.setAlertCalledId(rescueProcessDto.getAlertId());
alertFormRecordDto.setAlertTypeCode(alertCalledDto.getAlarmTypeCode());
alertFormRecordDto.setName(alertCalledDto.getEmergencyPerson());
alertFormRecordDto.setPhone(alertCalledDto.getEmergencyCall());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
alertFormRecordDto.setTrappedTime(sdf.parse(formMap.getOrDefault("trapped_time",new Date().toString())));
alertFormRecordDto.setTrappedNum(Integer.valueOf(formMap.getOrDefault("trapped_num","0")));
alertFormRecordDto.setTrappedFloorNum(Integer.parseInt(formMap.getOrDefault("trapped_floor_num","0")));
alertFormRecordDto.setInjuredNum(Integer.valueOf(rescueProcessDto.getCasualtiesInfo()));
alertFormRecordDto.setDieNum(Integer.valueOf(rescueProcessDto.getDieNum()));
alertFormRecordDto.setSourcesInfo(SourcesInfoEnum.Process.getCode().toString());
alertFormRecordDto.setIsLight("是".equals(formMap.getOrDefault("is_light", "是"))? 1 : 0);
alertFormRecordService.saveAlertFormRecord(alertFormRecordDto);
//更新警情历史记录表
saveAlertFormRecord(rescueProcessDto, calledFormDto, formMap);
}
}catch (Exception e){
e.printStackTrace();
......@@ -292,6 +279,26 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
return flag;
}
private void saveAlertFormRecord(RescueProcessDto rescueProcessDto, AlertCalledFormDto calledFormDto, HashMap<String, String> formMap) throws ParseException {
AlertCalledDto alertCalledDto = calledFormDto.getAlertCalledDto();
AlertFormRecordDto alertFormRecordDto = new AlertFormRecordDto();
alertFormRecordDto.setAlertCalledId(rescueProcessDto.getAlertId());
alertFormRecordDto.setAlertTypeCode(alertCalledDto.getAlarmTypeCode());
alertFormRecordDto.setName(alertCalledDto.getEmergencyPerson());
alertFormRecordDto.setPhone(alertCalledDto.getEmergencyCall());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
alertFormRecordDto.setTrappedTime(sdf.parse(formMap.getOrDefault("trapped_time",new Date().toString())));
alertFormRecordDto.setTrappedNum(Integer.valueOf(formMap.getOrDefault("trapped_num","0")));
alertFormRecordDto.setTrappedFloorNum(Integer.parseInt(formMap.getOrDefault("trapped_floor_num","0")));
int injuredNumBefore = Integer.parseInt(formMap.getOrDefault("injured_num", "0"));
int dieNumBefore = Integer.parseInt(formMap.getOrDefault("die_num", "0"));
alertFormRecordDto.setInjuredNum(Optional.ofNullable(rescueProcessDto.getCasualtiesInfo()).map(Integer::valueOf).orElse(injuredNumBefore));
alertFormRecordDto.setDieNum(Optional.ofNullable(rescueProcessDto.getDieNum()).map(Integer::valueOf).orElse(dieNumBefore));
alertFormRecordDto.setSourcesInfo(SourcesInfoEnum.Process.getCode().toString());
alertFormRecordDto.setIsLight("是".equals(formMap.getOrDefault("is_light", "是"))? 1 : 0);
alertFormRecordService.saveAlertFormRecord(alertFormRecordDto);
}
private void updateMessage(RescueProcessDto rescueProcessDto, String fieldCode){
LambdaQueryWrapper<AlertFormValue> lambda = new QueryWrapper<AlertFormValue>().lambda();
lambda.eq(AlertFormValue::getAlertCalledId, rescueProcessDto.getAlertId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment