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
82150338
Commit
82150338
authored
Aug 02, 2022
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:数字换流站列表分页查询,新增参数
parent
24fce64e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
3 deletions
+26
-3
CommonPageInfoParam.java
...yeejoin/equipmanage/common/utils/CommonPageInfoParam.java
+13
-0
CommonPageParamUtil.java
...yeejoin/equipmanage/common/utils/CommonPageParamUtil.java
+2
-0
ConfigureController.java
...m/yeejoin/equipmanage/controller/ConfigureController.java
+1
-2
EquipmentAlarmController.java
...join/equipmanage/controller/EquipmentAlarmController.java
+5
-0
EquipmentSpecificAlarmMapper.xml
...rc/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
+5
-1
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageInfoParam.java
View file @
82150338
...
...
@@ -68,6 +68,11 @@ public class CommonPageInfoParam extends CommonPageable {
private
String
equipCode
;
/**
* 装备类型编码
*/
private
String
equipDetailCode
;
/**
* 警情是否确认
*/
private
String
confirmType
;
...
...
@@ -189,6 +194,14 @@ public class CommonPageInfoParam extends CommonPageable {
return
equipCode
;
}
public
String
getEquipDetailCode
()
{
return
equipDetailCode
;
}
public
void
setEquipDetailCode
(
String
equipDetailCode
)
{
this
.
equipDetailCode
=
equipDetailCode
;
}
public
String
getAlarmType
()
{
return
alarmType
;
}
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageParamUtil.java
View file @
82150338
...
...
@@ -37,6 +37,8 @@ public class CommonPageParamUtil {
param
.
setWarehouseStructureName
(
toString
(
queryRequests
.
get
(
i
).
getValue
()));
}
else
if
(
"equipCode"
.
equals
(
name
)){
param
.
setEquipCode
(
toString
(
queryRequests
.
get
(
i
).
getValue
()));
}
else
if
(
"equipDetailCode"
.
equals
(
name
)){
param
.
setEquipDetailCode
(
toString
(
queryRequests
.
get
(
i
).
getValue
()));
}
else
if
(
"confirmType"
.
equals
(
name
)){
param
.
setConfirmType
(
toString
(
queryRequests
.
get
(
i
).
getValue
()));
}
else
if
(
"alarmType"
.
equals
(
name
)){
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java
View file @
82150338
...
...
@@ -63,8 +63,7 @@ public class ConfigureController extends AbstractBaseController {
queryRequests
.
add
(
request13
);
}
CommonPageInfoParam
param
=
CommonPageParamUtil
.
fillCommonPageInfoParam
(
queryRequests
,
commonPageable
);
Page
<
Map
<
String
,
Object
>>
list
=
equipmentSpecificAlarmService
.
pageQuery
(
param
);
return
CommonResponseUtil
.
success
(
list
);
return
CommonResponseUtil
.
success
(
equipmentSpecificAlarmService
.
pageQuery
(
param
));
}
@RequestMapping
(
value
=
"/equipStatusCount"
,
method
=
RequestMethod
.
GET
)
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentAlarmController.java
View file @
82150338
...
...
@@ -226,6 +226,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
@RequestParam
(
value
=
"endDate"
,
required
=
false
)
String
endDate
,
@RequestParam
(
value
=
"warehouseStructureName"
,
required
=
false
)
String
warehouseStructureName
,
@RequestParam
(
value
=
"equipCode"
,
required
=
false
)
String
equipCode
,
@RequestParam
(
value
=
"equipDetailCode"
,
required
=
false
)
String
equipDetailCode
,
@RequestParam
(
value
=
"confirmType"
,
required
=
false
)
String
confirmType
,
@RequestParam
(
value
=
"alarmType"
,
required
=
false
)
String
alarmType
,
@RequestParam
(
value
=
"systemCode"
,
required
=
false
)
String
systemCode
,
...
...
@@ -286,6 +287,10 @@ public class EquipmentAlarmController extends AbstractBaseController {
request13
.
setName
(
"isRemovedFire"
);
request13
.
setValue
(
StringUtil
.
isNotEmpty
(
isRemovedFire
)
?
StringUtils
.
trimToNull
(
isRemovedFire
)
:
null
);
queryRequests
.
add
(
request13
);
CommonRequest
request15
=
new
CommonRequest
();
request15
.
setName
(
"equipDetailCode"
);
request15
.
setValue
(
StringUtil
.
isNotEmpty
(
equipDetailCode
)
?
StringUtils
.
trimToNull
(
equipDetailCode
)
:
null
);
queryRequests
.
add
(
request15
);
if
(
equioEnabled
){
if
(!
ValidationUtil
.
isEmpty
(
reginParams
.
getPersonIdentity
())){
CommonRequest
request14
=
new
CommonRequest
();
...
...
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @
82150338
...
...
@@ -344,7 +344,8 @@
LEFT JOIN f_equipment AS fet ON fet.id = fefe.equipment_id
WHERE
fefe.fire_equipment_id = wlesal.equipment_specific_id
) AS equipmentName
) AS equipmentName,
we.code AS equipDetailCode
FROM
wl_equipment_specific_alarm_log wlesal
LEFT JOIN wl_equipment we ON wlesal.equipment_code = we.code
...
...
@@ -375,6 +376,9 @@
<if
test=
"param.equipCode != null and param.equipCode != ''"
>
AND d.fireEquipmentCode like
concat(concat("%",#{param.equipCode}),"%")
</if>
<if
test=
"param.equipDetailCode != null and param.equipDetailCode != ''"
>
AND d.equipDetailCode like
concat(concat("%",#{param.equipDetailCode}),"%")
</if>
<choose>
<when
test=
"param.confirmType != null and param.confirmType != '' and param.confirmType == 1"
>
AND d.handleType
<![CDATA[<>]]>
''
...
...
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