Skip to content

A
amos-boot-biz
Commit c1003dea authored by kongfm's avatar kongfm
Browse files
Options

优化代码

parent 8877690f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 88 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java
View file @ c1003dea
......@@ -34,6 +34,11 @@ public class DateUtils {
private static final SimpleDateFormat shortDateNew = new SimpleDateFormat("yyyy/M/d");
/**
* 获取时分秒
*/
private static final SimpleDateFormat timeSdf = new SimpleDateFormat("HH:mm:ss");
/**
* 获取当前时间
*
* @return 当前日期时间
......@@ -687,4 +692,19 @@ public class DateUtils {
int age = birth.until(now).getYears();
return age;
}
/**
* 根据两个日期返回相差的时分秒
* @param newTime 靠后时间
* @param oldTime 靠前时间
* @return
*/
public static String getTimestr(Date newTime, Date oldTime) {
Long newTimes = newTime.getTime();
Long oldTimes = oldTime.getTime();
// 不改时间会多加八个小时
timeSdf.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
return timeSdf.format(newTimes-oldTimes);
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/VoiceRecordFileDto.java
View file @ c1003dea
......@@ -48,4 +48,7 @@ public class VoiceRecordFileDto extends BaseDto {
@ApiModelProperty(value = "警情阶段code")
private String alertStageCode;
@ApiModelProperty(value = "通话时长")
private String telTime;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/DispatchPaperEnums.java
View file @ c1003dea
......@@ -52,7 +52,10 @@ public enum DispatchPaperEnums {
repairUnit("950","repairUnit","维保单位"),
levelOneUnit("951","levelOneUnit","一级响应"),
levelTwoUnit("952","levelTwoUnit","二级响应"),
levelThreeUnit("953","levelThreeUnit","三级响应");
levelThreeUnit("953","levelThreeUnit","三级响应"),
hasDispatched("956","hasDispatched","已派遣"),
notDispatched("957","notDispatched","未派遣");
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java
View file @ c1003dea
package com.yeejoin.amos.boot.module.tzs.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.SystemClock;
......@@ -325,12 +327,12 @@ public class AlertCalledController extends BaseController {
}
void getResponseLevel(Long alertId, AlertCalledDto alertCalledDto, ESAlertCalledDto esAlertCalledDto) {
QueryWrapper<DispatchPaper> dispatchPaperQueryWrapper = new QueryWrapper<>();
dispatchPaperQueryWrapper.eq("alert_id",alertId);
LambdaQueryWrapper<DispatchPaper> dispatchPaperQueryWrapper = new LambdaQueryWrapper<>();
dispatchPaperQueryWrapper.eq(DispatchPaper::getAlertId,alertId);
DispatchPaper dispatchPaper = dispatchPaperServiceImpl.getOne(dispatchPaperQueryWrapper);
if(null != dispatchPaper) {
QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("alert_called_id", dispatchPaper.getSequenceNbr()).eq("alert_type_code", DispatchPaperEnums.getEnumById(dispatchPaper.getAlertCode()).getDynamicCode());
LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(AlertFormValue::getAlertCalledId, dispatchPaper.getSequenceNbr()).eq(AlertFormValue::getAlertTypeCode, DispatchPaperEnums.getEnumById(dispatchPaper.getAlertCode()).getDynamicCode());
// 派遣单动态表单数据
List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
// map 存取数据
......@@ -385,10 +387,10 @@ public class AlertCalledController extends BaseController {
|| ValidationUtil.isEmpty(forzenResult)){
throw new BadRequest("参数校验失败.");
}
UpdateWrapper<AlertCalled> updateWrapper = new UpdateWrapper<>();
updateWrapper.set("forzen_result",forzenResult);
updateWrapper.set("alert_status",1);
updateWrapper.eq("sequence_nbr",alertId);
LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(AlertCalled::getForzenResult,forzenResult);
updateWrapper.set(AlertCalled::getAlertStage,1);
updateWrapper.eq(AlertCalled::getSequenceNbr,alertId);
return ResponseHelper.buildResponse(iAlertCalledService.update(updateWrapper));
}
......@@ -406,10 +408,10 @@ public class AlertCalledController extends BaseController {
|| ValidationUtil.isEmpty(alertId)){
throw new BadRequest("参数校验失败.");
}
UpdateWrapper<AlertCalled> updateWrapper = new UpdateWrapper<>();
updateWrapper.set("final_reason",finalReason);
updateWrapper.set("alert_status",1);
updateWrapper.eq("sequence_nbr",alertId);
LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(AlertCalled::getFinalReason,finalReason);
updateWrapper.set(AlertCalled::getAlertStage,1);
updateWrapper.eq(AlertCalled::getSequenceNbr,alertId);
return ResponseHelper.buildResponse(iAlertCalledService.update(updateWrapper));
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchTaskController.java
View file @ c1003dea
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
......@@ -78,8 +79,8 @@ public class DispatchTaskController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "根据警情id 查找力量调派信息", notes = "根据警情id 查找力量调派信息")
@GetMapping(value = "/list/alert/{alertId}")
public ResponseModel<List<DispatchTask>> selectForListByAlertId(@PathVariable Long alertId) {
QueryWrapper<DispatchTask> queryWrapper = new QueryWrapper<DispatchTask>();
queryWrapper.eq("alert_id", alertId);
LambdaQueryWrapper<DispatchTask> queryWrapper = new LambdaQueryWrapper<DispatchTask>();
queryWrapper.eq(DispatchTask::getAlertId, alertId);
List<DispatchTask> list = dispatchTaskServiceImpl.list(queryWrapper);
return ResponseHelper.buildResponse(list);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RepairConsultController.java
View file @ c1003dea
package com.yeejoin.amos.boot.module.tzs.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
......@@ -62,8 +63,8 @@ public class RepairConsultController extends BaseController {
@ApiOperation(httpMethod = "GET",value = "根据警情id 查找处置过程日志", notes = "根据警情id 查找处置过程日志")
@GetMapping(value = "/list/alert/{alertId}")
public ResponseModel<List<RepairConsult>> selectForListByAlertId(@PathVariable Long alertId) {
QueryWrapper<RepairConsult> queryWrapper = new QueryWrapper<RepairConsult>();
queryWrapper.eq("parent_id", alertId).orderByDesc("rec_date");
LambdaQueryWrapper<RepairConsult> queryWrapper = new LambdaQueryWrapper<RepairConsult>();
queryWrapper.eq(RepairConsult::getParentId, alertId).orderByDesc(RepairConsult::getRecDate);
List<RepairConsult> list = repairConsultServiceImpl.list(queryWrapper);
return ResponseHelper.buildResponse(list);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/VoiceRecordFileController.java
View file @ c1003dea
package com.yeejoin.amos.boot.module.tzs.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
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.entity.VoiceRecordFile;
......@@ -9,6 +11,7 @@ import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
import com.yeejoin.amos.boot.module.tzs.biz.service.impl.VoiceRecordFileServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
......@@ -23,6 +26,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.UUID;
......@@ -83,10 +87,21 @@ public class VoiceRecordFileController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "根据警情id 查找通话记录信息", notes = "根据警情id 查找通话记录信息")
@GetMapping(value = "/list/alert/{alertId}")
public ResponseModel<List<VoiceRecordFile>> selectForListByAlertId(@PathVariable Long alertId) {
QueryWrapper<VoiceRecordFile> queryWrapper = new QueryWrapper<VoiceRecordFile>();
queryWrapper.eq("alert_id", alertId).orderByDesc("rec_date");
public ResponseModel<List<VoiceRecordFileDto>> selectForListByAlertId(@PathVariable Long alertId) {
LambdaQueryWrapper<VoiceRecordFile> queryWrapper = new LambdaQueryWrapper<VoiceRecordFile>();
queryWrapper.eq(VoiceRecordFile::getAlertId, alertId).orderByDesc(VoiceRecordFile::getRecDate);
List<VoiceRecordFile> list = voiceRecordFileServiceImpl.list(queryWrapper);
return ResponseHelper.buildResponse(list);
List<VoiceRecordFileDto> dtoList = new ArrayList<VoiceRecordFileDto>(list.size());
list.stream().forEach(voiceRecord -> {
// 创建新的对象实例
VoiceRecordFileDto target = new VoiceRecordFileDto();
// 把原对象数据拷贝到新对象
BeanUtils.copyProperties(voiceRecord, target);
if(voiceRecord.getTelStartTime() != null && voiceRecord.getTelEndTime() != null) {
target.setTelTime(DateUtils.getTimestr( voiceRecord.getTelEndTime(),voiceRecord.getTelStartTime()));
}
dtoList.add(target);
});
return ResponseHelper.buildResponse(dtoList);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java
View file @ c1003dea
......@@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -80,8 +82,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
}else{
// 警情基本信息
AlertCalled alertCalled = this.getById(id);
QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("alert_called_id", id);
LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(AlertFormValue::getAlertCalledId, id);
// 警情动态表单数据
List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
List<FormValue> formValue = new ArrayList<FormValue>();
......@@ -92,9 +94,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
}
}
AlertCalledDto alertCalledDto = BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class);
QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
elevatorQueryWrapper.eq("rescue_code", alertCalled.getDeviceId());
elevatorQueryWrapper.eq("register_code", alertCalled.getRegistrationCode());
LambdaQueryWrapper<Elevator> elevatorQueryWrapper = new LambdaQueryWrapper<>();
elevatorQueryWrapper.eq(Elevator::getRescueCode, alertCalled.getDeviceId());
elevatorQueryWrapper.eq(Elevator::getRegisterCode, alertCalled.getRegistrationCode());
Elevator elevator = iElevatorService.getOne(elevatorQueryWrapper);
if(null != elevator) {
alertCalledDto.setAddress(elevator.getAddress());
......@@ -117,8 +119,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
public AlertCalledFormDto selectAlertCalledByIdNoCache(Long id) {
// 警情基本信息
AlertCalled alertCalled = this.getById(id);
QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("alert_called_id", id);
LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(AlertFormValue::getAlertCalledId, id);
// 警情动态表单数据
List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
List<FormValue> formValue = new ArrayList<FormValue>();
......@@ -129,9 +131,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
}
}
AlertCalledDto alertCalledDto = BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class);
QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
elevatorQueryWrapper.eq("rescue_code", alertCalled.getDeviceId());
elevatorQueryWrapper.eq("register_code", alertCalled.getRegistrationCode());
LambdaQueryWrapper<Elevator> elevatorQueryWrapper = new LambdaQueryWrapper<>();
elevatorQueryWrapper.eq(Elevator::getRescueCode, alertCalled.getDeviceId());
elevatorQueryWrapper.eq(Elevator::getRegisterCode, alertCalled.getRegistrationCode());
Elevator elevator = iElevatorService.getOne(elevatorQueryWrapper);
if(null != elevator) {
alertCalledDto.setAddress(elevator.getAddress());
......@@ -155,11 +157,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
@Override
public Boolean updateAlertStageByAlertId(Long alertId, String alertStage) {
UpdateWrapper<AlertCalled> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("sequence_nbr",alertId);
LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(AlertCalled::getSequenceNbr,alertId);
AlertStageEnums stage = AlertStageEnums.getEnumByCode(alertStage);
updateWrapper.set("alert_stage_code",stage.getId());
updateWrapper.set("alert_stage",stage.getValue());
updateWrapper.set(AlertCalled::getAlertStageCode,stage.getId());
updateWrapper.set(AlertCalled::getAlertStage,stage.getValue());
return this.update(updateWrapper);
}
......@@ -232,7 +234,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
alertCalledObjsDto.setAlertCalledDto(BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class));
alertCalledObjsDto.setAlertFormValue(alertFormValuelist);
//保存处置记录-接警
repairConsultServiceImpl.saveRepairConsultByAlertIdType(alertCalled.getSequenceNbr(),"JJ",null, user); //保存接警日志
repairConsultServiceImpl.saveRepairConsultByAlertIdType(alertCalled.getSequenceNbr(),AlertStageEnums.JJ.getCode(),null, user); //保存接警日志
}
/**
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchTaskServiceImpl.java
View file @ c1003dea
package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
......@@ -17,6 +18,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.Template;
import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
import com.yeejoin.amos.boot.module.tzs.api.enums.TzsCommonParam;
import com.yeejoin.amos.boot.module.tzs.api.mapper.DispatchTaskMapper;
import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchTaskService;
import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService;
......@@ -99,9 +101,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
dispatchTaskDto.setAlertId(alertId);
dispatchTaskDto.setAlertCode(alertCalledDto.getAlarmTypeCode());
// 获取模板 拼接json
QueryWrapper<Template> templateQueryWrapper = new QueryWrapper<>();
LambdaQueryWrapper<Template> templateQueryWrapper = new LambdaQueryWrapper<>();
String alertTypeCode = AlertStageEnums.getEnumById(alertCalledDto.getAlarmTypeCode()).getCode() ;
templateQueryWrapper.eq("type_code","TASK-" + alertTypeCode);
templateQueryWrapper.eq(Template::getTypeCode,"TASK-" + alertTypeCode);
Template template = templateServiceImpl.getOne(templateQueryWrapper);
String content = template.getContent();
// 替换模板内容
......@@ -127,8 +129,8 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
typeCode = AlertStageEnums.TSZX.getId();
}
// 警情信息动态数据
QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("alert_called_id", alertId).eq("alert_type_code",typeCode);
LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(AlertFormValue::getAlertCalledId, alertId).eq(AlertFormValue::getAlertTypeCode,typeCode);
// 派遣单动态表单数据
List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
// map 存取数据
......@@ -182,13 +184,13 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
dispatchTaskDto.setDispatchTime(new Date());
DispatchTask dispatchTask = BeanDtoVoUtils.convert(dispatchTaskDto, DispatchTask.class);
dispatchTask.setPaperId(dispatchPaperDto.getDispatchPaper().getSequenceNbr());
if(dispatchPaper.getRepairOrgTaskId() != null && (dispatchTask.getOrgTypeCode().equals("levelOneUnit") || dispatchTask.getOrgTypeCode().equals("levelTwoUnit"))) {
if(dispatchPaper.getRepairOrgTaskId() != null && (dispatchTask.getOrgTypeCode().equals(DispatchPaperEnums.levelOneUnit.getCode()) || dispatchTask.getOrgTypeCode().equals(DispatchPaperEnums.levelTwoUnit.getCode()))) {
throw new BadRequest("已经派遣过其他力量调派");
}
if(dispatchPaper.getUseOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals("useUnit")) {
if(dispatchPaper.getUseOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals(DispatchPaperEnums.useUnit.getCode())) {
throw new BadRequest("已经派遣过使用单位");
}
if(dispatchPaper.getRepairOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals("repairUnit") ) {
if(dispatchPaper.getRepairOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals(DispatchPaperEnums.repairUnit.getCode()) ) {
throw new BadRequest("已经派遣过维修单位调派");
}
......@@ -201,11 +203,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
UseUnit useUnit = iUseUnitService.getById(dispatchTask.getResponseOrgId());
dispatchPaper.setUseOrgId(useUnit.getSequenceNbr());
dispatchPaper.setUseOrgTaskId(dispatchTask.getSequenceNbr());
if(AlertStageEnums.getEnumById(dispatchPaper.getAlertCode()).getCode().equals("KRJY")) {
if(AlertStageEnums.getEnumById(dispatchPaper.getAlertCode()).getCode().equals(AlertStageEnums.KRJY.getCode())) {
dynamicFormAlert.stream().forEach(alertFormValue -> {
if(alertFormValue.getFieldCode().equals("dispatch_status")) {
alertFormValue.setFieldValue("已派遣");
alertFormValue.setFieldValueCode("hasDispatched");
alertFormValue.setFieldValue(DispatchPaperEnums.hasDispatched.getValue());
alertFormValue.setFieldValueCode(DispatchPaperEnums.hasDispatched.getId());
}
});
}
......@@ -223,11 +225,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
// 修改动态字段
dynamicFormAlert.stream().forEach(alertFormValue -> {
if(alertFormValue.getFieldCode().equals("dispatch_status")) {
alertFormValue.setFieldValue("已派遣");
alertFormValue.setFieldValueCode("hasDispatched");
alertFormValue.setFieldValue(DispatchPaperEnums.hasDispatched.getValue());
alertFormValue.setFieldValueCode(DispatchPaperEnums.hasDispatched.getId());
} else if(alertFormValue.getFieldCode().equals("response_level")) {
alertFormValue.setFieldValue("一级响应");
alertFormValue.setFieldValueCode("levelOneUnit");
alertFormValue.setFieldValue(DispatchPaperEnums.levelOneUnit.getValue());
alertFormValue.setFieldValueCode(DispatchPaperEnums.levelOneUnit.getId());
} else if(alertFormValue.getFieldCode().equals("save_credit_code")) {
alertFormValue.setFieldValue(socialCreditCode);
}
......@@ -240,11 +242,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
// 修改动态字段
dynamicFormAlert.stream().forEach(alertFormValue -> {
if(alertFormValue.getFieldCode().equals("dispatch_status")) {
alertFormValue.setFieldValue("已派遣");
alertFormValue.setFieldValueCode("hasDispatched");
alertFormValue.setFieldValue(DispatchPaperEnums.hasDispatched.getValue());
alertFormValue.setFieldValueCode(DispatchPaperEnums.hasDispatched.getId());
} else if(alertFormValue.getFieldCode().equals("response_level")) {
alertFormValue.setFieldValue("二级响应");
alertFormValue.setFieldValueCode("levelTwoUnit");
alertFormValue.setFieldValue(DispatchPaperEnums.levelTwoUnit.getValue());
alertFormValue.setFieldValueCode(DispatchPaperEnums.levelTwoUnit.getId());
}
});
break;
......@@ -254,9 +256,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
// 保存动态表单数据
iAlertFormValueService.updateBatchById(dynamicFormAlert);
// 记录日志
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchTask.getAlertId(),"PQ", dispatchTask.getSequenceNbr(),sendUser);
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchTask.getAlertId(), TzsCommonParam.PQ, dispatchTask.getSequenceNbr(),sendUser);
// 派遣后如果困人救援更新派遣过程表
if("960".equals(dispatchPaper.getAlertCode())) {
if(AlertStageEnums.KRJY.getId().equals(dispatchPaper.getAlertCode())) {
RescueProcessDto rescueProcessDto = rescueProcessServiceImpl.getProcessByAlertId(dispatchTaskDto.getAlertId());
if(rescueProcessDto.getDispatchStatus() == null && rescueProcessDto.getDispatchTime() == null) {
rescueProcessDto.setDispatchStatus(true);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ElevatorServiceImpl.java
View file @ c1003dea
......@@ -102,8 +102,8 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
String equipmentClassificationCode = alertCalledDto.getEquipmentClassificationCode();
String deviceId = alertCalledDto.getDeviceId();
// 目前只有电梯类型
QueryWrapper<Elevator> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("rescue_code", deviceId);
LambdaQueryWrapper<Elevator> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Elevator::getRescueCode, deviceId);
Elevator elevator = this.getOne(queryWrapper);
if (ValidationUtil.isEmpty(elevator))
throw new BadRequest("设备未找到");
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RepairConsultServiceImpl.java
View file @ c1003dea
package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
......@@ -22,12 +21,10 @@ import com.yeejoin.amos.boot.module.tzs.api.service.IRepairConsultService;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -40,12 +37,6 @@ import java.util.Map;
*/
@Service
public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,RepairConsult,RepairConsultMapper> implements IRepairConsultService {
/**
* 分页查询
*/
public Page<RepairConsultDto> queryForRepairConsultPage(Page<RepairConsultDto> page) {
return this.queryForPage(page, null, false);
}
@Autowired
TemplateServiceImpl templateServiceImpl;
......@@ -65,13 +56,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
@Autowired
RescueProcessServiceImpl rescueProcessServiceImpl;
/**
* 列表查询 示例
*/
public List<RepairConsultDto> queryForRepairConsultList() {
return this.queryForList("" , false);
}
@Transactional
@Override
public Boolean saveRepairConsultByAlertIdType(Long alertId, String type, Long taskId,AgencyUserModel user) {
Boolean flag = false;
......@@ -83,17 +68,16 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
}
AlertCalledDto alertCalledVo = alertCallFrom.getAlertCalledDto();
// 获取模板 拼接json
QueryWrapper<Template> templateQueryWrapper = new QueryWrapper<>();
LambdaQueryWrapper<Template> templateQueryWrapper = new LambdaQueryWrapper<>();
if(TzsCommonParam.WXFK_TS.equals(type)) {
templateQueryWrapper.eq("type_code","RECORD-WXFK");
templateQueryWrapper.eq(Template::getTypeCode,"RECORD-" + TzsCommonParam.WXFK);
} else {
templateQueryWrapper.eq("type_code","RECORD-" + type);
templateQueryWrapper.eq(Template::getTypeCode,"RECORD-" + type);
}
Template template = templateServiceImpl.getOne(templateQueryWrapper);
String content = template.getContent();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String createTime = sdf.format(new Date());
if("JJ".equals(type)) {
String createTime = DateUtils.getDateNowString();
if(AlertStageEnums.JJ.getCode().equals(type)) {
String createUser = user.getUserName();
String emergency_call = alertCalledVo.getEmergencyCall();
String area = alertCalledVo.getAddress();
......@@ -121,11 +105,11 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
phone = "";
}
String taskType = "";
if("960".equals( alertCalledVo.getAlarmTypeCode())) {
if(AlertStageEnums.KRJY.getId().equals( alertCalledVo.getAlarmTypeCode())) {
taskType = "救援任务单";
} else if("961".equals( alertCalledVo.getAlarmTypeCode())) {
} else if(AlertStageEnums.GZWX.getId().equals( alertCalledVo.getAlarmTypeCode())) {
taskType = "故障维修单";
} else if("962".equals( alertCalledVo.getAlarmTypeCode())) {
} else if(AlertStageEnums.TSZX.getId().equals( alertCalledVo.getAlarmTypeCode())) {
taskType = "投诉处理单";
}
content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$unit",unit);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RescueProcessServiceImpl.java
View file @ c1003dea
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperFormDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchTaskDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.RescueProcessDto;
......@@ -95,8 +96,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
Date rescueTime = rescueProcessDto.getRescueTime();
if(arriveTime != null && dispatchTime != null) {
Long arriveTimes = arriveTime.getTime() - dispatchTime.getTime(); // 相差毫秒数
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");//这里想要只保留分秒可以写成"mm:ss"
String hms = formatter.format(arriveTimes);
String hms = DateUtils.getTimestr(arriveTime,dispatchTime);
rescueProcessDto.setIsTimeout(arriveTimes < 1800000 ? false : true);
rescueProcessDto.setArriveUseTime(hms);
}
......
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