Skip to content

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

接口测试修正

parent 97979ff2
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 46 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/AlertCalledDto.java
View file @ 72d01110
......@@ -19,8 +19,7 @@ import java.util.Date;
@ApiModel(value="AlertCalledDto", description="警情接警填报记录")
public class AlertCalledDto extends BaseDto {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "警情状态 (0 未结案 1 结案)")
private Boolean alertStatus;
......@@ -136,6 +135,9 @@ public class AlertCalledDto extends BaseDto {
@ApiModelProperty(value = "接警时间str")
private String callTimeStr;
// @ApiModelProperty(value = "接警人")
// protected String recUserName;
@ApiModelProperty(value = "冻结原因")
private String forzenResult;
@ApiModelProperty(value = "结案说明")
private String finalReason;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/RescueProcessDto.java
View file @ 72d01110
......@@ -39,6 +39,9 @@ public class RescueProcessDto extends BaseDto {
@ApiModelProperty(value = "派遣时间")
private Date dispatchTime;
@ApiModelProperty(value = "派遣时间字符串")
private String dispatchTimeStr;
@ApiModelProperty(value = "派遣人id")
private String dispatchUserId;
......@@ -51,6 +54,9 @@ public class RescueProcessDto extends BaseDto {
@ApiModelProperty(value = "到达时间")
private Date arriveTime;
@ApiModelProperty(value = "到达时间字符串")
private String arriveTimeStr;
@ApiModelProperty(value = "到达记录人id")
private String arriveUserId;
......@@ -72,6 +78,9 @@ public class RescueProcessDto extends BaseDto {
@ApiModelProperty(value = "救援完成时间")
private Date rescueTime;
@ApiModelProperty(value = "救援完成时间字符串")
private String rescueTimeStr;
@ApiModelProperty(value = "救援记录人id")
private String rescueUserId;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/AlertCalled.java
View file @ 72d01110
......@@ -180,6 +180,14 @@ public class AlertCalled extends BaseEntity {
@ApiModelProperty(value = "所属区域代码")
private String regionCode;
@TableField("forzen_result")
@ApiModelProperty(value = "冻结原因")
private String forzenResult;
@TableField("final_reason")
@ApiModelProperty(value = "结案说明")
private String finalReason;
@TableField(exist=false)
@ApiModelProperty(value = "使用单位")
private String useUnit;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IRescueProcessService.java
View file @ 72d01110
......@@ -26,4 +26,11 @@ public interface IRescueProcessService {
*/
Boolean updateByAlertId(RescueProcessDto rescueProcessDto, AgencyUserModel sendUser);
/**
* 根据警情id 更新救援过程表
* @param rescueProcessDto
* @return
*/
Boolean updateByAlertId(RescueProcessDto rescueProcessDto);
}
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 @ 72d01110
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.SystemClock;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......@@ -374,5 +375,46 @@ public class AlertCalledController extends BaseController {
}
/**
* 冻结工单-维修
* @param forzenResult
* @param alertId
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveForzen")
@ApiOperation(httpMethod = "POST", value = "冻结工单-维修", notes = "冻结工单-维修")
public ResponseModel<Boolean> forzenAlertById(@ApiParam(value = "冻结原因", required = true) @RequestParam String forzenResult, @ApiParam(value = "警情id", required = true) @RequestParam Long alertId) {
if (ValidationUtil.isEmpty(alertId)
|| 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);
return ResponseHelper.buildResponse(iAlertCalledService.update(updateWrapper));
}
/**
* 工单结案-投诉
* @param finalReason
* @param alertId
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveFinalReason")
@ApiOperation(httpMethod = "POST", value = "工单结案-投诉", notes = "工单结案-投诉")
public ResponseModel<Boolean> finishAlertById(@ApiParam(value = "结案说明", required = true) @RequestParam String finalReason, @ApiParam(value = "警情id", required = true) @RequestParam Long alertId) {
if (ValidationUtil.isEmpty(finalReason)
|| 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);
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/DispatchPaperController.java
View file @ 72d01110
package com.yeejoin.amos.boot.module.tzs.biz.controller;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchConsultFeedbackDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperFormDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchRepairFeedbackDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchSaveFeedbackDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchPaper;
import com.yeejoin.amos.boot.module.tzs.biz.service.impl.DispatchPaperServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -141,28 +137,9 @@ public class DispatchPaperController extends BaseController {
@GetMapping(value = "/alert/{id}")
@ApiOperation(httpMethod = "GET", value = "根据警情id查询", notes = "根据警情id查询")
public ResponseModel<Object> selectById(@PathVariable Long id) {
return ResponseHelper.buildResponse(dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(id));
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新派遣单", notes = "根据sequenceNbr更新派遣单")
public ResponseModel<DispatchPaperDto> updateBySequenceNbrDispatchPaper(@RequestBody DispatchPaperDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(dispatchPaperServiceImpl.updateWithModel(model));
}
}
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 @ 72d01110
......@@ -69,20 +69,6 @@ public class DispatchTaskController extends BaseController {
return ResponseHelper.buildResponse(flag);
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个派遣任务", notes = "根据sequenceNbr查询单个派遣任务")
public ResponseModel<DispatchTaskDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(dispatchTaskServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 根据警情id 查找力量调派信息
*
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchPaperServiceImpl.java
View file @ 72d01110
......@@ -302,6 +302,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
return dispatchSaveFeedbackDto;
}
@Transactional
@Override
public Boolean saveDispatchSaveFeedback(DispatchSaveFeedbackDto dispatchSaveFeedbackDto, AgencyUserModel user) {
Boolean flag = false;
......@@ -491,6 +492,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
return dispatchRepairFeedbackDto;
}
@Transactional
@Override
public Boolean saveDispatchRepairFeedback(DispatchRepairFeedbackDto dispatchRepairFeedbackDto, AgencyUserModel user) {
Boolean flag = false;
......@@ -698,6 +700,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
return dispatchConsultFeedbackDto;
}
@Transactional
@Override
public Boolean saveDispatchConsultFeedback(DispatchConsultFeedbackDto dispatchConsultFeedbackDto, AgencyUserModel user) {
Boolean flag = false;
......
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 @ 72d01110
......@@ -261,7 +261,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
if(rescueProcessDto.getDispatchStatus() == null && rescueProcessDto.getDispatchTime() == null) {
rescueProcessDto.setDispatchStatus(true);
rescueProcessDto.setDispatchTime(dispatchTask.getDispatchTime());
rescueProcessServiceImpl.updateByAlertId(rescueProcessDto,null);
rescueProcessDto.setDispatchUserName(dispatchTask.getRecUserName());
rescueProcessDto.setDispatchUserId(dispatchTask.getRecUserId());
rescueProcessServiceImpl.updateByAlertId(rescueProcessDto);
}
}
......
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 @ 72d01110
......@@ -96,7 +96,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
if(createUser == null)
throw new BadRequest("坐席人缺失");
if(emergency_call == null)
throw new BadRequest("求援人缺失");
throw new BadRequest("求援人电话缺失");
if(area == null)
throw new BadRequest("区域缺失");
if(alertType == null)
......@@ -107,6 +107,8 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
String createUser = user.getUserName();
DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
String unit = dispatchTask.getResponseOrgName();
if(unit == null)
throw new BadRequest("派遣单位缺失");
String person = dispatchTask.getResponseUserName();
String phone = dispatchTask.getResponseUserTel();
if("119".equals(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 @ 72d01110
......@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.rdbms.service.BaseService;
......@@ -56,6 +57,9 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
@Autowired
RepairConsultServiceImpl repairConsultServiceImpl;
@Autowired
AlertCalledServiceImpl iAlertCalledService;
/**
* 分页查询
*/
......@@ -88,6 +92,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
//判断是否存在到达时间
Date dispatchTime = rescueProcessDto.getDispatchTime();
Date arriveTime = rescueProcessDto.getArriveTime();
Date rescueTime = rescueProcessDto.getRescueTime();
if(arriveTime != null && dispatchTime != null) {
Long arriveTimes = arriveTime.getTime() - dispatchTime.getTime(); // 相差毫秒数
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");//这里想要只保留分秒可以写成"mm:ss"
......@@ -96,9 +101,14 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
rescueProcessDto.setIsTimeout(arriveTimes < 1800000 ? false : true);
rescueProcessDto.setArriveUseTime(hms);
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
if(dispatchTime != null) rescueProcessDto.setDispatchTimeStr(sdf.format(dispatchTime));
if(arriveTime != null) rescueProcessDto.setArriveTimeStr(sdf.format(arriveTime));
if(rescueTime != null) rescueProcessDto.setRescueTimeStr(sdf.format(rescueTime));
return rescueProcessDto;
}
@Transactional
@Override
public Boolean updateByAlertId(RescueProcessDto rescueProcessDto, AgencyUserModel sendUser) {
QueryWrapper<RescueProcess> templateQueryWrapper = new QueryWrapper<>();
......@@ -154,15 +164,37 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
// 记录日志
repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchTask.getAlertId(),"PQ", dispatchTask.getSequenceNbr(),sendUser);
}
} else {
rescueProcessDto.setDispatchTime(null);
rescueProcessDto.setDispatchStatus(null);
rescueProcessDto.setDispatchUserId(null);
rescueProcessDto.setDispatchUserName(null);
}
boolean arriveByUser = rescueProcessDto.getArriveByUser();
boolean saveByUser = rescueProcessDto.getSaveByUser();
if(!arriveByUser) { // 非手动反馈不更新
rescueProcessDto.setArriveTime(null);
rescueProcessDto.setArriveFeedbackCode(null);
rescueProcessDto.setArriveFeedbackType(null);
rescueProcessDto.setArriveStatus(null);
rescueProcessDto.setArriveUserId(null);
rescueProcessDto.setArriveUserName(null);
}
if(!saveByUser) {
rescueProcessDto.setRescueTime(null);
rescueProcessDto.setRescueFeedbackCode(null);
rescueProcessDto.setRescueFeedbackType(null);
rescueProcessDto.setRescueStatus(null);
rescueProcessDto.setRescueUserId(null);
rescueProcessDto.setRescueUserName(null);
}
rescueProcessDto.setSequenceNbr(rescueProcess.getSequenceNbr());
rescueProcessDto.setRecDate(rescueProcess.getRecDate());
rescueProcessDto.setRecUserId(rescueProcess.getRecUserId());
rescueProcessDto.setRecUserName(rescueProcess.getRecUserName());
rescueProcess = BeanDtoVoUtils.convert(rescueProcessDto, RescueProcess.class);
Boolean flag =this.updateById(rescueProcess);
if(rescueProcessDto.getArriveByUser()) { // 手动到达
if(arriveByUser) { // 手动到达
DispatchPaperFormDto dispatchPaperDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(rescueProcessDto.getAlertId());
if (dispatchPaperDto == null || dispatchPaperDto.getDispatchPaper() == null) {
throw new BadRequest("派遣单信息未找到");
......@@ -176,8 +208,10 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
throw new BadRequest("派遣任务单信息未找到");
}
repairConsultServiceImpl.saveRepairConsultByAlertIdType( rescueProcessDto.getAlertId(),"DD",taskId,sendUser); //保存接警日志
// 修改警情到抵达
iAlertCalledService.updateAlertStageByAlertId(rescueProcessDto.getAlertId(),"DD");
}
if(rescueProcessDto.getSaveByUser()) { // 手动救援
if(saveByUser) { // 手动救援
DispatchPaperFormDto dispatchPaperDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(rescueProcessDto.getAlertId());
if (dispatchPaperDto == null || dispatchPaperDto.getDispatchPaper() == null) {
throw new BadRequest("派遣单信息未找到");
......@@ -191,8 +225,22 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
throw new BadRequest("派遣任务单信息未找到");
}
repairConsultServiceImpl.saveRepairConsultByAlertIdType(rescueProcessDto.getAlertId(),"JC",taskId,sendUser); //保存接警日志
// 修改警情到抵达
iAlertCalledService.updateAlertStageByAlertId(rescueProcessDto.getAlertId(),"JC");
}
return flag;
}
@Override
public Boolean updateByAlertId(RescueProcessDto rescueProcessDto) {
QueryWrapper<RescueProcess> templateQueryWrapper = new QueryWrapper<>();
templateQueryWrapper.eq("alert_id", rescueProcessDto.getAlertId());
RescueProcess rescueProcess = this.getOne(templateQueryWrapper);
if (rescueProcess == null)
throw new BadRequest("救援过程信息未找到");
rescueProcess = BeanDtoVoUtils.convert(rescueProcessDto, RescueProcess.class);
Boolean flag =this.updateById(rescueProcess);
return flag;
}
}
\ No newline at end of file
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