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
d8e81dd9
Commit
d8e81dd9
authored
Dec 10, 2021
by
李腾威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3933 bug
parent
c8d3a4c6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
1 deletion
+13
-1
PowerTransferServiceImpl.java
...module/jcs/biz/service/impl/PowerTransferServiceImpl.java
+13
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
View file @
d8e81dd9
...
@@ -4,6 +4,7 @@ import java.util.*;
...
@@ -4,6 +4,7 @@ import java.util.*;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.*
;
import
com.yeejoin.amos.boot.module.jcs.api.entity.*
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
...
@@ -110,6 +111,9 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
...
@@ -110,6 +111,9 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
@Autowired
@Autowired
ControllerServiceImpl
controllerServiceImpl
;
ControllerServiceImpl
controllerServiceImpl
;
@Autowired
private
AircraftServiceImpl
aircraftServiceImpl
;
@Override
@Override
public
PowerTransferSimpleDto
getPowerTransferList
(
Long
alertCalledId
)
{
public
PowerTransferSimpleDto
getPowerTransferList
(
Long
alertCalledId
)
{
List
<
PowerTransferCompanyResourcesDto
>
powerTransferList
=
this
.
baseMapper
.
getPowerTransferList
(
alertCalledId
);
List
<
PowerTransferCompanyResourcesDto
>
powerTransferList
=
this
.
baseMapper
.
getPowerTransferList
(
alertCalledId
);
...
@@ -406,12 +410,20 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
...
@@ -406,12 +410,20 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
if
(
null
!=
alertCalled
)
{
if
(
null
!=
alertCalled
)
{
replaceContent
=
RuleAlertCalledService
.
init
(
alertCalledRo
,
alertCalledObjsDto
);
replaceContent
=
RuleAlertCalledService
.
init
(
alertCalledRo
,
alertCalledObjsDto
);
}
}
List
<
AlertFormValue
>
alertFormValue
=
alertCalledObjsDto
.
getAlertFormValue
();
String
responseLevel
=
""
;
List
<
AlertFormValue
>
list1
=
alertFormValue
.
stream
().
filter
(
formValue
->
formValue
.
getFieldCode
().
equals
(
"responseLevel"
)
).
collect
(
Collectors
.
toList
());;
if
(
list1
.
size
()
>
0
)
{
responseLevel
=
list1
.
get
(
0
).
getFieldValue
();
}
definitions
.
put
(
"rescueGrid"
,
alertCalled
.
getAddress
());
definitions
.
put
(
"rescueGrid"
,
alertCalled
.
getAddress
());
definitions
.
put
(
"type"
,
alertCalled
.
getAlertType
());
definitions
.
put
(
"type"
,
alertCalled
.
getAlertType
());
definitions
.
put
(
"contactUser"
,
alertCalled
.
getContactUser
());
definitions
.
put
(
"contactUser"
,
alertCalled
.
getContactUser
());
definitions
.
put
(
"contactPhone"
,
alertCalled
.
getContactPhone
());
definitions
.
put
(
"contactPhone"
,
alertCalled
.
getContactPhone
());
definitions
.
put
(
"type"
,
alertCalled
.
getAlertType
());
definitions
.
put
(
"replaceContent"
,
replaceContent
);
definitions
.
put
(
"replaceContent"
,
replaceContent
);
definitions
.
put
(
"responseLevel"
,
responseLevel
);
definitions
.
put
(
"callTime"
,
definitions
.
put
(
"callTime"
,
DateUtils
.
convertDateToString
(
alertCalled
.
getCallTime
(),
DateUtils
.
DATE_TIME_PATTERN
));
DateUtils
.
convertDateToString
(
alertCalled
.
getCallTime
(),
DateUtils
.
DATE_TIME_PATTERN
));
for
(
PowerTransferCompanyDto
powerTransferCompanyDto
:
powerTransferCompanyDotList
)
{
for
(
PowerTransferCompanyDto
powerTransferCompanyDto
:
powerTransferCompanyDotList
)
{
...
...
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