Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 75e226bf authored by KeYong's avatar KeYong
Browse files
Options

修改多指标判断bug

parent 2a00ef4e
Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 98 deletions
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific_index.xml
View file @ 75e226bf
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<choose> <choose>
<when test = "outAndOr != null and outAndOr != '' and outAndOr == 'and'"> <when test = "outAndOr != null and outAndOr != '' and outAndOr == 'and'">
<if test="list != null and list.size() > 0"> <if test="list != null and list.size() > 0">
<foreach collection="list" item="item" index="index" open="(" close=")" separator="and"> <foreach collection="list" item="item" index="index" open="(" close=")" separator="or">
esi.equipment_index_key = #{item.equipSpeIndexKey} and es.equipment_code = #{item.equipCode} esi.equipment_index_key = #{item.equipSpeIndexKey} and es.equipment_code = #{item.equipCode}
</foreach> </foreach>
</if> </if>
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
<choose> <choose>
<when test = "outAndOr != null and outAndOr != '' and outAndOr == 'and'"> <when test = "outAndOr != null and outAndOr != '' and outAndOr == 'and'">
<if test="list != null and list.size() > 0"> <if test="list != null and list.size() > 0">
<foreach collection="list" item="item" index="index" open="(" close=")" separator="and"> <foreach collection="list" item="item" index="index" open="(" close=")" separator="or">
esi.equipment_index_key = #{item.equipSpeIndexKey} and es.equipment_code = #{item.equipCode} and esi.`value` = #{item.standardValue} esi.equipment_index_key = #{item.equipSpeIndexKey} and es.equipment_code = #{item.equipCode} and esi.`value` = #{item.standardValue}
</foreach> </foreach>
</if> </if>
......
YeeAmosFireAutoSysStart/src/main/resources/json/plan-step-UHV-gk.json
View file @ 75e226bf
[ [
{ {
"stepCode": "0",
"stepName": "确认火情",
"stepStatus": "0",
"buttonCode": "FIRE_CONFIRM", "buttonCode": "FIRE_CONFIRM",
"checkYesOrNo": "",
"index": 0,
"isParallel": "1", "isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_A",
"index": 0, "showLine": false,
"checkYesOrNo": "" "stepCode": "0",
"stepName": "确认火情",
"stepStatus": "0",
"time": "",
"videos": {
"011020000000000005037148": [
{
"code": "02160558348620370101#ab53af9ab7a143f6961559c403a4b5cc",
"name": "主控楼3楼平台-东-25#枪机"
},
{
"code": "02160558348620370102#ab53af9ab7a143f6961559c403a4b5cc",
"name": "主控楼楼顶-北-26#枪机"
},
{
"code": "02160558348620370103#ab53af9ab7a143f6961559c403a4b5cc",
"name": "主控楼3楼平台-南-27#枪机"
}
],
"011020000000000005037216": [
{
"code": "02160558348620370101#ab53af9ab7a143f6961559c403a4b5cc",
"name": "主控楼3楼平台-东-25#枪机"
}
]
}
}, },
{ {
"stepCode": "1",
"stepName": "汇报，通知，报警",
"stepStatus": "0",
"buttonCode": "CALL_PHONE", "buttonCode": "CALL_PHONE",
"checkYesOrNo": "",
"index": 1,
"isParallel": "1", "isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_A",
"index": 1, "showLine": false,
"checkYesOrNo": "" "stepCode": "1",
"stepName": "汇报，通知，报警",
"stepStatus": "0",
"time": "",
"videos": {
}
}, },
{ {
"stepCode": "2",
"stepName": "确认开关跳闸",
"stepStatus": "0",
"buttonCode": "OPEN_THREE_SIDE_SWITCHES", "buttonCode": "OPEN_THREE_SIDE_SWITCHES",
"isParallel": "0", "checkYesOrNo": "",
"roleCode": "Digital_Responsing_Plan_A",
"index": 2, "index": 2,
"isAuto": 0, "isAuto": 0,
"checkYesOrNo": "" "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"showLine": false,
"stepCode": "2",
"stepName": "确认开关跳闸",
"stepStatus": "0",
"time": "",
"videos": {
}
}, },
{ {
"stepCode": "3",
"stepName": "检查固定喷雾灭火设施启动",
"stepStatus": "0",
"buttonCode": "OPEN_SPRAYINGSYSTEM", "buttonCode": "OPEN_SPRAYINGSYSTEM",
"isParallel": "0", "checkYesOrNo": "",
"roleCode": "Digital_Responsing_Plan_A",
"index": 3, "index": 3,
"condition": [
{
"equipName": "主机",
"equipCode": "92030100TGX44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "CAFS_CompAirFoamHost_Outfire",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0, "isAuto": 0,
"checkYesOrNo": "" "isParallel": "0",
"outAndOr": "and",
"roleCode": "Digital_Responsing_Plan_A",
"showLine": false,
"stepCode": "3",
"stepName": "检查固定喷雾灭火设施启动",
"stepStatus": "0",
"time": "",
"videos": {
"011020000000000005037148": [
{
"code": "02160558346497790101#ab53af9ab7a143f6961559c403a4b5cc",
"name": "绍兴变-综合楼4楼走廊-北侧-1#球机"
},
{
"code": "02160558346497790102#ab53af9ab7a143f6961559c403a4b5cc",
"name": "800kV绍兴变-综合楼4楼走廊南侧2"
}
]
}
}, },
{ {
"stepCode": "4",
"stepName": "启动CAFS消防系统",
"stepStatus": "0",
"buttonCode": "OPEN_WATERSYSTEM", "buttonCode": "OPEN_WATERSYSTEM",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 4,
"checkYesOrNo": "", "checkYesOrNo": "",
"condition": [ "index": 4,
{ "isAuto": 0,
"equipName": "雨淋阀", "isParallel": "0",
"equipCode": "92130300BH644",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "WSS_DelugeValve_Start",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and", "outAndOr": "and",
"isAuto": 0 "roleCode": "Digital_Responsing_Plan_A",
"showLine": false,
"stepCode": "4",
"stepName": "启动CAFS消防系统",
"stepStatus": "0",
"time": "",
"videos": {
}
}, },
{ {
"buttonCode": "DRAIN_OIL_CONFIRM",
"checkYesOrNo": "",
"index": 5,
"isAuto": 0,
"isParallel": "0",
"outAndOr": "and",
"roleCode": "Digital_Responsing_Plan_A",
"showLine": false,
"stepCode": "5", "stepCode": "5",
"stepName": "启动CAFS举高灭火机器人", "stepName": "启动应急排油",
"stepStatus": "0", "stepStatus": "0",
"time": "",
"videos": {
}
},
{
"buttonCode": "START_TURBOFAN_ROBOT", "buttonCode": "START_TURBOFAN_ROBOT",
"checkYesOrNo": "",
"index": 6,
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 5, "showLine": false,
"checkYesOrNo": ""
},
{
"stepCode": "6", "stepCode": "6",
"stepName": "申请调检修", "stepName": "启动CAFS举高灭火机器人",
"stepStatus": "0", "stepStatus": "0",
"time": "",
"videos": {
}
},
{
"buttonCode": "APPLY_FOR_OVERHAUL", "buttonCode": "APPLY_FOR_OVERHAUL",
"checkYesOrNo": "",
"index": 7,
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_A",
"index": 6, "showLine": false,
"checkYesOrNo": ""
},
{
"stepCode": "7", "stepCode": "7",
"stepName": "断开交、直流电源", "stepName": "申请调检修",
"stepStatus": "0", "stepStatus": "0",
"time": "",
"videos": {
"011020000000000005037148": [
{
"code": "02160558346973140133#ab53af9ab7a143f6961559c403a4b5cc",
"name": "极2高400KV穿墙套管区域_A18可见光"
},
{
"code": "02160558346973140134#ab53af9ab7a143f6961559c403a4b5cc",
"name": "极2高400KV穿墙套管区域_A18热成像"
},
{
"code": "02160558346497790127#ab53af9ab7a143f6961559c403a4b5cc",
"name": "绍兴变-极2高蓄电池室1-西北角-27#球机"
},
{
"code": "02160558346497790128#ab53af9ab7a143f6961559c403a4b5cc",
"name": "绍兴变-极2高阀冷设备室-东北角-28#球机"
},
{
"code": "02160558346497790131#ab53af9ab7a143f6961559c403a4b5cc",
"name": "绍兴变-极2高阀冷设备室-西南角-31#球机"
},
{
"code": "02160558346497790133#ab53af9ab7a143f6961559c403a4b5cc",
"name": "绍兴变-极2高阀冷控制室-东南角-33#球机"
},
{
"code": "02160558346497790134#ab53af9ab7a143f6961559c403a4b5cc",
"name": "绍兴变-极2高控保辅助设备-东南角-34#球机"
},
{
"code": "02160558346497790135#ab53af9ab7a143f6961559c403a4b5cc",
"name": "绍兴变-极2高蓄电池室3-西北角-35#球机"
},
{
"code": "02160558346497790136#ab53af9ab7a143f6961559c403a4b5cc",
"name": "绍兴变-极2高蓄电池室2-西南角-36#球机"
}
]
}
},
{
"buttonCode": "OFF_POWER", "buttonCode": "OFF_POWER",
"checkYesOrNo": "",
"index": 8,
"isParallel": "1", "isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_A",
"index": 7, "showLine": false,
"checkYesOrNo": ""
},
{
"stepCode": "8", "stepCode": "8",
"stepName": "执行转检修操作", "stepName": "断开交、直流电源",
"stepStatus": "0", "stepStatus": "0",
"time": "",
"videos": {
}
},
{
"buttonCode": "FIRE_TRANSVERTER_TO_OVERHAUL", "buttonCode": "FIRE_TRANSVERTER_TO_OVERHAUL",
"checkYesOrNo": "",
"index": 9,
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 8, "showLine": false,
"checkYesOrNo": ""
},
{
"stepCode": "9", "stepCode": "9",
"stepName": "电缆沟封堵", "stepName": "执行转检修操作",
"stepStatus": "0", "stepStatus": "0",
"time": "",
"videos": {
}
},
{
"buttonCode": "PLUG_CABLETRENCH", "buttonCode": "PLUG_CABLETRENCH",
"checkYesOrNo": "",
"index": 10,
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 9, "showLine": false,
"checkYesOrNo": ""
},
{
"stepCode": "10", "stepCode": "10",
"stepName": "政府消防队指挥权交接", "stepName": "电缆沟封堵",
"stepStatus": "0", "stepStatus": "0",
"time": "",
"videos": {
}
},
{
"buttonCode": "HANDOVER_FIGTHHING", "buttonCode": "HANDOVER_FIGTHHING",
"checkYesOrNo": "",
"index": 11,
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 10, "showLine": false,
"checkYesOrNo": ""
},
{
"stepCode": "11", "stepCode": "11",
"stepName": "确认明火扑灭，确认着火设备温度降为环境温度", "stepName": "政府消防队指挥权交接",
"stepStatus": "0", "stepStatus": "0",
"time": "",
"videos": {
}
},
{
"buttonCode": "FIRE_EXTINCT", "buttonCode": "FIRE_EXTINCT",
"checkYesOrNo": "",
"index": 12,
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 11, "showLine": false,
"checkYesOrNo": ""
},
{
"stepCode": "12", "stepCode": "12",
"stepName": "检查现场情况，汇报调度", "stepName": "确认明火扑灭，确认着火设备温度降为环境温度",
"stepStatus": "0", "stepStatus": "0",
"time": "",
"videos": {
}
},
{
"buttonCode": "ACCIDENT_REPORT", "buttonCode": "ACCIDENT_REPORT",
"checkYesOrNo": "",
"index": 13,
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 12, "showLine": false,
"checkYesOrNo": ""
},
{
"stepCode": "13", "stepCode": "13",
"stepName": "退出预案", "stepName": "检查现场情况，汇报调度",
"stepStatus": "0", "stepStatus": "0",
"time": "",
"videos": {
}
},
{
"buttonCode": "END_EMERGENCY", "buttonCode": "END_EMERGENCY",
"checkYesOrNo": "",
"index": 14,
"isParallel": "1", "isParallel": "1",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_B",
"index": 13, "showLine": false,
"checkYesOrNo": "" "stepCode": "14",
"stepName": "退出预案",
"stepStatus": "0",
"time": "",
"videos": {
}
} }
] ]
\ No newline at end of file
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