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
0bade3d2
Commit
0bade3d2
authored
Nov 02, 2021
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
daf27b76
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
5 deletions
+16
-5
IDutyCarService.java
.../amos/boot/module/common/api/service/IDutyCarService.java
+1
-1
CommandController.java
...boot/module/command/biz/controller/CommandController.java
+13
-2
DutyCarServiceImpl.java
...ot/module/common/biz/service/impl/DutyCarServiceImpl.java
+2
-2
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDutyCarService.java
View file @
0bade3d2
...
...
@@ -29,5 +29,5 @@ public interface IDutyCarService extends IDutyCommonService {
* @return
*/
JSONObject
isFireCarDriver
();
int
getDutyCarCount
(
Long
carId
);
}
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 @
0bade3d2
...
...
@@ -108,7 +108,8 @@ public class CommandController extends BaseController {
IDataDictionaryService
dataDictionaryService
;
@Autowired
IFireChemicalService
fireChemicalService
;
@Autowired
IDutyCarService
dutyCarService
;
@Autowired
IFireExpertsService
fireExpertsService
;
...
...
@@ -1065,6 +1066,9 @@ public class CommandController extends BaseController {
if
(
e
.
get
(
"carState"
).
equals
(
"在位"
)){
e
.
put
(
"carState"
,
FireCarStatusEnum
.
执勤
.
getName
());
}
e
.
put
(
"longitude"
,
116.423762
);
e
.
put
(
"latitude"
,
39.511552
);
String
sequenceNbr
=
e
.
get
(
"sequenceNbr"
).
toString
();
//同步力量调派车辆任务状态
alertFormValue
.
stream
().
forEach
(
v
->{
...
...
@@ -1083,7 +1087,14 @@ public class CommandController extends BaseController {
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"车辆资源详情"
,
notes
=
"车辆资源详情"
)
public
ResponseModel
<
Map
<
String
,
Object
>>
getCarDetailById
(
Long
id
)
{
ResponseModel
<
Map
<
String
,
Object
>>
date
=
equipFeignClient
.
getCarDetailById
(
id
);
return
ResponseHelper
.
buildResponse
(
date
!=
null
?
date
.
getResult
():
null
);
Map
<
String
,
Object
>
map
=
date
!=
null
?
date
.
getResult
():
null
;
if
(
map
!=
null
){
int
num
=
0
;
num
=
iDutyCarService
.
getDutyCarCount
(
id
);
map
.
put
(
"personNum"
,
num
);
}
return
ResponseHelper
.
buildResponse
(
map
);
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCarServiceImpl.java
View file @
0bade3d2
...
...
@@ -218,8 +218,8 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
}
return
detailList
;
}
public
Object
getDutyCarCount
(
Stri
ng
carId
)
{
@Override
public
int
getDutyCarCount
(
Lo
ng
carId
)
{
List
<
Map
<
String
,
Object
>>
equipmentList
=
dutyPersonShiftMapper
.
getEquipmentForSpecifyDate
(
DateUtils
.
getDateNowShortStr
(),
this
.
getGroupCode
(),
"carId"
,
"carName"
,
"teamName"
,
"result.carId"
);
int
count
=
0
;
...
...
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