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
effa07d5
Commit
effa07d5
authored
Nov 14, 2022
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:修改直流中心告警列表分页
parent
ec3daec6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
14 deletions
+1
-14
EquipmentAlarmController.java
...join/equipmanage/controller/EquipmentAlarmController.java
+1
-11
EquipmentSpecificAlarmMapper.xml
...rc/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
+0
-3
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentAlarmController.java
View file @
effa07d5
...
@@ -178,7 +178,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
...
@@ -178,7 +178,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
}
}
/**
/**
* 直流中心告警列表分页
* 直流中心告警列表分页
,用于直流中心大数据查询分页,不建议再扩展联表查询
*
*
* @return
* @return
*/
*/
...
@@ -186,7 +186,6 @@ public class EquipmentAlarmController extends AbstractBaseController {
...
@@ -186,7 +186,6 @@ public class EquipmentAlarmController extends AbstractBaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"列表分页查询"
,
produces
=
"application/json;charset=UTF-8"
,
notes
=
"列表分页查询"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"列表分页查询"
,
produces
=
"application/json;charset=UTF-8"
,
notes
=
"列表分页查询"
)
public
ResponseModel
listPage
(
@RequestParam
(
value
=
"alarmType"
,
required
=
false
)
String
alarmType
,
public
ResponseModel
listPage
(
@RequestParam
(
value
=
"alarmType"
,
required
=
false
)
String
alarmType
,
@RequestParam
(
value
=
"isNeedBiz"
,
required
=
false
)
Boolean
isNeedBiz
,
CommonPageable
commonPageable
)
{
CommonPageable
commonPageable
)
{
if
(
commonPageable
.
getPageNumber
()
==
0
)
{
if
(
commonPageable
.
getPageNumber
()
==
0
)
{
commonPageable
.
setPageNumber
(
1
);
commonPageable
.
setPageNumber
(
1
);
...
@@ -196,15 +195,6 @@ public class EquipmentAlarmController extends AbstractBaseController {
...
@@ -196,15 +195,6 @@ public class EquipmentAlarmController extends AbstractBaseController {
request
.
setName
(
"alarmType"
);
request
.
setName
(
"alarmType"
);
request
.
setValue
(
StringUtil
.
isNotEmpty
(
alarmType
)
?
StringUtils
.
trimToNull
(
alarmType
)
:
null
);
request
.
setValue
(
StringUtil
.
isNotEmpty
(
alarmType
)
?
StringUtils
.
trimToNull
(
alarmType
)
:
null
);
queryRequests
.
add
(
request
);
queryRequests
.
add
(
request
);
if
(
isNeedBiz
!=
null
&&
isNeedBiz
)
{
ReginParams
reginParams
=
getSelectedOrgInfo
();
if
(!
ValidationUtil
.
isEmpty
(
reginParams
.
getPersonIdentity
()))
{
CommonRequest
request1
=
new
CommonRequest
();
request1
.
setName
(
"bizOrgCode"
);
request1
.
setValue
(
StringUtil
.
isNotEmpty
(
reginParams
.
getPersonIdentity
().
getBizOrgCode
())
?
reginParams
.
getPersonIdentity
().
getBizOrgCode
()
:
null
);
queryRequests
.
add
(
request1
);
}
}
CommonPageInfoParam
param
=
CommonPageParamUtil
.
fillCommonPageInfoParam
(
queryRequests
,
commonPageable
);
CommonPageInfoParam
param
=
CommonPageParamUtil
.
fillCommonPageInfoParam
(
queryRequests
,
commonPageable
);
Page
<
Map
<
String
,
Object
>>
list
=
iEquipmentSpecificAlarmService
.
zlzxListPage
(
param
);
Page
<
Map
<
String
,
Object
>>
list
=
iEquipmentSpecificAlarmService
.
zlzxListPage
(
param
);
return
CommonResponseUtil
.
success
(
list
);
return
CommonResponseUtil
.
success
(
list
);
...
...
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @
effa07d5
...
@@ -291,9 +291,6 @@
...
@@ -291,9 +291,6 @@
<if
test=
"param.alarmType == 'BREAKDOWN'"
>
AND wlesal.type = #{param.alarmType}
</if>
<if
test=
"param.alarmType == 'BREAKDOWN'"
>
AND wlesal.type = #{param.alarmType}
</if>
<if
test=
"param.alarmType == 'FIREALARM'"
>
AND wlesal.type = #{param.alarmType}
</if>
<if
test=
"param.alarmType == 'FIREALARM'"
>
AND wlesal.type = #{param.alarmType}
</if>
<if
test=
"param.isFireAlarm == 'false'"
>
AND wlesal.type != 'FIREALARM'
</if>
<if
test=
"param.isFireAlarm == 'false'"
>
AND wlesal.type != 'FIREALARM'
</if>
<if
test=
"param.bizOrgCode != null and param.bizOrgCode != ''"
>
AND
wles.biz_org_code like concat (#{param.bizOrgCode},'%')
</if>
</where>
</where>
ORDER BY wlesal.create_date DESC
ORDER BY wlesal.create_date DESC
</select>
</select>
...
...
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