Commit b3a83784 authored by tangwei's avatar tangwei

修改bug

parent 31aadb6f
...@@ -119,6 +119,17 @@ public class AlertCalled extends BaseEntity { ...@@ -119,6 +119,17 @@ public class AlertCalled extends BaseEntity {
private String callTimeEnd ; private String callTimeEnd ;
/*bug 2408 接警记录,按警情状态和接警时间筛选功能失效 陈召 2021-09-22 结束*/ /*bug 2408 接警记录,按警情状态和接警时间筛选功能失效 陈召 2021-09-22 结束*/
@ApiModelProperty(value = "经度")
@TableField(exist=false)
private String longitude;
@ApiModelProperty(value = "纬度")
@TableField(exist=false)
private String latitude;
@TableField(exist=false) @TableField(exist=false)
@ApiModelProperty(value = "是否处警") @ApiModelProperty(value = "是否处警")
private Boolean isFatherAlert = false; private Boolean isFatherAlert = false;
......
...@@ -166,6 +166,8 @@ public class CommandController extends BaseController { ...@@ -166,6 +166,8 @@ public class CommandController extends BaseController {
return ResponseHelper.buildResponse(list); return ResponseHelper.buildResponse(list);
} }
/** /**
* 分页警情列表 * 分页警情列表
* *
...@@ -1445,6 +1447,8 @@ public class CommandController extends BaseController { ...@@ -1445,6 +1447,8 @@ public class CommandController extends BaseController {
//获取正在进行的灾情null //获取正在进行的灾情null
if (userCar != null) { if (userCar != null) {
AlertCalled alertCalled = powerTransferCompanyResourcesService.getByPowerTransferCompanyResourId(userCar.getCarId()); AlertCalled alertCalled = powerTransferCompanyResourcesService.getByPowerTransferCompanyResourId(userCar.getCarId());
alertCalled.setLatitude(alertCalled.getCoordinateX()!=null?alertCalled.getCoordinateX().toString():null);
alertCalled.setLongitude(alertCalled.getCoordinateY()!=null?alertCalled.getCoordinateY().toString():null);
return ResponseHelper.buildResponse(alertCalled); return ResponseHelper.buildResponse(alertCalled);
} }
return ResponseHelper.buildResponse(null); return ResponseHelper.buildResponse(null);
......
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