Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
b3a83784
Commit
b3a83784
authored
Mar 09, 2022
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
31aadb6f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletion
+16
-1
AlertCalled.java
.../yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java
+12
-1
CommandController.java
...boot/module/command/biz/controller/CommandController.java
+4
-0
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java
View file @
b3a83784
...
...
@@ -118,7 +118,18 @@ public class AlertCalled extends BaseEntity {
@TableField
(
exist
=
false
)
private
String
callTimeEnd
;
/*bug 2408 接警记录,按警情状态和接警时间筛选功能失效 陈召 2021-09-22 结束*/
@ApiModelProperty
(
value
=
"经度"
)
@TableField
(
exist
=
false
)
private
String
longitude
;
@ApiModelProperty
(
value
=
"纬度"
)
@TableField
(
exist
=
false
)
private
String
latitude
;
@TableField
(
exist
=
false
)
@ApiModelProperty
(
value
=
"是否处警"
)
private
Boolean
isFatherAlert
=
false
;
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @
b3a83784
...
...
@@ -166,6 +166,8 @@ public class CommandController extends BaseController {
return
ResponseHelper
.
buildResponse
(
list
);
}
/**
* 分页警情列表
*
...
...
@@ -1445,6 +1447,8 @@ public class CommandController extends BaseController {
//获取正在进行的灾情null
if
(
userCar
!=
null
)
{
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
(
null
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment