Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
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
station
YeeAmosFireAutoSysRoot
Commits
98b0b20c
Commit
98b0b20c
authored
Jan 20, 2021
by
田涛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数字预案分页查询接口返回绑定对象信息
parent
80c254e6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
0 deletions
+48
-0
IPlanDocDao.java
...yeejoin/amos/fas/business/dao/repository/IPlanDocDao.java
+2
-0
IPlanEquipmentDao.java
...n/amos/fas/business/dao/repository/IPlanEquipmentDao.java
+3
-0
IPlanRuleDao.java
...eejoin/amos/fas/business/dao/repository/IPlanRuleDao.java
+3
-0
ContingencyPlanServiceImpl.java
...fas/business/service/impl/ContingencyPlanServiceImpl.java
+40
-0
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanDocDao.java
View file @
98b0b20c
...
...
@@ -18,5 +18,7 @@ public interface IPlanDocDao extends BaseDao<PlanDoc, Long> {
List
<
PlanDoc
>
getPlanDocsByPlanId
(
Long
planId
);
List
<
PlanDoc
>
findAllByPlanIdIn
(
List
<
Long
>
planId
);
List
<
PlanDoc
>
findAllByIsDelete
(
Boolean
isDelete
);
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanEquipmentDao.java
View file @
98b0b20c
package
com
.
yeejoin
.
amos
.
fas
.
business
.
dao
.
repository
;
import
com.yeejoin.amos.fas.dao.entity.PlanDoc
;
import
com.yeejoin.amos.fas.dao.entity.PlanEquipment
;
import
org.springframework.data.jpa.repository.Query
;
import
org.springframework.stereotype.Repository
;
...
...
@@ -22,4 +23,6 @@ public interface IPlanEquipmentDao extends BaseDao<PlanEquipment, Long> {
List
<
PlanEquipment
>
getPlanDocsByPlanId
(
Long
planId
);
List
<
PlanEquipment
>
findAllByIsDelete
(
Boolean
isDelete
);
List
<
PlanEquipment
>
findAllByPlanIdIn
(
List
<
Long
>
planId
);
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IPlanRuleDao.java
View file @
98b0b20c
package
com
.
yeejoin
.
amos
.
fas
.
business
.
dao
.
repository
;
import
com.yeejoin.amos.fas.dao.entity.PlanDoc
;
import
com.yeejoin.amos.fas.dao.entity.PlanRule
;
import
org.springframework.stereotype.Repository
;
...
...
@@ -20,4 +21,6 @@ public interface IPlanRuleDao extends BaseDao<PlanRule, Long>{
List
<
PlanRule
>
getPlanDocsByPlanId
(
Long
planId
);
List
<
PlanRule
>
findAllByIsDelete
(
Boolean
isDelete
);
List
<
PlanRule
>
findAllByPlanIdIn
(
List
<
Long
>
planIds
);
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java
View file @
98b0b20c
...
...
@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.stereotype.Service
;
import
org.typroject.tyboot.component.emq.EmqKeeper
;
import
org.typroject.tyboot.core.foundation.utils.Bean
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
java.util.*
;
...
...
@@ -344,11 +345,50 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
start
=
0
;
}
List
<
PlanDetailVo
>
planList
=
planDetailMapper
.
filterList
(
planName
,
classifyIdList
,
planRange
,
editOrgName
,
implementationTimeLeft
,
implementationTimeRight
,
(
int
)
start
,
(
int
)
page
.
getSize
());
// 查询并插入绑定数据的信息
fillBindingInfo
(
planList
);
page
.
setRecords
(
planList
);
}
return
page
;
}
private
void
fillBindingInfo
(
List
<
PlanDetailVo
>
planList
)
{
if
(
ValidationUtil
.
isEmpty
(
planList
))
{
return
;
}
List
<
Long
>
idList
=
new
ArrayList
<>();
planList
.
forEach
(
e
->
idList
.
add
(
e
.
getId
()));
Map
<
Object
,
List
<
PlanDoc
>>
docMapList
=
null
;
Map
<
Object
,
List
<
PlanRule
>>
ruleMapList
=
null
;
Map
<
Object
,
List
<
PlanEquipment
>>
equipMapList
=
null
;
List
<
PlanDoc
>
docs
=
planDocDao
.
findAllByPlanIdIn
(
idList
);
if
(!
docs
.
isEmpty
())
{
docMapList
=
Bean
.
list2MapList
(
docs
,
"planId"
);
}
List
<
PlanRule
>
rules
=
planRuleDao
.
findAllByPlanIdIn
(
idList
);
if
(!
rules
.
isEmpty
())
{
ruleMapList
=
Bean
.
list2MapList
(
rules
,
"planId"
);
}
List
<
PlanEquipment
>
equips
=
planEquipmentDao
.
findAllByPlanIdIn
(
idList
);
if
(!
equips
.
isEmpty
())
{
equipMapList
=
Bean
.
list2MapList
(
equips
,
"planId"
);
}
Map
<
Object
,
List
<
PlanDoc
>>
finalDocMapList
=
docMapList
;
Map
<
Object
,
List
<
PlanRule
>>
finalRuleMapList
=
ruleMapList
;
Map
<
Object
,
List
<
PlanEquipment
>>
finalEquipMapList
=
equipMapList
;
planList
.
forEach
(
plan
->
{
if
(
finalDocMapList
!=
null
&&
finalDocMapList
.
get
(
plan
.
getId
())
!=
null
)
{
plan
.
setPlanDoc
(
finalDocMapList
.
get
(
plan
.
getId
()).
get
(
0
));
}
if
(
finalRuleMapList
!=
null
&&
finalRuleMapList
.
get
(
plan
.
getId
())
!=
null
)
{
plan
.
setPlanRule
(
finalRuleMapList
.
get
(
plan
.
getId
()).
get
(
0
));
}
if
(
finalEquipMapList
!=
null
&&
finalEquipMapList
.
get
(
plan
.
getId
())
!=
null
)
{
plan
.
setPlanEquipment
(
finalEquipMapList
.
get
(
plan
.
getId
()));
}
});
}
@Override
public
Map
<
Long
,
Long
>
getPlanUsedDocs
()
{
Map
<
Long
,
Long
>
resMap
=
new
HashMap
<>(
64
);
...
...
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