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
e914a731
Commit
e914a731
authored
Jan 19, 2021
by
吴俊凯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码冲突提交
parent
efbfde61
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
19 deletions
+2
-19
ContingencyPlanServiceImpl.java
...fas/business/service/impl/ContingencyPlanServiceImpl.java
+1
-14
IContingencyPlanService.java
...s/fas/business/service/intfc/IContingencyPlanService.java
+1
-5
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java
View file @
e914a731
...
@@ -21,6 +21,7 @@ import org.apache.logging.log4j.Logger;
...
@@ -21,6 +21,7 @@ import org.apache.logging.log4j.Logger;
import
org.eclipse.paho.client.mqttv3.MqttException
;
import
org.eclipse.paho.client.mqttv3.MqttException
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.typroject.tyboot.component.emq.EmqKeeper
;
import
org.typroject.tyboot.component.emq.EmqKeeper
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
import
org.typroject.tyboot.core.foundation.utils.ValidationUtil
;
...
@@ -45,12 +46,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
...
@@ -45,12 +46,8 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
@Autowired
@Autowired
private
IPlanOperationRecordDao
planOperationRecordDao
;
private
IPlanOperationRecordDao
planOperationRecordDao
;
@Autowired
@Autowired
<<<<<<<
HEAD
private
IEquipmentFireEquipmentDao
equipmentFireEquipmentDao
;
=======
private
IEquipmentFireEquipmentDao
equipmentFireEquipmentDao
;
private
IEquipmentFireEquipmentDao
equipmentFireEquipmentDao
;
@Qualifier
(
"iEquipmentDao"
)
@Qualifier
(
"iEquipmentDao"
)
>>>>>>>
dev_upgrade
-
1225
@Autowired
@Autowired
private
IEquipmentDao
equipmentDao
;
private
IEquipmentDao
equipmentDao
;
...
@@ -148,7 +145,6 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
...
@@ -148,7 +145,6 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
}
}
@Override
@Override
<<<<<<<
HEAD
public
Page
recordListByPage
(
int
current
,
int
pageSize
,
String
planName
)
{
public
Page
recordListByPage
(
int
current
,
int
pageSize
,
String
planName
)
{
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"planName"
,
planName
);
params
.
put
(
"planName"
,
planName
);
...
@@ -156,15 +152,6 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
...
@@ -156,15 +152,6 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
params
.
put
(
"pageSize"
,
pageSize
);
params
.
put
(
"pageSize"
,
pageSize
);
List
<
HashMap
<
String
,
Object
>>
result
=
planOperationRecordMapper
.
PlanOperationRecordListByPage
(
params
);
List
<
HashMap
<
String
,
Object
>>
result
=
planOperationRecordMapper
.
PlanOperationRecordListByPage
(
params
);
Integer
count
=
planOperationRecordMapper
.
PlanOperationRecordListByCount
(
params
);
Integer
count
=
planOperationRecordMapper
.
PlanOperationRecordListByCount
(
params
);
=======
public
Page
recordListByPage
(
String
planName
,
int
pageNumber
,
int
pageSize
)
{
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"planName"
,
planName
);
params
.
put
(
"pageNumber"
,
pageNumber
);
params
.
put
(
"pageSize"
,
pageSize
);
List
<
HashMap
<
String
,
Object
>>
result
=
planOperationRecordMapper
.
PlanOperationRecordListByPage
(
params
);
Integer
count
=
planOperationRecordMapper
.
PlanOperationRecordListByCount
(
params
);
>>>>>>>
dev_upgrade
-
1225
Page
page
=
new
Page
();
Page
page
=
new
Page
();
page
.
setRecords
(
result
);
page
.
setRecords
(
result
);
page
.
setTotal
(
count
);
page
.
setTotal
(
count
);
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyPlanService.java
View file @
e914a731
...
@@ -2,13 +2,9 @@ package com.yeejoin.amos.fas.business.service.intfc;
...
@@ -2,13 +2,9 @@ package com.yeejoin.amos.fas.business.service.intfc;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.fas.business.vo.ContingencyPlanParamVo
;
import
com.yeejoin.amos.fas.business.vo.ContingencyPlanParamVo
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.fas.business.vo.PlanDetailVo
;
import
com.yeejoin.amos.fas.business.vo.PlanDetailVo
;
import
com.yeejoin.amos.fas.dao.entity.PlanDetail
;
import
com.yeejoin.amos.fas.dao.entity.PlanDetail
;
import
com.yeejoin.amos.fas.exception.YeeException
;
import
com.yeejoin.amos.fas.exception.YeeException
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -30,7 +26,7 @@ public interface IContingencyPlanService {
...
@@ -30,7 +26,7 @@ public interface IContingencyPlanService {
ContingencyPlanParamVo
equipmentScene
(
Long
equipmentId
);
ContingencyPlanParamVo
equipmentScene
(
Long
equipmentId
);
Page
recordListByPage
(
String
planName
,
int
pageNumber
,
int
pageSiz
e
);
Page
recordListByPage
(
int
current
,
int
pageSize
,
String
planNam
e
);
/**
/**
* 创建
* 创建
* @param planDetail
* @param planDetail
...
...
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