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
56cca29f
Commit
56cca29f
authored
Feb 07, 2023
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:消防系统状态信息接口修改
parent
8933201b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
11 deletions
+14
-11
FireFightingSystemServiceImpl.java
...uipmanage/service/impl/FireFightingSystemServiceImpl.java
+3
-0
FireFightingSystemMapper.xml
...ip/src/main/resources/mapper/FireFightingSystemMapper.xml
+11
-11
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @
56cca29f
...
...
@@ -1027,6 +1027,9 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
map
.
put
(
"code"
,
m
.
get
(
"code"
));
map
.
put
(
"systemTypeCode"
,
systemCode
);
map
.
put
(
"img"
,
m
.
get
(
"shbzImg"
));
map
.
put
(
"type"
,
m
.
get
(
"type"
));
map
.
put
(
"fullName"
,
m
.
get
(
"fullName"
));
map
.
put
(
"updateDate"
,
m
.
get
(
"updateDate"
).
toString
().
replace
(
"T"
,
" "
));
statusMap
.
put
(
"name"
,
m
.
get
(
"status"
));
if
(
"正常"
.
equals
(
String
.
valueOf
(
m
.
get
(
"status"
))))
{
statusMap
.
put
(
"level"
,
"success"
);
...
...
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @
56cca29f
...
...
@@ -5595,19 +5595,19 @@
spe.id,
spe.`name`,
spe.`code`,
(
CASE
( SELECT count(*) FROM wl_equipment_specific_alarm wesa WHERE wesa.equipment_specific_id = spe.id AND STATUS = 1 )
WHEN 0 THEN
'正常' ELSE '异常'
END
) `status`,
wle.shbz_img shbzImg
IF
( spe.value_label != '', spe.value_label, '正常' ) AS `status`,
wle.shbz_img shbzImg,
ei.type_code AS type,
IFNULL( ws.full_name, '' ) AS fullName,
spe.realtime_iot_index_update_date AS updateDate
FROM
wl_equipment_specific AS spe
LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, spe.system_id )
LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id
LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
LEFT JOIN wl_equipment_index ei ON spe.realtime_iot_index_id = ei.id
LEFT JOIN wl_warehouse_structure ws ON spe.warehouse_structure_id = ws.id
LEFT JOIN f_fire_fighting_system fs ON FIND_IN_SET( fs.id, spe.system_id )
LEFT JOIN wl_equipment_detail AS det ON spe.equipment_detail_id = det.id
LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
WHERE
fs.system_type_code IS NOT NULL
<if
test=
"bizOrgCode != null and bizOrgCode != ''"
>
...
...
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