Skip to content

A
amos-boot-biz
Commit 3cc51fa9 authored by 高建强's avatar 高建强
Browse files
Options

Merge branch 'develop_dl_plan6' into develop_dl_plan6_temp

# Conflicts: # amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
parents 88872e42 543abe9d
Show whitespace changes
Inline Side-by-side
Showing with 115 additions and 5 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java
View file @ 3cc51fa9
...@@ -2184,6 +2184,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste ...@@ -2184,6 +2184,12 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
@Override @Override
public List<Map<String, Object>> getSystemAlarmInfoList(String startDate, String endDate) { public List<Map<String, Object>> getSystemAlarmInfoList(String startDate, String endDate) {
if (!StringUtil.isNotEmpty(startDate)) {
startDate = null;
}
if (!StringUtil.isNotEmpty(endDate)) {
endDate = null;
}
return fireFightingSystemMapper.getSystemAlarmInfoList(startDate, endDate); return fireFightingSystemMapper.getSystemAlarmInfoList(startDate, endDate);
} }
......
amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
View file @ 3cc51fa9
...@@ -623,5 +623,100 @@ ...@@ -623,5 +623,100 @@
<sql> <sql>
ALTER TABLE `wl_equipment` ADD COLUMN `shbz_img` varchar(255) NULL COMMENT '四横八纵图片' AFTER `img`;</sql> ALTER TABLE `wl_equipment` ADD COLUMN `shbz_img` varchar(255) NULL COMMENT '四横八纵图片' AFTER `img`;</sql>
</changeSet> </changeSet>
<changeSet author="gaojianqiang" id="20230113-01">
<preConditions onFail="MARK_RAN">
<columnExists tableName="wl_equipment" columnName="shbz_img"/>
</preConditions>
<comment>初始化四横八纵shbz_img图片属性字段</comment>
<sql>
-- ----------------------------
-- Table structure for equipment_icon
-- ----------------------------
DROP TABLE IF EXISTS `equipment_icon`;
CREATE TABLE `equipment_icon` (
`id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`sys_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`type_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`type_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`icon` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`sort` int(11) NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of equipment_icon
-- ----------------------------
INSERT INTO `equipment_icon` VALUES ('1392361049260539906', '自动喷水灭火系统', 'FHS-消防泵', '920106007GV44', 'upload/state/dcfc/viewicon/firePump.png', 46);
INSERT INTO `equipment_icon` VALUES ('1392361051122810882', '火灾自动报警系统', 'FAS-烟雾报警器', '920402009EM44', 'upload/state/dcfc/viewicon/ganYanTanCeQi.png', 44);
INSERT INTO `equipment_icon` VALUES ('1392361052318187522', '火灾自动报警系统', 'FAS-手动报警器', '920404002PU44', 'upload/state/dcfc/viewicon/shouDongBaoJingQi.png', 43);
INSERT INTO `equipment_icon` VALUES ('1392361052926361602', '火灾自动报警系统', 'FAS-空气采样探测器', '920405002O544', NULL, 52);
INSERT INTO `equipment_icon` VALUES ('1392361054348230658', '火灾自动报警系统', 'FAS-感温电缆', '92040700PEM44', 'upload/state/dcfc/viewicon/ganWenDianLan.png', 34);
INSERT INTO `equipment_icon` VALUES ('1392361056457965569', '火灾自动报警系统', 'FAS-声光报警器', '92041000LCW44', 'upload/state/dcfc/viewicon/shengGuangBaoJingQi.png', 41);
INSERT INTO `equipment_icon` VALUES ('1392361057196163073', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-主机', '92030100TGX44', 'upload/state/dcfc/viewicon/zhuji.png', 30);
INSERT INTO `equipment_icon` VALUES ('1392361057749811202', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-炮阀', '92030200DOD44', 'upload/state/dcfc/viewicon/paofa.png', 11);
INSERT INTO `equipment_icon` VALUES ('1392361058299265025', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-切换阀', '92030300DI444', 'upload/state/dcfc/viewicon/qieHuanFa.png', 17);
INSERT INTO `equipment_icon` VALUES ('1392361058894856194', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-卷帘门', '92030400FTV44', 'upload/state/dcfc/viewicon/juanLianMen.png', 12);
INSERT INTO `equipment_icon` VALUES ('1392361059477864450', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-产生装置', '92030500MG644', 'upload/state/dcfc/viewicon/chanshengzhuangzhi.png', 13);
INSERT INTO `equipment_icon` VALUES ('1392361059951820801', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-泡沫泵', '92030600QO344', 'upload/state/dcfc/viewicon/paoMoPump.png', 18);
INSERT INTO `equipment_icon` VALUES ('1392361060509663233', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-空压机', '92030700SFT44', 'upload/state/dcfc/viewicon/kongYaMachine.png', 19);
INSERT INTO `equipment_icon` VALUES ('1392361061012979713', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-控制柜', '92030800K2R44', 'upload/state/dcfc/viewicon/kongZhiGui.png', 10);
INSERT INTO `equipment_icon` VALUES ('1392361061486936066', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-电源柜', '92030900KYD44', 'upload/state/dcfc/viewicon/pwoerGui.png', 16);
INSERT INTO `equipment_icon` VALUES ('1392361062007029761', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-设备间', '92031000EXB44', 'upload/state/dcfc/viewicon/sheBeiJian.png', 9);
INSERT INTO `equipment_icon` VALUES ('1392361062543900673', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-控制按钮', '92031100HQL44', 'upload/state/dcfc/viewicon/kongZhiButton.png', 20);
INSERT INTO `equipment_icon` VALUES ('1392361063101743105', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-插件', '92031200DMT44', 'upload/state/dcfc/viewicon/chaJian.png', 29);
INSERT INTO `equipment_icon` VALUES ('1392361063550533634', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-交换机', '92031300WFJ44', 'upload/state/dcfc/viewicon/jiaoHuanji.png', 8);
INSERT INTO `equipment_icon` VALUES ('1392361064016101378', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-光纤', '92031400GMT44', 'upload/state/dcfc/viewicon/guangxian.png', 32);
INSERT INTO `equipment_icon` VALUES ('1392361064620081153', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-电源', '92031500Z9E44', 'upload/state/dcfc/viewicon/power.png', 14);
INSERT INTO `equipment_icon` VALUES ('1392361065161146370', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-AD通道', '92031600TQ244', 'upload/state/dcfc/viewicon/tongDao.png', 15);
INSERT INTO `equipment_icon` VALUES ('1392361065656074242', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-断路器', '92031700EGW44', 'upload/state/dcfc/viewicon/duanLuQi.png', 21);
INSERT INTO `equipment_icon` VALUES ('1392361066734010370', '其他系统', 'CAFS-泡沫罐', '92031900INJ44', NULL, 64);
INSERT INTO `equipment_icon` VALUES ('1392361070315945986', '排油注氮系统', 'ONL-交流电源', '921002000JK44', 'upload/state/dcfc/viewicon/jiaoLiuDianYuan.png', 1);
INSERT INTO `equipment_icon` VALUES ('1392361070907342850', '排油注氮系统', 'ONL-直流电源', '92100300MNL44', 'upload/state/dcfc/viewicon/zhiLiuDianYuan.png', 5);
INSERT INTO `equipment_icon` VALUES ('1392361071419047937', '排油注氮系统', 'ONL-排油阀', '92100400VWE44', 'upload/state/dcfc/viewicon/benTiPaiYouFa.png', 6);
INSERT INTO `equipment_icon` VALUES ('1392361071851061250', '排油注氮系统', 'ONL-排油注氮装置', '92100500RIP44', 'upload/state/dcfc/viewicon/paiyouzhudanzhuangzhi.png', 4);
INSERT INTO `equipment_icon` VALUES ('1392662028300304385', '自动喷水灭火系统', 'WSS-雨淋阀', '92130300BH644', NULL, 55);
INSERT INTO `equipment_icon` VALUES ('1392662045933158401', '火灾自动报警系统', 'SCS-防火阀', '92160200J4244', NULL, 53);
INSERT INTO `equipment_icon` VALUES ('1392662048705593345', '其他系统', 'ES-电梯', '92170100NKI44', NULL, 66);
INSERT INTO `equipment_icon` VALUES ('1392662052493049858', '自动喷水灭火系统', 'FFS-雨淋蝶阀', '92110900ATW44', NULL, 54);
INSERT INTO `equipment_icon` VALUES ('1392662054481149954', '其他系统', 'FHS-消防水池装置', '92010700SHY44', NULL, 63);
INSERT INTO `equipment_icon` VALUES ('1392662055093518337', '消防给水及消火栓系统', 'FHS-稳压泵', '92010800KAL44', 'upload/state/dcfc/viewicon/wenYaBeng.png', 23);
INSERT INTO `equipment_icon` VALUES ('1401866673925124097', '火灾自动报警系统', 'FAS-感温式火灾探测器', '92041200KNU44', 'upload/state/dcfc/viewicon/ganYanTanCeQi.png', 33);
INSERT INTO `equipment_icon` VALUES ('1401866675300855810', '火灾自动报警系统', 'FAS-备用设备', '92041800CK844', NULL, 50);
INSERT INTO `equipment_icon` VALUES ('1401866678102650882', '自动喷水灭火系统', 'FHS-压力开关', '92010900K8G44', NULL, 45);
INSERT INTO `equipment_icon` VALUES ('1401866678308171778', '其他系统', 'FHS-管网压力探测器', '92011000T5Q44', 'upload/state/dcfc/viewicon/guanWangYaLi.png', 65);
INSERT INTO `equipment_icon` VALUES ('1401866678450778114', '消防给水及消火栓系统', 'FHS-液位探测器', '92011100BIK44', 'upload/state/dcfc/viewicon/yeWeiDetecor.png', 24);
INSERT INTO `equipment_icon` VALUES ('1401866678975066113', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-CAFS消防炮', '92032200BUX44', 'upload/state/dcfc/viewicon/CAFSGun.png', 31);
INSERT INTO `equipment_icon` VALUES ('1401866680124305409', '火灾自动报警系统', 'AIRCS-空调', '92200100VAC44', NULL, 48);
INSERT INTO `equipment_icon` VALUES ('1404693507742093314', '排油注氮系统', 'ONL-采集模块', '92101400P3N44', 'upload/state/dcfc/viewicon/caiJiMuKuai.png', 7);
INSERT INTO `equipment_icon` VALUES ('1404693508211855361', '火灾自动报警系统', 'FAS-感光式火灾探测器', '92041900GNS44', 'upload/state/dcfc/viewicon/ziWaiHuoYanTanCeQi.png', 49);
INSERT INTO `equipment_icon` VALUES ('1404693508639674370', '火灾自动报警系统', 'FAS-模块', '92042000YVN44', NULL, 51);
INSERT INTO `equipment_icon` VALUES ('1404693512771063809', '其他系统', 'FPMS-配电开关', '922206009JO44', NULL, 60);
INSERT INTO `equipment_icon` VALUES ('1417377345773498370', '火灾自动报警系统', 'FAS-强切设备', '92042200EKM44', 'upload/state/dcfc/viewicon/qiangQieShebei.png', 39);
INSERT INTO `equipment_icon` VALUES ('1417377347702878209', '火灾自动报警系统', 'FAS-复位电源', '92042300YBA44', 'upload/state/dcfc/viewicon/fuWeiPower.png', 35);
INSERT INTO `equipment_icon` VALUES ('1417377349053444098', '排油注氮系统', 'ONL-智能终端', '92101800NKO44', 'upload/state/dcfc/viewicon/zhunDuan.png', 3);
INSERT INTO `equipment_icon` VALUES ('1417377350970241025', '压缩空气泡沫灭火系统（CAFS）', 'CAFS-直流系统', '92032400MWX44', 'upload/state/dcfc/viewicon/zhiliuSystem.png', 22);
INSERT INTO `equipment_icon` VALUES ('1417377352845094913', '火灾自动报警系统', 'FAS-切电设备', '92042400X2V44', NULL, 47);
INSERT INTO `equipment_icon` VALUES ('1418444533010169858', '消防给水及消火栓系统', '消火栓', '31050000ZLF44', 'upload/state/dcfc/viewicon/fireMachine.png', 25);
INSERT INTO `equipment_icon` VALUES ('1418445233194696705', '其他系统', '灭火器', '31040000PV244', NULL, 61);
INSERT INTO `equipment_icon` VALUES ('1418462802521784321', '火灾自动报警系统', '火灾自动报警系统', '92040000KPO44', 'upload/state/dcfc/viewicon/fireAutoAlarm.png', 36);
INSERT INTO `equipment_icon` VALUES ('1418464225015791617', '自动喷水灭火系统', '消防专用电话', '92120000GYI44', 'upload/state/dcfc/viewicon/fireMobile.png', 37);
INSERT INTO `equipment_icon` VALUES ('1418464823584915458', '其他系统', '防火分隔设施', '92990000UVR44', NULL, 59);
INSERT INTO `equipment_icon` VALUES ('1418465438318886913', '自动喷水灭火系统', '雨淋阀', '92110900V9B44', 'upload/state/dcfc/viewicon/yuLinFa.png', 38);
INSERT INTO `equipment_icon` VALUES ('1418465836974899202', '其他系统', '消防小室', '92990000AQT44', NULL, 56);
INSERT INTO `equipment_icon` VALUES ('1418466180761026562', '压缩空气泡沫灭火系统（CAFS）', '压缩空气泡沫灭火系统', '92030000WEW44', 'upload/state/dcfc/viewicon/yasuokongqi.png', 26);
INSERT INTO `equipment_icon` VALUES ('1418466508642353153', '自动喷水灭火系统', '自动喷水灭火系统', '92130000YCG44', NULL, 40);
INSERT INTO `equipment_icon` VALUES ('1418496226158649346', '其他系统', '灭火器巡检', '92990000N2844', NULL, 57);
INSERT INTO `equipment_icon` VALUES ('1418497428988567554', '其他系统', '消火栓系统', '92990000RIN44', NULL, 58);
INSERT INTO `equipment_icon` VALUES ('1418505479128817666', '消防给水及消火栓系统', '消防供水设施', '92010000S0F44', 'upload/state/dcfc/viewicon/gongshuiSheShi.png', 27);
INSERT INTO `equipment_icon` VALUES ('1418822147562434562', '自动喷水灭火系统', '消防水池', '92010000XBB44', 'upload/state/dcfc/viewicon/xiaoFangShuiChi.png', 42);
INSERT INTO `equipment_icon` VALUES ('1450756152672518146', '其他系统', 'FHS-无线液位探测器', '92011500EBH44', NULL, 62);
INSERT INTO `equipment_icon` VALUES ('1527227300964233217', '消防给水及消火栓系统', '消火栓', '93060400CQX44', 'upload/state/dcfc/viewicon/fireMachine.png', 28);
INSERT INTO `equipment_icon` VALUES ('1578945741864742914', '排油注氮系统', '消防水箱', '93060600HQK44', 'upload/state/dcfc/viewicon/fireShuiXiang.png', 2);
UPDATE wl_equipment e SET e.shbz_img = (SELECT ei.icon FROM equipment_icon ei WHERE e.`code` = ei.`type_code`);
DROP TABLE IF EXISTS `equipment_icon`;
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
amos-boot-system-equip/src/main/resources/mapper/EmergencyMapper.xml
View file @ 3cc51fa9
...@@ -206,7 +206,6 @@ ...@@ -206,7 +206,6 @@
wl_equipment_specific wes wl_equipment_specific wes
WHERE WHERE
wes.equipment_code LIKE concat( '920319', '%' ) wes.equipment_code LIKE concat( '920319', '%' )
AND wes.biz_org_code LIKE CONCAT( #{bizOrgCode}, '%' )
) temp ) temp
</select> </select>
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ 3cc51fa9
...@@ -2847,6 +2847,7 @@ ...@@ -2847,6 +2847,7 @@
LEFT JOIN wl_equipment_specific_alarm esa ON esa.equipment_specific_id = es.id LEFT JOIN wl_equipment_specific_alarm esa ON esa.equipment_specific_id = es.id
WHERE WHERE
ed.`code` LIKE '92010800%' ed.`code` LIKE '92010800%'
AND es.iot_code IS NOT NULL
AND es.biz_org_code like concat(#{bizOrgCode}, '%') AND es.biz_org_code like concat(#{bizOrgCode}, '%')
<if test="systemCode!=null and systemCode!=''"> <if test="systemCode!=null and systemCode!=''">
AND fs.code = #{systemCode,jdbcType=VARCHAR} AND fs.code = #{systemCode,jdbcType=VARCHAR}
...@@ -2884,7 +2885,7 @@ ...@@ -2884,7 +2885,7 @@
LEFT JOIN wl_warehouse_structure wws ON wsd.warehouse_structure_id = wws.id LEFT JOIN wl_warehouse_structure wws ON wsd.warehouse_structure_id = wws.id
LEFT JOIN wl_equipment_category wec on wec.id=eq.category_id LEFT JOIN wl_equipment_category wec on wec.id=eq.category_id
<where> <where>
and wec.industry_code = 2 wec.industry_code = 2
<if test="dto.code!=null and dto.code!=''"> <if test="dto.code!=null and dto.code!=''">
and wesp.code = #{dto.code} and wesp.code = #{dto.code}
</if> </if>
...@@ -4063,7 +4064,14 @@ ...@@ -4063,7 +4064,14 @@
) temp ) temp
LEFT JOIN LEFT JOIN
( (
SELECT temp.*, SELECT temp.*,
CASE CASE
WHEN wei.is_trend = 0 then "遥信" WHEN wei.is_trend = 0 then "遥信"
...@@ -4121,7 +4129,7 @@ ...@@ -4121,7 +4129,7 @@
</select> </select>
<select id="selectAlarms" resultType="java.lang.Integer"> <select id="selectAlarms" resultType="java.lang.Integer">
SELECT SELECT
COUNT(1) SUM(index_true_num)
FROM FROM
wl_equipment_alarm_report_day report wl_equipment_alarm_report_day report
LEFT JOIN f_fire_fighting_system s ON FIND_IN_SET( s.id, report.system_ids ) LEFT JOIN f_fire_fighting_system s ON FIND_IN_SET( s.id, report.system_ids )
...@@ -4454,7 +4462,8 @@ ...@@ -4454,7 +4462,8 @@
LEFT JOIN wl_equipment equipment ON equipment.id =detail.equipment_id LEFT JOIN wl_equipment equipment ON equipment.id =detail.equipment_id
left join f_fire_fighting_system s on FIND_IN_SET(s.id,spec.system_id) left join f_fire_fighting_system s on FIND_IN_SET(s.id,spec.system_id)
where where
FIND_IN_SET(#{systemId},spec.system_id) AND equipment.is_iot = 1 FIND_IN_SET(#{systemId},spec.system_id)
AND equipment.is_iot = 1
GROUP BY code,s.id, name ORDER BY system_id, code ) a) as a1 GROUP BY code,s.id, name ORDER BY system_id, code ) a) as a1
GROUP BY a1.system_id GROUP BY a1.system_id
) as b ) as b
...@@ -5298,7 +5307,7 @@ ...@@ -5298,7 +5307,7 @@
FROM FROM
`f_fire_fighting_system` `fs` `f_fire_fighting_system` `fs`
where where
fs.system_type_code IS NOT NULL fs.system_type_code IS NOT NULL AND LENGTH(trim(fs.system_type_code)) != 0 AND fs.system_type_code != 'otherSys'
</select> </select>
<select id="getSystemCountInfo" resultType="java.util.Map"> <select id="getSystemCountInfo" resultType="java.util.Map">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment