Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 4b9f47b7 authored by taabe's avatar taabe
Browse files
Options

删除f_risk_source_equipment、f_risk_source_point_inputitem表及注释相关代码

parent cd98ca66
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 125 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/RiskSourceMapper.java
View file @ 4b9f47b7
...@@ -46,9 +46,9 @@ public interface RiskSourceMapper extends BaseMapper { ...@@ -46,9 +46,9 @@ public interface RiskSourceMapper extends BaseMapper {
List<RiskSourceTreeResponse> getRiskSourcesEquipment(); List<RiskSourceTreeResponse> getRiskSourcesEquipment();
List<RiskSource> queryByFireEqument(@Param("fireEquipmentId") Long fireEquipmentId); // List<RiskSource> queryByFireEqument(@Param("fireEquipmentId") Long fireEquipmentId);
List<RiskSource> queryByPoint(@Param("pointId") Long pointId); // List<RiskSource> queryByPoint(@Param("pointId") Long pointId);
//厂区rpn，重点设备个数，风险点个数，巡检点个数 //厂区rpn，重点设备个数，风险点个数，巡检点个数
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
View file @ 4b9f47b7
...@@ -988,7 +988,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService { ...@@ -988,7 +988,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
if (equipment != null) { if (equipment != null) {
deviceData.setMonitor(equipment.getName()); deviceData.setMonitor(equipment.getName());
deviceData.setEquimentId(String.valueOf(equipment.getId())); deviceData.setEquimentId(String.valueOf(equipment.getId()));
List<RiskSource> riskSources = this.riskSourceMapper.queryByFireEqument(deviceData.getFireEquimentId()); // List<RiskSource> riskSources = this.riskSourceMapper.queryByFireEqument(deviceData.getFireEquimentId());
//asymbleWithParent(batchNo, riskSources, FireEquimentDataRo.class.getSimpleName(), deviceData.getFireEquimentId(), deviceData.getNodeState(), null, null); //asymbleWithParent(batchNo, riskSources, FireEquimentDataRo.class.getSimpleName(), deviceData.getFireEquimentId(), deviceData.getNodeState(), null, null);
try { try {
alermContingency(deviceData.getBatchNo(), fireEquipment, equipment); alermContingency(deviceData.getBatchNo(), fireEquipment, equipment);
......
YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-sql-task.xml
View file @ 4b9f47b7
...@@ -30,32 +30,32 @@ ...@@ -30,32 +30,32 @@
END# END#
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="suhg" id="1561454393001-2" runAlways="true"> <!-- <changeSet author="suhg" id="1561454393001-2" runAlways="true">-->
<comment>f_risk_source_point_inputitem 更新触发器创建</comment> <!-- <comment>f_risk_source_point_inputitem 更新触发器创建</comment>-->
<sql endDelimiter="#"> <!-- <sql endDelimiter="#">-->
DROP TRIGGER IF EXISTS `trigger_fmea_point_inputitem_update`; <!-- DROP TRIGGER IF EXISTS `trigger_fmea_point_inputitem_update`;-->
CREATE TRIGGER trigger_fmea_point_inputitem_update AFTER UPDATE on f_fmea_point_inputitem FOR EACH ROW <!-- CREATE TRIGGER trigger_fmea_point_inputitem_update AFTER UPDATE on f_fmea_point_inputitem FOR EACH ROW-->
BEGIN <!-- BEGIN -->
DECLARE riskSourceId BIGINT (20); <!-- DECLARE riskSourceId BIGINT (20);-->
DECLARE num1 int (20); <!-- DECLARE num1 int (20);-->
DECLARE num2 int (20); <!-- DECLARE num2 int (20);-->
<!-- -->
SELECT fm.risk_source_id INTO riskSourceId FROM f_fmea fm WHERE fm.id = (select fmea_id from f_fmea_point_inputitem fpi where fpi.id = new.id); <!-- SELECT fm.risk_source_id INTO riskSourceId FROM f_fmea fm WHERE fm.id = (select fmea_id from f_fmea_point_inputitem fpi where fpi.id = new.id);-->
IF new.state = '1' then <!-- IF new.state = '1' then -->
UPDATE f_risk_source rs set rs.status = 'ANOMALY' where rs.id= riskSourceId; <!-- UPDATE f_risk_source rs set rs.status = 'ANOMALY' where rs.id= riskSourceId;-->
ELSE <!-- ELSE-->
SELECT count(fep.id) INTO num1 FROM f_fmea_equipment_point fep <!-- SELECT count(fep.id) INTO num1 FROM f_fmea_equipment_point fep -->
LEFT JOIN f_fmea ff ON ff.id = fep.fmea_id <!-- LEFT JOIN f_fmea ff ON ff.id = fep.fmea_id-->
WHERE fep.state = '1' AND ff.risk_source_id = riskSourceId; <!-- WHERE fep.state = '1' AND ff.risk_source_id = riskSourceId; -->
<!-- -->
SELECT count(fpi.id) INTO num2 FROM f_fmea_point_inputitem fpi <!-- SELECT count(fpi.id) INTO num2 FROM f_fmea_point_inputitem fpi -->
LEFT JOIN f_fmea ff ON ff.id = fpi.fmea_id <!-- LEFT JOIN f_fmea ff ON ff.id = fpi.fmea_id-->
WHERE state = '1' AND ff.risk_source_id = riskSourceId; <!-- WHERE state = '1' AND ff.risk_source_id = riskSourceId;-->
update f_risk_source rs set rs.`status` = (case when (num1+num2)>0 then 'ANOMALY' else 'NORMAL' END) where rs.id = riskSourceId; <!-- update f_risk_source rs set rs.`status` = (case when (num1+num2)>0 then 'ANOMALY' else 'NORMAL' END) where rs.id = riskSourceId;-->
END IF; <!-- END IF;-->
END# <!-- END#-->
</sql> <!-- </sql>-->
</changeSet> <!-- </changeSet>-->
<changeSet author="shanqiyun" id="1588901126339-1" runAlways="true"> <changeSet author="shanqiyun" id="1588901126339-1" runAlways="true">
<comment>f_risk_source 查询所有子节点id</comment> <comment>f_risk_source 查询所有子节点id</comment>
<sql endDelimiter="#"> <sql endDelimiter="#">
......
YeeAmosFireAutoSysStart/src/main/resources/db/changelog/init/fas-create-table.sql
View file @ 4b9f47b7
...@@ -421,34 +421,34 @@ CREATE TABLE `f_risk_source` ( ...@@ -421,34 +421,34 @@ CREATE TABLE `f_risk_source` (
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=263 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='风险点表'; ) ENGINE=InnoDB AUTO_INCREMENT=263 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='风险点表';
-- ---------------------------- # -- ----------------------------
-- Table structure for f_risk_source_equipment # -- Table structure for f_risk_source_equipment
-- ---------------------------- # -- ----------------------------
DROP TABLE IF EXISTS `f_risk_source_equipment`; # DROP TABLE IF EXISTS `f_risk_source_equipment`;
CREATE TABLE `f_risk_source_equipment` ( # CREATE TABLE `f_risk_source_equipment` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', # `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`risk_source_id` bigint(20) NOT NULL COMMENT '风险点id', # `risk_source_id` bigint(20) NOT NULL COMMENT '风险点id',
`equipment_id` bigint(20) DEFAULT '0' COMMENT '设备指标id', # `equipment_id` bigint(20) DEFAULT '0' COMMENT '设备指标id',
`fire_equipment_id` bigint(20) NOT NULL COMMENT '消防装备id', # `fire_equipment_id` bigint(20) NOT NULL COMMENT '消防装备id',
`create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', # `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
`status` int(11) DEFAULT '0' COMMENT '设备状态（1，告警； 0，正常; ）', # `status` int(11) DEFAULT '0' COMMENT '设备状态（1，告警； 0，正常; ）',
PRIMARY KEY (`id`) USING BTREE # PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='风险点关联重点设备表'; # ) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='风险点关联重点设备表';
-- ---------------------------- # -- ----------------------------
-- Table structure for f_risk_source_point_inputitem # -- Table structure for f_risk_source_point_inputitem
-- ---------------------------- # -- ----------------------------
DROP TABLE IF EXISTS `f_risk_source_point_inputitem`; # DROP TABLE IF EXISTS `f_risk_source_point_inputitem`;
CREATE TABLE `f_risk_source_point_inputitem` ( # CREATE TABLE `f_risk_source_point_inputitem` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', # `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
`risk_source_id` bigint(20) NOT NULL COMMENT '风险点id', # `risk_source_id` bigint(20) NOT NULL COMMENT '风险点id',
`point_id` bigint(20) DEFAULT '0' COMMENT '巡检点id', # `point_id` bigint(20) DEFAULT '0' COMMENT '巡检点id',
`point_inputitem_id` bigint(20) DEFAULT '0' COMMENT '巡检点检查项id', # `point_inputitem_id` bigint(20) DEFAULT '0' COMMENT '巡检点检查项id',
`status` varchar(32) DEFAULT '1' COMMENT '检查项状态;合格/不合格/漏检', # `status` varchar(32) DEFAULT '1' COMMENT '检查项状态;合格/不合格/漏检',
`check_inputitem_id` bigint(32) DEFAULT NULL COMMENT '检查项检查记录id(p_check_input 表id)', # `check_inputitem_id` bigint(32) DEFAULT NULL COMMENT '检查项检查记录id(p_check_input 表id)',
`create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间', # `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
PRIMARY KEY (`id`) USING BTREE # PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=491 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='风险点关联检查项表'; # ) ENGINE=InnoDB AUTO_INCREMENT=491 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='风险点关联检查项表';
-- ---------------------------- -- ----------------------------
-- Table structure for f_rpn_change_log -- Table structure for f_rpn_change_log
......
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_risk_source.xml
View file @ 4b9f47b7
...@@ -316,74 +316,74 @@ ...@@ -316,74 +316,74 @@
a.id a.id
</select> </select>
<select id="getRiskSourcePointCount" resultType="long"> <!-- <select id="getRiskSourcePointCount" resultType="long">-->
SELECT <!-- SELECT-->
count(DISTINCT(pp.id)) <!-- count(DISTINCT(pp.id))-->
FROM <!-- FROM-->
`f_risk_source_point_inputitem` rspi <!-- `f_risk_source_point_inputitem` rspi-->
LEFT JOIN p_point pp ON pp.id = rspi.point_id <!-- LEFT JOIN p_point pp ON pp.id = rspi.point_id-->
WHERE <!-- WHERE-->
1 = 1 <!-- 1 = 1-->
AND rspi.risk_source_id = #{riskSourceId} <!-- AND rspi.risk_source_id = #{riskSourceId}-->
</select> <!-- </select>-->
<select id="getRiskSourcePoints" resultType="java.util.HashMap"> <!-- <select id="getRiskSourcePoints" resultType="java.util.HashMap">-->
SELECT <!-- SELECT-->
rspi.risk_source_id riskId, <!-- rspi.risk_source_id riskId,-->
pp.id pointId, <!-- pp.id pointId,-->
pp.point_no pointNo, <!-- pp.point_no pointNo,-->
pp.`name` pointName, <!-- pp.`name` pointName,-->
pp.charge_person_id userId, <!-- pp.charge_person_id userId,-->
pp.charge_dept_id deptId, <!-- pp.charge_dept_id deptId,-->
GROUP_CONCAT(pii.`name`) inputItems <!-- GROUP_CONCAT(pii.`name`) inputItems-->
FROM <!-- FROM-->
`f_risk_source_point_inputitem` rspi <!-- `f_risk_source_point_inputitem` rspi-->
LEFT JOIN p_point pp ON pp.id = rspi.point_id <!-- LEFT JOIN p_point pp ON pp.id = rspi.point_id-->
LEFT JOIN p_input_item pii ON pii.id = rspi.point_inputitem_id <!-- LEFT JOIN p_input_item pii ON pii.id = rspi.point_inputitem_id-->
WHERE pii.`name` is not NULL <!-- WHERE pii.`name` is not NULL-->
AND rspi.risk_source_id = #{riskSourceId} <!-- AND rspi.risk_source_id = #{riskSourceId}-->
GROUP BY riskId,pointId,pointNo,pointName,depName,username,telephone <!-- GROUP BY riskId,pointId,pointNo,pointName,depName,username,telephone-->
<choose> <!-- <choose>-->
<when test="pageSize==-1"></when> <!-- <when test="pageSize==-1"></when>-->
<when test="pageSize!=-1">limit #{offset},#{pageSize}</when> <!-- <when test="pageSize!=-1">limit #{offset},#{pageSize}</when>-->
</choose> <!-- </choose>-->
</select> <!-- </select>-->
<select id="queryByFireEqument" resultType="com.yeejoin.amos.fas.dao.entity.RiskSource"> <!-- <select id="queryByFireEqument" resultType="com.yeejoin.amos.fas.dao.entity.RiskSource">-->
SELECT <!-- SELECT-->
* <!-- *-->
FROM <!-- FROM-->
f_risk_source rs <!-- f_risk_source rs-->
WHERE <!-- WHERE-->
EXISTS ( <!-- EXISTS (-->
SELECT <!-- SELECT-->
1 <!-- 1-->
FROM <!-- FROM-->
f_risk_source_equipment se <!-- f_risk_source_equipment se-->
WHERE <!-- WHERE-->
se.fire_equipment_id = ${fireEquipmentId} <!-- se.fire_equipment_id = ${fireEquipmentId}-->
AND se.risk_source_id = rs.id <!-- AND se.risk_source_id = rs.id-->
) <!-- )-->
</select> <!-- </select>-->
<select id="queryByPoint" resultType="com.yeejoin.amos.fas.dao.entity.RiskSource"> <!-- <select id="queryByPoint" resultType="com.yeejoin.amos.fas.dao.entity.RiskSource">-->
SELECT <!-- SELECT-->
* <!-- *-->
FROM <!-- FROM-->
f_risk_source rs <!-- f_risk_source rs-->
WHERE <!-- WHERE-->
id in ( <!-- id in (-->
SELECT <!-- SELECT-->
pi.risk_source_id <!-- pi.risk_source_id-->
FROM <!-- FROM-->
f_risk_source_point_inputitem pi <!-- f_risk_source_point_inputitem pi-->
WHERE <!-- WHERE-->
pi.point_id = ${pointId} <!-- pi.point_id = ${pointId}-->
AND rs.id = pi.risk_source_id <!-- AND rs.id = pi.risk_source_id-->
) <!-- )-->
</select> <!-- </select>-->
<select id="findRiskSourceDetatil" resultMap="riskSourceMap"> <select id="findRiskSourceDetatil" resultMap="riskSourceMap">
SELECT SELECT
rs.id, rs.id,
...@@ -710,7 +710,17 @@ ...@@ -710,7 +710,17 @@
LEFT JOIN f_evaluation_model fem2 ON fem2.id = ff.evaluation_oid LEFT JOIN f_evaluation_model fem2 ON fem2.id = ff.evaluation_oid
LEFT JOIN f_evaluation_model fem3 ON fem3.id = ff.evaluation_did LEFT JOIN f_evaluation_model fem3 ON fem3.id = ff.evaluation_did
WHERE WHERE
EXISTS ( SELECT 1 FROM f_risk_source_point_inputitem frspi WHERE frspi.risk_source_id = frs.id AND frspi.point_id = ${pointId} ) # EXISTS ( SELECT 1 FROM f_risk_source_point_inputitem frspi WHERE frspi.risk_source_id = frs.id AND frspi.point_id = ${pointId} )
EXISTS ( SELECT
1
FROM
f_fmea_point_inputitem fpi
LEFT JOIN f_fmea f on f.id = fpi.fmea_id
LEFT JOIN p_point_inputitem ppi on ppi.id = fpi.point_inputitem_id
WHERE
f.risk_source_id = frs.id
AND ppi.point_id = ${pointId}
)
</select> </select>
<select id="countByParentIdAndIsRegion" resultType="long"> <select id="countByParentIdAndIsRegion" resultType="long">
......
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