Commit 9e742ea1 authored by maoying's avatar maoying

设备,巡检告警后修改风险点状态

parent 2fafbc75
......@@ -13,7 +13,7 @@
<parent>
<groupId>com.yeejoin.amos</groupId>
<artifactId>YeeAmosFireAutoSysRoot</artifactId>
<version>2.0.3</version>
<version>2.0.5</version>
</parent>
<!-- <dependencies>
......
......@@ -14,14 +14,14 @@
<parent>
<groupId>com.yeejoin.amos</groupId>
<artifactId>YeeAmosFireAutoSysRoot</artifactId>
<version>2.0.3</version>
<version>2.0.5</version>
</parent>
<dependencies>
<dependency>
<groupId>com.yeejoin.amos</groupId>
<artifactId>YeeAmosFireAutoSysCommon</artifactId>
<version>2.0.3</version>
<version>2.0.5</version>
</dependency>
<dependency>
......
......@@ -9,7 +9,7 @@
<parent>
<groupId>com.yeejoin.amos</groupId>
<artifactId>YeeAmosFireAutoSysRoot</artifactId>
<version>2.0.3</version>
<version>2.0.5</version>
</parent>
<dependencies>
......@@ -17,7 +17,7 @@
<dependency>
<groupId>com.yeejoin.amos</groupId>
<artifactId>YeeAmosFireAutoSysService</artifactId>
<version>2.0.3</version>
<version>2.0.5</version>
</dependency>
</dependencies>
......
......@@ -4,11 +4,11 @@ security.productWeb=CONVERTER_STATION_WEB
security.appKeyWeb=CONVERTER_STATION
oauth2.accessToken=my
oauth2.password=a123456
oauth2.password=a1234560
#environment
#spring.profiles.active = dev
eureka.client.serviceUrl.defaultZone=http://172.16.3.75:10001/eureka/
eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
eureka.client.register-with-eureka = true
eureka.client.fetch-registry = true
eureka.client.healthcheck.enabled = true
......@@ -33,7 +33,7 @@ spring.data.mongodb.uri = mongodb://172.16.11.33:27017/iecmonitor
params.remoteRuleUrl=http://magintursh.xicp.net:18080/
params.remoteWebsocketUrl=http://172.16.10.91:10600/
spring.redis.database=1
spring.redis.database=5
spring.redis.host=172.16.11.33
spring.redis.port=6379
spring.redis.password=1234560
......@@ -44,7 +44,7 @@ spring.redis.jedis.pool.min-idle=0
spring.redis.timeout=1000
#picture upload
file.uploadUrl=D:\\upload\\files\\
file.uploadUrl=E:\\upload\\files\\
#picture read
file.readUrl=http://172.16.3.89:8083/file/getFile?in=
params.isPush=true
......@@ -56,12 +56,11 @@ emqx.broker=tcp://172.16.10.85:1883
emqx.user-name=super
emqx.password=a123456
Push.fegin.name=PPMESSAGEPUSHSERVICE15
dutyMode.fegin.name=AMOS-DUTY
Push.fegin.name=APPMESSAGEPUSHSERVICE-36
dutyMode.fegin.name=AMOSDUTYMODE
##\u89C4\u5219\u5BF9\u8C61\u81EA\u52A8\u626B\u63CF
rule.definition.load=true
rule.definition.model-package=com.yeejoin.amos.fas.business.service.model
amos.feign.gennerator.use-gateway=false
\ No newline at end of file
amos.feign.gennerator.use-gateway=true
\ No newline at end of file
spring.application.name = AMOS-AUTOSYS
spring.application.name = AMOS-AUTOSYS-my
server.port = 8083
spring.profiles.active=dev
#spring.freemarker.cache=false
spring.devtools.restart.enabled=true
spring.devtools.restart.additional-paths=src/main/java
spring.devtools.restart.exclude=WEB-INF/**
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
#JPA Configuration:
......@@ -35,18 +33,16 @@ logging.level.com.yeejoin.amos.fas.business.dao.mapper=debug
#liquibase
spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
spring.liquibase.enabled= false
spring.liquibase.enabled= true
param.system.online.date = 2020-02-12
visual.fegin.name=maas-visual
spring.http.multipart.maxFileSize = 10480000
spring.http.multipart.MaxRequestSize = 50480000
windows.img.path = D:\\
windows.img.path = E:\\
linux.img.path = /
Push.fegin.name=PPMESSAGEPUSHSERVICE15
dutyMode.fegin.name=AMOSDUTYMODE
param.safetyIndexChange.cron = 0 0 2 * * ?
......@@ -5,79 +5,55 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
<changeSet author="maoying" id="1558405565112-1" runOnChange="true">
<comment>f_fire_equipment_point_update 触发器创建</comment>
<sql endDelimiter="#">
DROP TRIGGER IF EXISTS `trigger_fire_equipment_point_update`;
CREATE TRIGGER `trigger_fire_equipment_point_update` AFTER UPDATE ON `f_fire_equipment_point` FOR EACH ROW
BEGIN
DECLARE num1 INT (4) default 0;
select count(1) into num1 from f_fire_equipment_point where fire_equipment_id = new.fire_equipment_id and type='SWITCH' and 0x4000>=CAST(code AS SIGNED) and value > 0;
if num1 > 0 then
update f_fire_equipment set equip_status = 1 where id = new.fire_equipment_id;
else
update f_fire_equipment set equip_status = 0 where id = new.fire_equipment_id;
end if;
END#
</sql>
</changeSet>
<changeSet author="gaodongdong" id="1561454730001-1" runOnChange="true">
<comment>f_fire_equipment_point_update 触发器创建</comment>
<sql endDelimiter="#">
DROP TRIGGER IF EXISTS `trigger_fire_equipment_point_update`;
CREATE TRIGGER `trigger_fire_equipment_point_update` AFTER UPDATE ON `f_fire_equipment_point` FOR EACH ROW
BEGIN
DECLARE num1 INT (4) default 0;
select count(1) into num1 from f_fire_equipment_point where fire_equipment_id = new.fire_equipment_id and type='SWITCH' and 0x4000>=CAST(code AS SIGNED) and value > 0;
if num1 > 0 then
update f_fire_equipment set equip_status = 1 where id = new.fire_equipment_id;
update f_risk_source_equipment set status = 1 where fire_equipment_id = new.fire_equipment_id;
else
update f_fire_equipment set equip_status = 0 where id = new.fire_equipment_id;
update f_risk_source_equipment set status = 0 where fire_equipment_id = new.fire_equipment_id;
end if;
END#
</sql>
</changeSet>
<changeSet author="suhg" id="1561454393000-1" runOnChange="true">
<comment>f_risk_source_equipment 更新触发器创建</comment>
<comment>update f_fmea_equipment_point 更新触发器创建</comment>
<sql endDelimiter="#">
DROP TRIGGER IF EXISTS `fire_source_equip_upd`;
CREATE TRIGGER fire_source_equip_upd AFTER UPDATE on f_risk_source_equipment FOR EACH ROW
DROP TRIGGER IF EXISTS `trigger_fmea_equipment_point_update`;
CREATE TRIGGER trigger_fmea_equipment_point_update AFTER UPDATE on f_fmea_equipment_point FOR EACH ROW
BEGIN
DECLARE riskSourceId BIGINT (20);
DECLARE num1 int (20);
DECLARE num2 int (20);
select rse.risk_source_id INTO riskSourceId from f_risk_source_equipment rse where rse.id = new.id;
IF new.status = 1 then UPDATE f_risk_source rs set rs.status = 'ANOMALY' where rs.id = riskSourceId;
ELSEIF new.status = 0 then
SELECT COUNT(1) INTO num1 FROM f_risk_source_equipment rse WHERE rse.risk_source_id = riskSourceId and rse.status = 1;-- 告警
SELECT COUNT(1) INTO num2 FROM f_risk_source_point_inputitem rsp WHERE rsp.risk_source_id = riskSourceId and rsp.status = '2';
update f_risk_source rs set rs.`status` = (case when num1+num2>0 then 'ANOMALY' else 'NORMAL' END) where rs.id = riskSourceId;
SELECT fm.risk_source_id INTO riskSourceId FROM f_fmea fm WHERE fm.id = (select fmea_id from f_fmea_equipment_point fep where fep.id = new.id);
IF new.state = '1' then
UPDATE f_risk_source rs set rs.status = 'ANOMALY' where rs.id = riskSourceId;
ELSEIF new.state = '0' then
SELECT count(fep.id) INTO num1 FROM f_fmea_equipment_point fep
LEFT JOIN f_fmea ff ON ff.id = fep.fmea_id
WHERE fep.state = '1' AND ff.risk_source_id = riskSourceId;
SELECT count(fpi.id) INTO num2 FROM f_fmea_point_inputitem fpi
LEFT JOIN f_fmea ff ON ff.id = fpi.fmea_id
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;
END IF;
END#
END#
</sql>
</changeSet>
<changeSet author="suhg" id="1561454393000-2" runOnChange="true">
<comment>f_risk_source_point_inputitem 更新触发器创建</comment>
<sql endDelimiter="#">
DROP TRIGGER IF EXISTS `risk_source_point_item_upd`;
CREATE TRIGGER risk_source_point_item_upd AFTER UPDATE on f_risk_source_point_inputitem FOR EACH ROW
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
BEGIN
DECLARE riskSourceId BIGINT (20);
DECLARE num1 int (20);
DECLARE num2 int (20);
select rsp.risk_source_id INTO riskSourceId from f_risk_source_point_inputitem rsp where rsp.id = new.id;
IF new.status = '2' then UPDATE f_risk_source rs set rs.status = 'ANOMALY'
where rs.id= riskSourceId;
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
UPDATE f_risk_source rs set rs.status = 'ANOMALY' where rs.id= riskSourceId;
ELSE
SELECT COUNT(1) INTO num1 FROM f_risk_source_equipment rse WHERE rse.risk_source_id = riskSourceId and rse.status = 1;-- 告警
SELECT COUNT(1) INTO num2 FROM f_risk_source_point_inputitem rsp WHERE rsp.risk_source_id = riskSourceId and rsp.status = '2';
update f_risk_source rs set rs.`status` = (case when num1+num2>0 then 'ANOMALY' else 'NORMAL' END) where rs.id = riskSourceId;
SELECT count(fep.id) INTO num1 FROM f_fmea_equipment_point fep
LEFT JOIN f_fmea ff ON ff.id = fep.fmea_id
WHERE fep.state = '1' AND ff.risk_source_id = riskSourceId;
SELECT count(fpi.id) INTO num2 FROM f_fmea_point_inputitem fpi
LEFT JOIN f_fmea ff ON ff.id = fpi.fmea_id
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;
END IF;
END#
END#
</sql>
</changeSet>
......@@ -91,10 +67,8 @@
select count(1) into num1 from f_fire_equipment_point where fire_equipment_id = new.fire_equipment_id and type='SWITCH' and 0x4000>=CAST(code AS SIGNED) and value = 'true';
if num1 > 0 then
update f_fire_equipment set equip_status = 1 where id = new.fire_equipment_id;
update f_risk_source_equipment set status = 1 where fire_equipment_id = new.fire_equipment_id;
else
update f_fire_equipment set equip_status = 0 where id = new.fire_equipment_id;
update f_risk_source_equipment set status = 0 where fire_equipment_id = new.fire_equipment_id;
end if;
END#
</sql>
......
......@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.yeejoin.amos</groupId>
<artifactId>YeeAmosFireAutoSysRoot</artifactId>
<version>2.0.3</version>
<version>2.0.5</version>
<packaging>pom</packaging>
<name>YeeAmosFireAutoSysRoot</name>
......
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