Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 7f59c162 authored by litengwei's avatar litengwei
Browse files
Options

Merge remote-tracking branch 'origin/dev_upgrade' into dev_upgrade

# Conflicts: # YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java
parents 0e5e910d 0096a904
Show whitespace changes
Inline Side-by-side
Showing with 519 additions and 93 deletions
YeeAmosFireAutoSysCommon/pom.xml
View file @ 7f59c162
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>com.yeejoin.amos</groupId> <groupId>com.yeejoin.amos</groupId>
<artifactId>YeeAmosFireAutoSysRoot</artifactId> <artifactId>YeeAmosFireAutoSysRoot</artifactId>
<version>3.7.0.8</version> <version>3.7.0.9</version>
</parent> </parent>
<!-- <dependencies> <!-- <dependencies>
......
YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/EmergencyRelationTree.java
View file @ 7f59c162
...@@ -18,6 +18,8 @@ import java.util.List; ...@@ -18,6 +18,8 @@ import java.util.List;
public class EmergencyRelationTree extends BasicEntity { public class EmergencyRelationTree extends BasicEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String sequenceNbr;
//职责id //职责id
private Long obligationId; private Long obligationId;
......
YeeAmosFireAutoSysService/pom.xml
View file @ 7f59c162
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
<parent> <parent>
<groupId>com.yeejoin.amos</groupId> <groupId>com.yeejoin.amos</groupId>
<artifactId>YeeAmosFireAutoSysRoot</artifactId> <artifactId>YeeAmosFireAutoSysRoot</artifactId>
<version>3.7.0.8</version> <version>3.7.0.9</version>
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.yeejoin.amos</groupId> <groupId>com.yeejoin.amos</groupId>
<artifactId>YeeAmosFireAutoSysCommon</artifactId> <artifactId>YeeAmosFireAutoSysCommon</artifactId>
<version>3.7.0.8</version> <version>3.7.0.9</version>
</dependency> </dependency>
<dependency> <dependency>
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java
View file @ 7f59c162
...@@ -979,7 +979,7 @@ public class ContingencyAction implements CustomerAction { ...@@ -979,7 +979,7 @@ public class ContingencyAction implements CustomerAction {
*/ */
@RuleMethod(methodLabel = "任务动作保存", project = "换流站消防专项预案") @RuleMethod(methodLabel = "任务动作保存", project = "换流站消防专项预案")
@Transactional @Transactional
public void saveTaskInfo(@MethodParam(paramLabel = "动作名称") String taskName, @MethodParam(paramLabel = "角色编码") String roleCode, @MethodParam(paramLabel = "任务编号") Integer taskNum, @MethodParam(paramLabel = "步骤编码") String stepCode, @MethodParam(paramLabel = "按钮json字符串") String buttonJson, @MethodParam(paramLabel = "预案对象") Object paramObj) { public void saveTaskInfo(@MethodParam(paramLabel = "任务名称") String taskName, @MethodParam(paramLabel = "角色编码") String roleCode, @MethodParam(paramLabel = "任务编号") Integer taskNum, @MethodParam(paramLabel = "步骤编码") String stepCode, @MethodParam(paramLabel = "按钮json字符串") String buttonJson, @MethodParam(paramLabel = "预案对象") Object paramObj) {
ContingencyRo contingencyRo = (ContingencyRo) paramObj; ContingencyRo contingencyRo = (ContingencyRo) paramObj;
String batchNo = contingencyRo.getBatchNo(); String batchNo = contingencyRo.getBatchNo();
if (!findByBatchNoAndStatus(batchNo)) { if (!findByBatchNoAndStatus(batchNo)) {
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EmergencyTaskController.java
View file @ 7f59c162
...@@ -57,6 +57,7 @@ public class EmergencyTaskController extends BaseController{ ...@@ -57,6 +57,7 @@ public class EmergencyTaskController extends BaseController{
tree.setId(e.getId()); tree.setId(e.getId());
tree.setName(e.getDictName()); tree.setName(e.getDictName());
tree.setType("0"); tree.setType("0");
tree.setSequenceNbr(String.valueOf(e.getId()));
tree.setCode(e.getDictValue()); tree.setCode(e.getDictValue());
tree.setChildren(treeNodes.stream().filter(t->t.getObligationId().equals(e.getId())).collect(Collectors.toList())); tree.setChildren(treeNodes.stream().filter(t->t.getObligationId().equals(e.getId())).collect(Collectors.toList()));
list.add(tree); list.add(tree);
...@@ -65,6 +66,7 @@ public class EmergencyTaskController extends BaseController{ ...@@ -65,6 +66,7 @@ public class EmergencyTaskController extends BaseController{
//增加根节点 //增加根节点
EmergencyRelationTree tree = new EmergencyRelationTree(); EmergencyRelationTree tree = new EmergencyRelationTree();
tree.setId(0); tree.setId(0);
tree.setSequenceNbr("0");
tree.setName("全部"); tree.setName("全部");
tree.setType("3"); tree.setType("3");
tree.setCode("0"); tree.setCode("0");
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java
View file @ 7f59c162
...@@ -641,9 +641,10 @@ public class ContingencyInstanceImpl implements IContingencyInstance { ...@@ -641,9 +641,10 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
String img = ""; String img = null;
if ("SUCCESS".equals(responseModel.getDevMessage())) { if (responseModel != null && "SUCCESS".equals(responseModel.getDevMessage())) {
img = JSON.toJSONString(responseModel.getResult()).replace("\"",""); String resStr = JSON.toJSONString(responseModel.getResult()).replace("\"","");
img = "null".equalsIgnoreCase(resStr) ? null : img;
} }
img = StringUtils.isEmpty(img) ? personImg : img; img = StringUtils.isEmpty(img) ? personImg : img;
contingencyPlanInstance.setPersonImg(img); contingencyPlanInstance.setPersonImg(img);
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyPlanServiceImpl.java
View file @ 7f59c162
...@@ -251,12 +251,30 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService { ...@@ -251,12 +251,30 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
result.setBatchNo(batchNo); result.setBatchNo(batchNo);
equipmentHandlerService.executeDynamicPlan(batchNo, deviceData, equipment, equipmentSpecific, toke, operationRecord.getId()); equipmentHandlerService.executeDynamicPlan(batchNo, deviceData, equipment, equipmentSpecific, toke, operationRecord.getId());
// app端使用 // app端使用
ContingencyRo contingencyRo = new ContingencyRo();
contingencyRo.setBatchNo(batchNo);
contingencyRo.setEquipmentId(String.valueOf(equipment.getId()));
contingencyRo.setEquipmentName(equipment.getName());
contingencyRo.setFireEquipmentId(String.valueOf(equipmentSpecific.getId()));
contingencyRo.setFireEquipmentName(equipmentSpecific.getName());
contingencyRo.setFireEquipmentCode(equipmentSpecific.getCode());
contingencyRo.setStep("0");
contingencyRo.setConfirm("NONE");
contingencyRo.setFireTruckRoute(equipment.getFireTruckRoute());
contingencyRo.setRunstep(false);
contingencyRo.setEquipmentPosition3d(equipment.getPosition3d());
contingencyRo.setEquipmentCode(equipment.getCode());
contingencyRo.setEquipmentOrgCode(equipment.getOrgCode());
contingencyRo.getParams().put("equipmentId", equipment.getId());
contingencyRo.setPosition(equipmentSpecific.getPosition());
String topic = String.format("/%s/%s/%s", serviceName, stationName, "plan"); String topic = String.format("/%s/%s/%s", serviceName, stationName, "plan");
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
JSONObject msgContext = new JSONObject(); JSONObject msgContext = new JSONObject();
msgContext.put("content", "startPlanFirst"); msgContext.put("content", "startPlanFirst");
map.put("contingency", new ContingencyRo()); map.put("contingency", new ContingencyRo());
// map.put("msgContext", "{\"content\":\"startPlan\"}"); // map.put("msgContext", "{\"content\":\"startPlan\"}");
msgContext.put("content", "startPlan");
map.put("contingency", contingencyRo);
map.put("msgContext", msgContext); map.put("msgContext", msgContext);
map.put("msgType", "refreshRecord"); map.put("msgType", "refreshRecord");
webMqttComponent.publish(topic, JSON.toJSONString(map)); webMqttComponent.publish(topic, JSON.toJSONString(map));
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentFireEquipmentServiceImpl.java
View file @ 7f59c162
...@@ -172,7 +172,6 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen ...@@ -172,7 +172,6 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
} }
return false; return false;
} }
@Override @Override
public Object automaticExecutePoint(Integer index) { public Object automaticExecutePoint(Integer index) {
if (ObjectUtils.isEmpty(index)) { if (ObjectUtils.isEmpty(index)) {
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java
View file @ 7f59c162
...@@ -495,8 +495,9 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService { ...@@ -495,8 +495,9 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
e.printStackTrace(); e.printStackTrace();
} }
String img = ""; String img = "";
if ("SUCCESS".equals(responseModel.getDevMessage())) { if (responseModel != null && "SUCCESS".equals(responseModel.getDevMessage())) {
img = JSON.toJSONString(responseModel.getResult()).replace("\"",""); String resStr = JSON.toJSONString(responseModel.getResult()).replace("\"","");
img = "null".equalsIgnoreCase(resStr) ? null : img;
} }
img = StringUtils.isEmpty(img) ? personImg : img; img = StringUtils.isEmpty(img) ? personImg : img;
// Map<String, String> userInfo = contingencyPlanInstanceMapper.getUserByUserId(user.getUserId()); // Map<String, String> userInfo = contingencyPlanInstanceMapper.getUserByUserId(user.getUserId());
...@@ -708,8 +709,9 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService { ...@@ -708,8 +709,9 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
e.printStackTrace(); e.printStackTrace();
} }
String img = ""; String img = "";
if ("SUCCESS".equals(responseModel.getDevMessage())) { if (responseModel != null && "SUCCESS".equals(responseModel.getDevMessage())) {
img = JSON.toJSONString(responseModel.getResult()).replace("\"",""); String resStr = JSON.toJSONString(responseModel.getResult()).replace("\"","");
img = "null".equalsIgnoreCase(resStr) ? null : img;
} }
img = StringUtils.isEmpty(img) ? personImg : img; img = StringUtils.isEmpty(img) ? personImg : img;
if (runStatus) { if (runStatus) {
......
YeeAmosFireAutoSysStart/pom.xml
View file @ 7f59c162
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<parent> <parent>
<groupId>com.yeejoin.amos</groupId> <groupId>com.yeejoin.amos</groupId>
<artifactId>YeeAmosFireAutoSysRoot</artifactId> <artifactId>YeeAmosFireAutoSysRoot</artifactId>
<version>3.7.0.8</version> <version>3.7.0.9</version>
</parent> </parent>
<dependencies> <dependencies>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<dependency> <dependency>
<groupId>com.yeejoin.amos</groupId> <groupId>com.yeejoin.amos</groupId>
<artifactId>YeeAmosFireAutoSysService</artifactId> <artifactId>YeeAmosFireAutoSysService</artifactId>
<version>3.7.0.8</version> <version>3.7.0.9</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml
View file @ 7f59c162
...@@ -857,4 +857,72 @@ ...@@ -857,4 +857,72 @@
ADD COLUMN `step_code` varchar(20) NULL AFTER `task_sort`; ADD COLUMN `step_code` varchar(20) NULL AFTER `task_sort`;
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="CZ" id="202305101936">
<preConditions onFail="MARK_RAN">
</preConditions>
<comment>增加应急角色</comment>
<sql>
REPLACE INTO `f_dict`(`id`, `dict_name`, `dict_code`, `parent_id`, `is_delete`, `dict_value`, `dict_order`, `remark`) VALUES (47, '管理人员G1', 'YJZC', 0, b'0', 'adminG1', 0, '预案角色');
REPLACE INTO `f_dict`(`id`, `dict_name`, `dict_code`, `parent_id`, `is_delete`, `dict_value`, `dict_order`, `remark`) VALUES (48, '值班长S1', 'YJZC', 0, b'0', 'dutyLeaderS1', 1, '预案角色');
REPLACE INTO `f_dict`(`id`, `dict_name`, `dict_code`, `parent_id`, `is_delete`, `dict_value`, `dict_order`, `remark`) VALUES (49, '副值班长S2', 'YJZC', 0, b'0', 'deputyDutyLeaderS2', 2, '预案角色');
REPLACE INTO `f_dict`(`id`, `dict_name`, `dict_code`, `parent_id`, `is_delete`, `dict_value`, `dict_order`, `remark`) VALUES (50, '值班员A1', 'YJZC', 0, b'0', 'dutyCivilianA1', 3, '预案角色');
REPLACE INTO `f_dict`(`id`, `dict_name`, `dict_code`, `parent_id`, `is_delete`, `dict_value`, `dict_order`, `remark`) VALUES (51, '值班员A2', 'YJZC', 0, b'0', 'dutyCivilianA2', 4, '预案角色');
REPLACE INTO `f_dict`(`id`, `dict_name`, `dict_code`, `parent_id`, `is_delete`, `dict_value`, `dict_order`, `remark`) VALUES (52, '值班员A3', 'YJZC', 0, b'0', 'dutyCivilianA3', 5, '预案角色');
REPLACE INTO `f_dict`(`id`, `dict_name`, `dict_code`, `parent_id`, `is_delete`, `dict_value`, `dict_order`, `remark`) VALUES (53, '白班B1', 'YJZC', 0, b'0', 'dayShiftB1', 6, '预案角色');
REPLACE INTO `f_dict`(`id`, `dict_name`, `dict_code`, `parent_id`, `is_delete`, `dict_value`, `dict_order`, `remark`) VALUES (54, '白班B2', 'YJZC', 0, b'0', 'nightShiftB2', 7, '预案角色');
</sql>
</changeSet>
<changeSet author="chenzhao" id="20230510-1">
<preConditions onFail="MARK_RAN">
<not>
<tableExists tableName="c_emergency_relation" />
</not>
</preConditions>
<comment>create table c_emergency_relation</comment>
<sql>
CREATE TABLE `c_emergency_relation` (
`id` int NOT NULL AUTO_INCREMENT COMMENT '主键',
`obligationId` bigint DEFAULT NULL COMMENT '职责id\r\n',
`person_id` bigint DEFAULT NULL COMMENT '人员id',
`amos_id` bigint DEFAULT NULL COMMENT '平台人员id',
`person_name` varchar(255) DEFAULT NULL COMMENT '人员名称',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=85 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
</sql>
</changeSet>
<changeSet author="chenzhao" id="20230510-2">
<preConditions onFail="MARK_RAN">
<not>
<tableExists tableName="c_emergency_task_content" />
</not>
</preConditions>
<comment>create table c_emergency_task_content</comment>
<sql>
CREATE TABLE `c_emergency_task_content` (
`id` bigint NOT NULL AUTO_INCREMENT,
`content` varchar(1000) DEFAULT NULL COMMENT '分工内容\r\n',
`code` varchar(255) DEFAULT NULL COMMENT '编码',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`obligation_id` bigint DEFAULT NULL COMMENT '职责id',
`obligation_name` varchar(255) DEFAULT NULL COMMENT '职责名称',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
</sql>
</changeSet>
<changeSet author="keyong" id="1682647357-1">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="contingency_plan_instance" columnName="category" />
</not>
</preConditions>
<comment>修改contingency_plan_instance表结构</comment>
<sql>
ALTER TABLE `contingency_plan_instance` MODIFY COLUMN `category` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '一级分类' AFTER `record_type`;
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_emergency_task.xml
View file @ 7f59c162
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
SELECT SELECT
cer.person_id as id, cer.person_id as id,
cer.person_id as sequenceNbr,
cer.person_name as name, cer.person_name as name,
cer.obligationId as obligationId, cer.obligationId as obligationId,
'1' as type '1' as type
......
YeeAmosFireAutoSysStart/src/main/resources/json/plan-step-poyanghu.json
View file @ 7f59c162
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
}, },
{ {
"stepCode": "15", "stepCode": "15",
"stepName": "全站广播通报火情", "stepName": "全站广播通报火情、通知驻站消防队",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "ALL_STATION_PA", "buttonCode": "ALL_STATION_PA",
"isParallel": "1", "isParallel": "1",
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
}, },
{ {
"stepCode": "16", "stepCode": "16",
"stepName": "停运起火换流器", "stepName": "停运起火换流器、驻站消防队开始灭火",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "STOP_FIRE_TRANSVERTER", "buttonCode": "STOP_FIRE_TRANSVERTER",
"isParallel": "0", "isParallel": "0",
......
YeeAmosFireAutoSysStart/src/main/resources/json/plan-step-yinan-yingji1.0.json 0 → 100644
View file @ 7f59c162
[
{
"stepCode": "0",
"stepName": "确认灾情",
"stepStatus": "0",
"buttonCode": "FIRE_CONFIRM",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A",
"index": 0,
"checkYesOrNo": ""
},
{
"stepCode": "1",
"stepName": "停运换流阀",
"stepStatus": "0",
"buttonCode": "STOP_COMMUTATION",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A",
"index": 1,
"checkYesOrNo": "",
"condition": [
{
"equipName": "换流器",
"equipCode": "92261200S7944",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "DCCP_DCCPStreamTransformerCharged",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "2",
"stepName": "拨打报警电话",
"stepStatus": "0",
"buttonCode": "CALL_PHONE",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 2,
"checkYesOrNo": ""
},
{
"stepCode": "3",
"stepName": "确认油枕排油系统已开启",
"stepStatus": "0",
"buttonCode": "DRAIN_OIL_CONFIRM",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 3,
"checkYesOrNo": "",
"condition": [
{
"equipName": "排油阀",
"equipCode": "92102700EBA44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "ONL_OilDischargeDeviceOilPillowDischargeOpen",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "4",
"stepName": "确认水喷雾系统已开启",
"stepStatus": "0",
"buttonCode": "OPEN_WATERSYSTEM",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 4,
"checkYesOrNo": "",
"condition": [
{
"equipName": "雨淋阀",
"equipCode": "92130300BH644",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "WSS_DelugeValve_Start",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "5",
"stepName": "断开上级电源",
"stepStatus": "0",
"buttonCode": "OFF_POWER",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 5,
"checkYesOrNo": ""
},
{
"stepCode": "6",
"stepName": "停运阀厅空调系统",
"stepStatus": "0",
"buttonCode": "STOP_AIRCON",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 6,
"checkYesOrNo": ""
},
{
"stepCode": "7",
"stepName": "一键开启消防炮",
"stepStatus": "0",
"buttonCode": "MONITOR_START",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 7,
"checkYesOrNo": "",
"condition": [
{
"equipName": "消防炮阀",
"equipCode": "92032200BUX44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "CAFS_CAFSFireGunEquipmentValveStatus",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "8",
"stepName": "驻站消防队指挥权交接",
"stepStatus": "0",
"buttonCode": "HANDOVER_COMMAND",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_B",
"index": 8,
"checkYesOrNo": ""
},
{
"stepCode": "9",
"stepName": "确认本体排油已开启",
"stepStatus": "0",
"buttonCode": "OWNER_DRAIN_OIL",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 9,
"checkYesOrNo": "",
"condition": [
{
"equipName": "排油阀",
"equipCode": "92102700EBA44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "ONL_OilDischargeDeviceOilyPillowDischargeOpen",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "10",
"stepName": "启动阀厅应急预案",
"stepStatus": "0",
"buttonCode": "START_VALVE_HALL_CONTINGENCY",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 10,
"checkYesOrNo": ""
},
{
"stepCode": "11",
"stepName": "电缆沟封堵",
"stepStatus": "0",
"buttonCode": "PLUG_CABLETRENCH",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 11,
"checkYesOrNo": ""
},
{
"stepCode": "12",
"stepName": "政府消防队指挥权交接",
"stepStatus": "0",
"buttonCode": "HANDOVER_FIGTHHING",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 12,
"checkYesOrNo": ""
},
{
"stepCode": "13",
"stepName": "确认明火扑灭",
"stepStatus": "0",
"buttonCode": "FIRE_EXTINCT",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 13,
"checkYesOrNo": ""
},
{
"stepCode": "14",
"stepName": "应急处置结束",
"stepStatus": "0",
"buttonCode": "END_EMERGENCY",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_B",
"index": 14,
"checkYesOrNo": ""
}
]
\ No newline at end of file
YeeAmosFireAutoSysStart/src/main/resources/json/plan-step.json
View file @ 7f59c162
[ [
{ {
"stepCode": "0", "stepCode": "0",
"stepName": "确认灾情", "stepName": "确认火情",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "FIRE_CONFIRM", "buttonCode": "FIRE_CONFIRM",
"isParallel": "1", "isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_A",
"index": 0, "index": 0,
"isAuto": 0,
"checkYesOrNo": "" "checkYesOrNo": ""
}, },
{ {
"stepCode": "1", "stepCode": "15",
"stepName": "停运换流阀", "stepName": "全站广播通报火情",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "STOP_COMMUTATION", "buttonCode": "ALL_STATION_PA",
"isParallel": "1", "isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_A",
"index": 1, "index": 1,
"checkYesOrNo": "", "isAuto": 0,
"condition": [ "checkYesOrNo": ""
{
"equipName": "换流器",
"equipCode": "92261200S7944",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "DCCP_DCCPStreamTransformerCharged",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
}, },
{ {
"stepCode": "2", "stepCode": "2",
"stepName": "拨打报警电话", "stepName": "拨打火警电话",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "CALL_PHONE", "buttonCode": "CALL_PHONE",
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_A",
"index": 2, "index": 2,
"isAuto": 0,
"checkYesOrNo": "" "checkYesOrNo": ""
}, },
{ {
"stepCode": "3", "stepCode": "16",
"stepName": "确认油枕排油系统已开启", "stepName": "停运起火换流器",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "DRAIN_OIL_CONFIRM", "buttonCode": "STOP_FIRE_TRANSVERTER",
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_A",
"index": 3, "index": 3,
"checkYesOrNo": "",
"condition": [ "condition": [
{ {
"equipName": "排油阀", "equipName": "开关",
"equipCode": "92102700EBA44", "equipCode": "590000003EB44",
"equipSpeName": "", "equipSpeName": "",
"equipSpeCode": "", "equipSpeCode": "",
"equipSpeIndexKey": "ONL_OilDischargeDeviceOilPillowDischargeOpen", "equipSpeIndexKey": "Running_Alarm",
"standardValue": "true", "standardValue": "false",
"inAndOr": "and" "inAndOr": "and"
} }
], ],
"outAndOr": "and", "outAndOr": "and",
"isAuto": 0 "isAuto": 0,
"checkYesOrNo": ""
}, },
{ {
"stepCode": "4", "stepCode": "3",
"stepName": "确认水喷雾系统已开启", "stepName": "确认油枕排油系统已开启",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "OPEN_WATERSYSTEM", "buttonCode": "DRAIN_OIL_CONFIRM",
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_A",
"index": 4, "index": 4,
"checkYesOrNo": "",
"condition": [ "condition": [
{ {
"equipName": "雨淋阀", "equipName": "排油阀",
"equipCode": "92130300BH644", "equipCode": "92100400VWE44",
"equipSpeName": "", "equipSpeName": "",
"equipSpeCode": "", "equipSpeCode": "",
"equipSpeIndexKey": "WSS_DelugeValve_Start", "equipSpeIndexKey": "ONL_DrainOilValve_Open",
"standardValue": "true", "standardValue": "true",
"inAndOr": "and" "inAndOr": "and"
} }
], ],
"outAndOr": "and", "outAndOr": "and",
"isAuto": 0 "isAuto": 0,
"checkYesOrNo": ""
}, },
{ {
"stepCode": "5", "stepCode": "4",
"stepName": "断开上级电源", "stepName": "泡沫喷淋系统已开启",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "OFF_POWER", "buttonCode": "OPEN_WATERSYSTEM",
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_A",
"index": 5, "index": 5,
"condition": [
{
"equipName": "主机",
"equipCode": "92030100TGX44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "CAFS_CompAirFoamHost_Outfire",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0,
"checkYesOrNo": "" "checkYesOrNo": ""
}, },
{ {
"stepCode": "6", "stepCode": "7",
"stepName": "停运阀厅空调系统", "stepName": "一键启动消防炮",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "STOP_AIRCON", "buttonCode": "MONITOR_START",
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_A",
"index": 6, "index": 6,
"condition": [
{
"equipName": "CAFS消防炮",
"equipCode": "92032200BUX44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "CAFS_GunValve_Open",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0,
"checkYesOrNo": "" "checkYesOrNo": ""
}, },
{ {
"stepCode": "7", "stepCode": "17",
"stepName": "一键开启消防炮", "stepName": "消防泵正常启动",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "MONITOR_START", "buttonCode": "FIRE_PUMP_START",
"isParallel": "0", "isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_A",
"index": 7, "index": 7,
"checkYesOrNo": "",
"condition": [ "condition": [
{ {
"equipName": "消防炮阀", "equipName": "消防泵",
"equipCode": "92032200BUX44", "equipCode": "920106007GV44",
"equipSpeName": "", "equipSpeName": "",
"equipSpeCode": "", "equipSpeCode": "",
"equipSpeIndexKey": "CAFS_CAFSFireGunEquipmentValveStatus", "equipSpeIndexKey": "FHS_FirePump_Start",
"standardValue": "true", "standardValue": "true",
"inAndOr": "and" "inAndOr": "or"
} }
], ],
"outAndOr": "and", "outAndOr": "and",
"isAuto": 0 "isAuto": 0,
"checkYesOrNo": ""
}, },
{ {
"stepCode": "8", "stepCode": "18",
"stepName": "驻站消防队指挥权交接", "stepName": "向各级调度、领导汇报火情",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "HANDOVER_COMMAND", "buttonCode": "LEADER_REPORT_FIRE",
"isParallel": "1", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 8, "index": 8,
"isAuto": 0,
"checkYesOrNo": "" "checkYesOrNo": ""
}, },
{ {
"stepCode": "9", "stepCode": "19",
"stepName": "确认本体排油已开启", "stepName": "停运本极对端换流器",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "OWNER_DRAIN_OIL", "buttonCode": "STOP_LOCAL_END_TRANSVERTER",
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 9, "index": 9,
"checkYesOrNo": "",
"condition": [ "condition": [
{ {
"equipName": "排油阀", "equipName": "开关",
"equipCode": "92102700EBA44", "equipCode": "590000003EB44",
"equipSpeName": "", "equipSpeName": "",
"equipSpeCode": "", "equipSpeCode": "",
"equipSpeIndexKey": "ONL_OilDischargeDeviceOilyPillowDischargeOpen", "equipSpeIndexKey": "Running_Alarm",
"standardValue": "true", "standardValue": "false",
"inAndOr": "and" "inAndOr": "and"
} }
], ],
"outAndOr": "and", "outAndOr": "and",
"isAuto": 0 "isAuto": 0,
"checkYesOrNo": ""
}, },
{ {
"stepCode": "10", "stepCode": "20",
"stepName": "启动阀厅应急预案", "stepName": "停运阀冷系统",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "START_VALVE_HALL_CONTINGENCY", "buttonCode": "STOP_VALVE_COOL_SYS",
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 10, "index": 10,
"condition": [
{
"equipName": "阀冷系统主机",
"equipCode": "59000000H9G44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "normal_running_state",
"standardValue": "false",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0,
"checkYesOrNo": "" "checkYesOrNo": ""
}, },
{ {
"stepCode": "11", "stepCode": "6",
"stepName": "电缆沟封堵", "stepName": "停运阀厅空调系统",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "PLUG_CABLETRENCH", "buttonCode": "STOP_AIRCON",
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 11, "index": 11,
"condition": [
{
"equipName": "AIRCS-风机",
"equipCode": "92230600UH244",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "AIRCS_Fan_Start",
"standardValue": "false",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0,
"checkYesOrNo": "" "checkYesOrNo": ""
}, },
{ {
"stepCode": "12", "stepCode": "5",
"stepName": "政府消防队指挥权交接", "stepName": "断开冷却器上级电源",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "HANDOVER_FIGTHHING", "buttonCode": "OFF_POWER",
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 12, "index": 12,
"isAuto": 0,
"checkYesOrNo": ""
},
{
"stepCode": "21",
"stepName": "起火换流器转检修",
"stepStatus": "0",
"buttonCode": "FIRE_TRANSVERTER_TO_OVERHAUL",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 13,
"condition": [
{
"equipName": "地刀",
"equipCode": "59000000SAT44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "Running_Alarm",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0,
"checkYesOrNo": ""
},
{
"stepCode": "22",
"stepName": "对阀侧套管、阀厅进行降温",
"stepStatus": "0",
"buttonCode": "VALVE_HALL_COOL",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_B",
"index": 14,
"isAuto": 0,
"checkYesOrNo": ""
},
{
"stepCode": "8",
"stepName": "驻站消防队指挥权交接",
"stepStatus": "0",
"buttonCode": "HANDOVER_COMMAND",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 15,
"isAuto": 0,
"checkYesOrNo": "" "checkYesOrNo": ""
}, },
{ {
...@@ -201,7 +290,30 @@ ...@@ -201,7 +290,30 @@
"buttonCode": "FIRE_EXTINCT", "buttonCode": "FIRE_EXTINCT",
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 13, "index": 16,
"isAuto": 0,
"checkYesOrNo": ""
},
{
"stepCode": "23",
"stepName": "确认无复燃情况",
"stepStatus": "0",
"buttonCode": "CONFIRM_REKINDLE",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 17,
"isAuto": 0,
"checkYesOrNo": ""
},
{
"stepCode": "24",
"stepName": "向各级调度、领导汇报已灭火",
"stepStatus": "0",
"buttonCode": "LEADER_REPORT_FIRE_EXTINCT",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 18,
"isAuto": 0,
"checkYesOrNo": "" "checkYesOrNo": ""
}, },
{ {
...@@ -211,7 +323,8 @@ ...@@ -211,7 +323,8 @@
"buttonCode": "END_EMERGENCY", "buttonCode": "END_EMERGENCY",
"isParallel": "1", "isParallel": "1",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 14, "index": 19,
"isAuto": 0,
"checkYesOrNo": "" "checkYesOrNo": ""
} }
] ]
\ No newline at end of file
pom.xml
View file @ 7f59c162
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.yeejoin.amos</groupId> <groupId>com.yeejoin.amos</groupId>
<artifactId>YeeAmosFireAutoSysRoot</artifactId> <artifactId>YeeAmosFireAutoSysRoot</artifactId>
<version>3.7.0.8</version> <version>3.7.0.9</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>YeeAmosFireAutoSysRoot</name> <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