Skip to content

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

Merge remote-tracking branch 'origin/develop_dl_3.7.1.0' into develop_dl_3.7.1.0

parents 0d11124c a466afed
Hide whitespace changes
Inline Side-by-side
Showing with 919 additions and 129 deletions
YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/DutyPersonEnum.java
View file @ aa932249
...@@ -11,9 +11,9 @@ import java.util.Map; ...@@ -11,9 +11,9 @@ import java.util.Map;
*/ */
public enum DutyPersonEnum { public enum DutyPersonEnum {
FIRE_PERSON("驻站消防","fire"), FIRE_PERSON("驻站消防员","fire"),
OPS_PERSON("运维人员","ops"), OPS_PERSON("运维人员","ops"),
REAL_PERSON("物业安保","realEstate"); REAL_PERSON("物业安保人员","realEstate");
/** /**
* 名称，描述 * 名称，描述
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java
View file @ aa932249
...@@ -23,6 +23,7 @@ import org.slf4j.Logger; ...@@ -23,6 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -45,6 +46,7 @@ public class PlanVisual3dController extends BaseController { ...@@ -45,6 +46,7 @@ public class PlanVisual3dController extends BaseController {
private IPlanVisual3dService planVisual3dService; private IPlanVisual3dService planVisual3dService;
@Autowired @Autowired
@Lazy
private IEmergencyTaskService emergencyTaskService; private IEmergencyTaskService emergencyTaskService;
@Autowired @Autowired
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/RiskSourceController.java
View file @ aa932249
...@@ -727,17 +727,17 @@ public class RiskSourceController extends BaseController { ...@@ -727,17 +727,17 @@ public class RiskSourceController extends BaseController {
if (commonPageable.getPageNumber() == 0) { if (commonPageable.getPageNumber() == 0) {
commonPageable.setPageNumber(1); commonPageable.setPageNumber(1);
} }
ReginParams reginParams = getSelectedOrgInfo(); // ReginParams reginParams = getSelectedOrgInfo();
String orgCode = getOrgCode(reginParams); // String orgCode = getOrgCode(reginParams);
String bizOrgCode = null; String bizOrgCode = null;
if (StringUtil.isNotEmpty(orgCode)) { // if (StringUtil.isNotEmpty(orgCode)) {
bizOrgCode = contingencyPlanInstanceMapper.getBizOrgCode(orgCode); // bizOrgCode = contingencyPlanInstanceMapper.getBizOrgCode(orgCode);
if (!StringUtil.isNotEmpty(bizOrgCode)) { // if (!StringUtil.isNotEmpty(bizOrgCode)) {
return CommonResponseUtil.success(null); // return CommonResponseUtil.success(null);
} // }
} else { // } else {
return CommonResponseUtil.success(null); // return CommonResponseUtil.success(null);
} // }
return CommonResponseUtil.success(riskSourceService.getWaterInfo(commonPageable, bizOrgCode)); return CommonResponseUtil.success(riskSourceService.getWaterInfo(commonPageable, bizOrgCode));
} }
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/View3dController.java
View file @ aa932249
...@@ -257,16 +257,25 @@ public class View3dController extends BaseController { ...@@ -257,16 +257,25 @@ public class View3dController extends BaseController {
String token = this.getToken(); String token = this.getToken();
String appKey = this.getAppKey(); String appKey = this.getAppKey();
String product = this.getProduct(); String product = this.getProduct();
return view3dService.retrieve3All(params.getType(),
return view3dService.retrieveAll(params.getType(), params.getRiskSourceId(),
params.getRiskSourceId(), params.getAreaId(),
params.getInputText(), params.getEquipmentId(),
params.getCurrent(), params.getInputText(),
params.getPageSize(), params.getCurrent(),
orgCode, params.getPageSize(),
params.getDataLevel(), orgCode,
params.getProtectObjName(), params.getDataLevel(),
token,appKey,product); token,appKey,product);
// return view3dService.retrieveAll(params.getType(),
// params.getRiskSourceId(),
// params.getInputText(),
// params.getCurrent(),
// params.getPageSize(),
// orgCode,
// params.getDataLevel(),
// params.getProtectObjName(),
// token,appKey,product);
} }
@Permission @Permission
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ImpEquipMapper.java
View file @ aa932249
...@@ -4,6 +4,7 @@ import java.util.List; ...@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import com.yeejoin.amos.fas.business.bo.FireEquipmentBo;
import com.yeejoin.amos.fas.dao.dto.EquipmentDTO; import com.yeejoin.amos.fas.dao.dto.EquipmentDTO;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -24,4 +25,6 @@ public interface ImpEquipMapper extends BaseMapper { ...@@ -24,4 +25,6 @@ public interface ImpEquipMapper extends BaseMapper {
List<EquipmentDTO> reservePage(@Param("start") long start,@Param("length") int length); List<EquipmentDTO> reservePage(@Param("start") long start,@Param("length") int length);
Set<String> getAllCode(); Set<String> getAllCode();
FireEquipmentBo findImpEquipById (@Param("id") Long id);
} }
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/View3dMapper.java
View file @ aa932249
...@@ -103,7 +103,7 @@ public interface View3dMapper extends BaseMapper { ...@@ -103,7 +103,7 @@ public interface View3dMapper extends BaseMapper {
* @param orgCode * @param orgCode
* @return * @return
*/ */
List<SafetyExecuteBo> getRiskErrorTop5(String orgCode); List<SafetyExecuteBo> getRiskErrorTop5();
/** /**
* 巡检异常示最新5条 * 巡检异常示最新5条
...@@ -111,7 +111,7 @@ public interface View3dMapper extends BaseMapper { ...@@ -111,7 +111,7 @@ public interface View3dMapper extends BaseMapper {
* @param orgCode * @param orgCode
* @return * @return
*/ */
List<SafetyExecuteBo> getCheckErrorTop5(String orgCode); List<SafetyExecuteBo> getCheckErrorTop5();
/** /**
* 火灾告警最新5条 * 火灾告警最新5条
...@@ -119,7 +119,7 @@ public interface View3dMapper extends BaseMapper { ...@@ -119,7 +119,7 @@ public interface View3dMapper extends BaseMapper {
* @param orgCode * @param orgCode
* @return * @return
*/ */
List<SafetyExecuteBo> getFireAlarmTop5(String orgCode); List<SafetyExecuteBo> getFireAlarmTop5();
/** /**
* 设备状态最新5条 * 设备状态最新5条
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentFireEquipmentServiceImpl.java
View file @ aa932249
...@@ -191,20 +191,20 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen ...@@ -191,20 +191,20 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
String fireEquipId = String.valueOf(map.get("fireEquipId")); String fireEquipId = String.valueOf(map.get("fireEquipId"));
List<Long> fireEquipments = new ArrayList<>(); List<Long> fireEquipments = new ArrayList<>();
// 若是停运本极对端换流器，则需查出本极对应的电力设备列表，暂用电力设备名称过滤出本极电力设备，注意此处的电力设备按照标准有两极（极I，极II） // 若是停运本极对端换流器，则需查出本极对应的电力设备列表，暂用电力设备名称过滤出本极电力设备，注意此处的电力设备按照标准有两极（极I，极II）
if (stepIndex == index) { // if (stepIndex == index) {
Optional<Equipment> equipment = iEquipmentDao.findById(Long.valueOf(fireEquipId)); // Optional<Equipment> equipment = iEquipmentDao.findById(Long.valueOf(fireEquipId));
if (equipment.get() != null) { // if (equipment.get() != null) {
String fireEquipNamePrefix = equipment.get().getName().substring(0, 2); // String fireEquipNamePrefix = equipment.get().getName().substring(0, 2);
List<String> fireEquipIdList = equipmentSpecificMapper.getFireEquipIdsByNamePrefix(fireEquipNamePrefix); // List<String> fireEquipIdList = equipmentSpecificMapper.getFireEquipIdsByNamePrefix(fireEquipNamePrefix);
String[] strings = fireEquipIdList.toArray(new String[fireEquipIdList.size()]); // String[] strings = fireEquipIdList.toArray(new String[fireEquipIdList.size()]);
// 获取消防设备id列表 // // 获取消防设备id列表
fireEquipments = equipmentFireEquipmentService.findFireEquipmentIdsByEquipmentId(strings); // fireEquipments = equipmentFireEquipmentService.findFireEquipmentIdsByEquipmentId(strings);
} // }
} else { // } else {
String[] fireEquipIds = new String[]{fireEquipId}; String[] fireEquipIds = new String[]{fireEquipId};
// 获取消防设备id列表 // 获取消防设备id列表
fireEquipments = equipmentFireEquipmentService.findFireEquipmentIdsByEquipmentId(fireEquipIds); fireEquipments = equipmentFireEquipmentService.findFireEquipmentIdsByEquipmentId(fireEquipIds);
} // }
PlanStepJsonVO vo = result.stream().filter(x -> x.getIndex() == index).collect(Collectors.toList()).get(0); PlanStepJsonVO vo = result.stream().filter(x -> x.getIndex() == index).collect(Collectors.toList()).get(0);
List<ConditionVO> list = vo.getCondition(); List<ConditionVO> list = vo.getCondition();
...@@ -232,11 +232,11 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen ...@@ -232,11 +232,11 @@ public class EquipmentFireEquipmentServiceImpl implements IEquipmentFireEquipmen
planMessageDao.save(message); planMessageDao.save(message);
} }
} }
if (pumpStepIndex == index) { // if (pumpStepIndex == index) {
return 0 < resultSize; // return 0 < resultSize;
} else { // } else {
return (0 < resultSize && num == resultSize); return (0 < resultSize && num == resultSize);
} // }
} else { } else {
return false; return false;
} }
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireEquipServiceImpl.java
View file @ aa932249
...@@ -171,6 +171,7 @@ public class FireEquipServiceImpl implements IFireEquipService { ...@@ -171,6 +171,7 @@ public class FireEquipServiceImpl implements IFireEquipService {
break; break;
case extinguisher: case extinguisher:
case hydrant: case hydrant:
case fireEquipment:
case monitorEquipment: case monitorEquipment:
FireEquipmentBo fireEquipment = fireEquipMapper.findFireEquipById(id); FireEquipmentBo fireEquipment = fireEquipMapper.findFireEquipById(id);
fireEquipment.setEquipClassify(Integer.parseInt(EquipClassifyEnum.EQUIPMENT.getCode())); fireEquipment.setEquipClassify(Integer.parseInt(EquipClassifyEnum.EQUIPMENT.getCode()));
...@@ -189,6 +190,10 @@ public class FireEquipServiceImpl implements IFireEquipService { ...@@ -189,6 +190,10 @@ public class FireEquipServiceImpl implements IFireEquipService {
returnEntity = fireDetection; returnEntity = fireDetection;
break; break;
case impEquipment:
FireEquipmentBo impEquipment = impEquipMapper.findImpEquipById(id);
returnEntity = impEquipment;
break;
default: default:
throw new Exception("类型有误."); throw new Exception("类型有误.");
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/HandlerMqttMessageImpl.java
View file @ aa932249
...@@ -42,9 +42,11 @@ import org.springframework.util.CollectionUtils; ...@@ -42,9 +42,11 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.awt.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
...@@ -229,37 +231,37 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService { ...@@ -229,37 +231,37 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
} else if (EquipmentRiskTypeEnum.GZ.getCode().equals(typeCode)) { } else if (EquipmentRiskTypeEnum.GZ.getCode().equals(typeCode)) {
// 设备故障处理逻辑 // 设备故障处理逻辑
log.info("(故障)Message typeCode is: " + typeCode); log.info("(故障)Message typeCode is: " + typeCode);
final String stateTrue = "true"; // final String stateTrue = "true";
final String stateFalse = "false"; // final String stateFalse = "false";
String state = equipmentSpecificIndex.getValue(); // String state = equipmentSpecificIndex.getValue();
if (stateTrue.equals(state)) { // if (stateTrue.equals(state)) {
//故障 // //故障
notifyAlarm(equipmentSpecificIndex, 1); // notifyAlarm(equipmentSpecificIndex, 1);
} else if (stateFalse.equals(state)) { // } else if (stateFalse.equals(state)) {
//故障恢复 // //故障恢复
notifyAlarm(equipmentSpecificIndex, 0); // notifyAlarm(equipmentSpecificIndex, 0);
} // }
long equipId = 0; // long equipId = 0;
if (StringUtil.isNotEmpty(equipment)) { // if (StringUtil.isNotEmpty(equipment)) {
equipId = equipment.getId(); // equipId = equipment.getId();
// 是否关联风险点 // // 是否关联风险点
List<FmeaEquipmentPoint> list = fmeaEquipmentPointMapper.listFmeaByEquipIndexIdAndEquipId(equipmentSpecificIndex.getId(), equipId); // List<FmeaEquipmentPoint> list = fmeaEquipmentPointMapper.listFmeaByEquipIndexIdAndEquipId(equipmentSpecificIndex.getId(), equipId);
if (list.size() > 0) { // if (list.size() > 0) {
// 关联风险点进行rpn，rpni值的修改 // // 关联风险点进行rpn，rpni值的修改
list.forEach(fmeaEqPoint -> { // list.forEach(fmeaEqPoint -> {
long fmeaId = fmeaEqPoint.getFmeaId(); // long fmeaId = fmeaEqPoint.getFmeaId();
updateFmeaRpn(fmeaId); // updateFmeaRpn(fmeaId);
}); // });
} else { // } else {
// 没有关联风险点，三维页面消息推送 // // 没有关联风险点，三维页面消息推送
fireEquipRuleMessagePush(deviceData, toke); // fireEquipRuleMessagePush(deviceData, toke);
} // }
} // }
// 今日安全 // // 今日安全
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); // SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
String dateString = formatter.format(new Date()); // String dateString = formatter.format(new Date());
String topicOne = String.format("/%s/%s/%s/%s", serviceName, stationName, "data/refresh", "todaySafetyIndex"); // String topicOne = String.format("/%s/%s/%s/%s", serviceName, stationName, "data/refresh", "todaySafetyIndex");
webMqttComponent.publish(topicOne, JSON.toJSONString(view3dService.getSafetyIndexInfoByDate(equipmentSpecific.getOrgCode(), dateString))); // webMqttComponent.publish(topicOne, JSON.toJSONString(view3dService.getSafetyIndexInfoByDate(equipmentSpecific.getOrgCode(), dateString)));
refreshFireSafety(equipmentSpecific.getOrgCode()); refreshFireSafety(equipmentSpecific.getOrgCode());
String monitorData = String.format("/%s/%s/%s", serviceName, stationName, "data/refresh/monitorData"); String monitorData = String.format("/%s/%s/%s", serviceName, stationName, "data/refresh/monitorData");
...@@ -558,7 +560,10 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService { ...@@ -558,7 +560,10 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
BeanUtils.copyProperties(contingencyRo, contingencyOriginalData); BeanUtils.copyProperties(contingencyRo, contingencyOriginalData);
contingencyOriginalData.setFireEquipmentPosition(contingencyRo.getPosition()); contingencyOriginalData.setFireEquipmentPosition(contingencyRo.getPosition());
iContingencyOriginalDataDao.saveAndFlush(contingencyOriginalData); iContingencyOriginalDataDao.saveAndFlush(contingencyOriginalData);
// 由于现场服务环境运行较快，有概率导致无法弹出确警弹框
// sleep(3000);
log.info("开始调用规则 参数 contingencyRo{},reservePlan{},equipmentNames" + contingencyRo.toString() + "," + equipment.getReservePlan() + "," + ArrayUtils.toArray(equipment.getName())); log.info("开始调用规则 参数 contingencyRo{},reservePlan{},equipmentNames" + contingencyRo.toString() + "," + equipment.getReservePlan() + "," + ArrayUtils.toArray(equipment.getName()));
Object result = ruleTrigger.publish(contingencyRo, equipment.getReservePlan(), ArrayUtils.toArray(equipment.getName())); Object result = ruleTrigger.publish(contingencyRo, equipment.getReservePlan(), ArrayUtils.toArray(equipment.getName()));
log.info("规则调用返回==", result); log.info("规则调用返回==", result);
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java
View file @ aa932249
...@@ -420,6 +420,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService { ...@@ -420,6 +420,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
} }
x.setTime(DateFormatUtils.format(new Date(), "HH:mm:ss")); x.setTime(DateFormatUtils.format(new Date(), "HH:mm:ss"));
} }
x.setStepStatus(x.getCheckYesOrNo());
x.setBatchNo(batchNo); x.setBatchNo(batchNo);
x.setCaseId(contingencyPlanId); x.setCaseId(contingencyPlanId);
x.setButtonJson(buttonJson); x.setButtonJson(buttonJson);
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/View3dServiceImpl.java
View file @ aa932249
...@@ -446,11 +446,11 @@ public class View3dServiceImpl implements IView3dService { ...@@ -446,11 +446,11 @@ public class View3dServiceImpl implements IView3dService {
StatisticsErrorTypeEum.risk.getCode(); StatisticsErrorTypeEum.risk.getCode();
switch (type) { switch (type) {
case "risk"://风险异常 case "risk"://风险异常
return view3dMapper.getRiskErrorTop5(orgCode); return view3dMapper.getRiskErrorTop5();
case "check"://巡检异常 case "check"://巡检异常
return view3dMapper.getCheckErrorTop5(orgCode); return view3dMapper.getCheckErrorTop5();
case "fire"://火灾告警 case "fire"://火灾告警
return view3dMapper.getFireAlarmTop5(orgCode); return view3dMapper.getFireAlarmTop5();
default: default:
throw new YeeException("不支持的类型 -->" + type); throw new YeeException("不支持的类型 -->" + type);
} }
...@@ -468,19 +468,20 @@ public class View3dServiceImpl implements IView3dService { ...@@ -468,19 +468,20 @@ public class View3dServiceImpl implements IView3dService {
JSONArray dataList = JSONObject.parseArray(JSONStr); JSONArray dataList = JSONObject.parseArray(JSONStr);
if (!ObjectUtils.isEmpty(dataList)) { if (!ObjectUtils.isEmpty(dataList)) {
for (Object x : dataList) { for (Object x : dataList) {
Map<String, Object> resultMap = new HashMap<>();
String json = JSON.toJSONString(((JSONObject) x).get("data")); String json = JSON.toJSONString(((JSONObject) x).get("data"));
JSONArray array = JSONObject.parseArray(json); JSONArray array = JSONObject.parseArray(json);
if (!ObjectUtils.isEmpty(array)) { if (!ObjectUtils.isEmpty(array)) {
Map<String, String> result = (Map<String, String>) array.get(0); for(Object obj : array){
String total = result.get("total"); Map<String, String> result = (Map<String, String>) obj;
String postTypeName = result.get("postTypeName"); String total = result.get("total");
if (DutyPersonEnum.FIRE_PERSON.getName().equals(postTypeName)) { String postTypeName = result.get("postTypeName");
map.put("firePersonNumber", total); if (DutyPersonEnum.FIRE_PERSON.getName().equals(postTypeName)) {
} else if (DutyPersonEnum.OPS_PERSON.getName().equals(postTypeName)) { map.put("firePersonNumber", total);
map.put("dutyPersonNumber", total); } else if (DutyPersonEnum.OPS_PERSON.getName().equals(postTypeName)) {
} else if (DutyPersonEnum.REAL_PERSON.getName().equals(postTypeName)) { map.put("dutyPersonNumber", total);
map.put("securityPersonNumber", total); } else if (DutyPersonEnum.REAL_PERSON.getName().equals(postTypeName)) {
map.put("securityPersonNumber", total);
}
} }
} }
} }
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/util/FireEquipmentType.java
View file @ aa932249
...@@ -9,5 +9,7 @@ public enum FireEquipmentType { ...@@ -9,5 +9,7 @@ public enum FireEquipmentType {
pool,//消防水池 pool,//消防水池
fireChamber,//消防小室 fireChamber,//消防小室
fireFoamRoom,//消防泡沫间 fireFoamRoom,//消防泡沫间
fireDetection //火探 fireDetection, //火探
fireEquipment,
impEquipment
} }
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml
View file @ aa932249
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
ein.name as eq_point_name, ein.name as eq_point_name,
CASE ind.value WHEN 'true' THEN '是' CASE ind.value WHEN 'true' THEN '是'
WHEN 'false' THEN '否' WHEN 'false' THEN '否'
ELSE ind.value END 'e_value', ELSE FORMAT(IFNULL(ind.value, 0), 2) END 'e_value',
ein.unit as eq_point_unit, ein.unit as eq_point_unit,
CONCAT(IFNULL(str.full_name,''),' ',IFNULL(sto.description,'')) as source_name, CONCAT(IFNULL(str.full_name,''),' ',IFNULL(sto.description,'')) as source_name,
( (
......
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_impt_equip.xml
View file @ aa932249
...@@ -93,4 +93,16 @@ ...@@ -93,4 +93,16 @@
<select id="getAllCode" resultType="string"> <select id="getAllCode" resultType="string">
select distinct code from f_equipment select distinct code from f_equipment
</select> </select>
<select id="findImpEquipById" resultType="com.yeejoin.amos.fas.business.bo.FireEquipmentBo">
SELECT
id,
`name`,
`code`,
IFNULL(address,'') as 'productionArea'
FROM
f_equipment
WHERE
id = ${id}
</select>
</mapper> </mapper>
\ No newline at end of file
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml
View file @ aa932249
...@@ -195,7 +195,6 @@ ...@@ -195,7 +195,6 @@
FROM f_rpn_change_log n FROM f_rpn_change_log n
LEFT JOIN f_risk_source r ON r.id = n.risk_source_id LEFT JOIN f_risk_source r ON r.id = n.risk_source_id
WHERE n.type = 0 WHERE n.type = 0
AND (r.org_code = #{org_code} OR r.org_code like CONCAT(#{org_code},'-%'))
ORDER BY n.create_date desc ORDER BY n.create_date desc
limit 0,5 limit 0,5
</select> </select>
...@@ -208,7 +207,6 @@ ...@@ -208,7 +207,6 @@
left join p_point I ON I.id = p.point_id left join p_point I ON I.id = p.point_id
where p.is_ok IN ('2', '3') where p.is_ok IN ('2', '3')
AND I.is_delete = 0 AND I.is_delete = 0
AND (p.org_code = #{orgCode} OR p.org_code like CONCAT(#{orgCode},'-%') )
ORDER BY p.check_time desc ORDER BY p.check_time desc
limit 0,5 limit 0,5
</select> </select>
...@@ -492,7 +490,7 @@ ...@@ -492,7 +490,7 @@
car.`name`, car.`name`,
car.org_code AS orgCode, car.org_code AS orgCode,
'fireEquipment' AS typeCode, 'fireEquipment' AS typeCode,
#{riskSourceId} as riskSourceId '' as riskSourceId
FROM FROM
wl_car AS car wl_car AS car
LEFT JOIN wl_equipment AS equ ON car.equipment_id = equ.id LEFT JOIN wl_equipment AS equ ON car.equipment_id = equ.id
...@@ -611,20 +609,20 @@ ...@@ -611,20 +609,20 @@
WHERE WHERE
s.instanceId = r.source_id s.instanceId = r.source_id
) AS tmp ) AS tmp
<where> <where>
<if test="inputText!=null and inputText != ''" > <if test="inputText!=null and inputText != ''">
AND ( (
tmp.code LIKE '%${inputText}%' tmp.code LIKE '%${inputText}%'
OR tmp.name LIKE '%${inputText}%' OR tmp.name LIKE '%${inputText}%'
) )
</if> </if>
<if test="type!=null and type!=''"> <if test="type!=null and type!=''">
AND tmp.typeCode = #{type} AND tmp.typeCode = #{type}
</if> </if>
<if test="riskSourceId != null and riskSourceId!=''"> <if test="riskSourceId != null and riskSourceId!=''">
AND tmp.riskSourceId = #{riskSourceId} AND tmp.riskSourceId = #{riskSourceId}
</if> </if>
</where> </where>
) t ) t
</select> </select>
<select id="retrieveAll" resultType="java.util.HashMap"> <select id="retrieveAll" resultType="java.util.HashMap">
......
YeeAmosFireAutoSysStart/src/main/resources/json/plan-step-huaian.json 0 → 100644
View file @ aa932249
[
{
"stepCode": "0",
"stepName": "确认火情",
"stepStatus": "0",
"buttonCode": "FIRE_CONFIRM",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A",
"index": 0,
"isAuto": 0
},
{
"stepCode": "15",
"stepName": "全站广播通报火情",
"stepStatus": "0",
"buttonCode": "ALL_STATION_PA",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A",
"index": 1,
"isAuto": 0
},
{
"stepCode": "2",
"stepName": "拨打火警电话",
"stepStatus": "0",
"buttonCode": "CALL_PHONE",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 2,
"isAuto": 0
},
{
"stepCode": "16",
"stepName": "停运起火换流器",
"stepStatus": "0",
"buttonCode": "STOP_FIRE_TRANSVERTER",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 3,
"condition": [
{
"equipName": "开关",
"equipCode": "590000003EB44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "Running_Alarm",
"standardValue": "false",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "4",
"stepName": "水喷淋系统已开启",
"stepStatus": "0",
"buttonCode": "OPEN_WATERSYSTEM",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 4,
"condition": [
{
"equipName": "主机",
"equipCode": "92030100TGX44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "CAFS_CompAirFoamHost_Outfire",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "7",
"stepName": "一键启动消防炮",
"stepStatus": "0",
"buttonCode": "MONITOR_START",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 5,
"condition": [
{
"equipName": "CAFS消防炮",
"equipCode": "92032200BUX44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "CAFS_GunValve_Open",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "3",
"stepName": "确认本体排油系统已开启",
"stepStatus": "0",
"buttonCode": "DRAIN_OIL_CONFIRM",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 6,
"condition": [
{
"equipName": "排油阀",
"equipCode": "92100400VWE44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "ONL_DrainOilValve_Open",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "17",
"stepName": "消防泵正常启动",
"stepStatus": "0",
"buttonCode": "FIRE_PUMP_START",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A",
"index": 7,
"condition": [
{
"equipName": "消防泵",
"equipCode": "920106007GV44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "FHS_FirePump_Start",
"standardValue": "true",
"inAndOr": "or"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "18",
"stepName": "向各级调度领导汇报火情",
"stepStatus": "0",
"buttonCode": "LEADER_REPORT_FIRE",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 8,
"isAuto": 0
},
{
"stepCode": "21",
"stepName": "起火换流器转检修",
"stepStatus": "0",
"buttonCode": "FIRE_TRANSVERTER_TO_OVERHAUL",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 9,
"condition": [
{
"equipName": "地刀",
"equipCode": "59000000SAT44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "Running_Alarm",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "20",
"stepName": "停运阀冷系统",
"stepStatus": "0",
"buttonCode": "STOP_VALVE_COOL_SYS",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 10,
"condition": [
{
"equipName": "阀冷系统主机",
"equipCode": "59000000H9G44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "normal_running_state",
"standardValue": "false",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "6",
"stepName": "停运阀厅空调系统",
"stepStatus": "0",
"buttonCode": "STOP_AIRCON",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 11,
"condition": [
{
"equipName": "AIRCS-风机",
"equipCode": "92230600UH244",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "AIRCS_Fan_Start",
"standardValue": "false",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "5",
"stepName": "断开冷却器上级电源",
"stepStatus": "0",
"buttonCode": "OFF_POWER",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 12,
"isAuto": 0
},
{
"stepCode": "19",
"stepName": "停运本极未起火换流器",
"stepStatus": "0",
"buttonCode": "STOP_LOCAL_END_TRANSVERTER",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 13,
"condition": [
{
"equipName": "开关",
"equipCode": "590000003EB44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "Running_Alarm",
"standardValue": "false",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "22",
"stepName": "对阀侧套管、阀厅进行降温",
"stepStatus": "0",
"buttonCode": "VALVE_HALL_COOL",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_B",
"index": 14,
"isAuto": 0
},
{
"stepCode": "8",
"stepName": "驻站消防队指挥权交接",
"stepStatus": "0",
"buttonCode": "HANDOVER_COMMAND",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 15,
"isAuto": 0
},
{
"stepCode": "13",
"stepName": "确认明火扑灭",
"stepStatus": "0",
"buttonCode": "FIRE_EXTINCT",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 16,
"isAuto": 0
},
{
"stepCode": "23",
"stepName": "确认无复燃情况",
"stepStatus": "0",
"buttonCode": "CONFIRM_REKINDLE",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 17,
"isAuto": 0
},
{
"stepCode": "24",
"stepName": "向各级调度、领导汇报已灭火",
"stepStatus": "0",
"buttonCode": "LEADER_REPORT_FIRE_EXTINCT",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 18,
"isAuto": 0
},
{
"stepCode": "14",
"stepName": "应急处置结束",
"stepStatus": "0",
"buttonCode": "END_EMERGENCY",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_B",
"index": 19,
"isAuto": 0
}
]
\ No newline at end of file
YeeAmosFireAutoSysStart/src/main/resources/json/plan-step-huainan.json 0 → 100644
View file @ aa932249
[
{
"stepCode": "0",
"stepName": "确认火情",
"stepStatus": "0",
"buttonCode": "FIRE_CONFIRM",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A",
"index": 0,
"checkYesOrNo": ""
},
{
"stepCode": "1",
"stepName": "汇报，通知，报警",
"stepStatus": "0",
"buttonCode": "CALL_PHONE",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A",
"index": 1,
"checkYesOrNo": ""
},
{
"stepCode": "2",
"stepName": "确认开关跳闸",
"stepStatus": "0",
"buttonCode": "OPEN_THREE_SIDE_SWITCHES",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 2,
"isAuto": 0,
"checkYesOrNo": ""
},
{
"stepCode": "3",
"stepName": "检查固定喷雾灭火设施启动",
"stepStatus": "0",
"buttonCode": "OPEN_SPRAYINGSYSTEM",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 3,
"condition": [
{
"equipName": "主机",
"equipCode": "92030100TGX44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "CAFS_CompAirFoamHost_Outfire",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0,
"checkYesOrNo": ""
},
{
"stepCode": "4",
"stepName": "CAFS喷淋系统已开启",
"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": "DRAIN_OIL_CONFIRM",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 5,
"condition": [
{
"equipName": "排油阀",
"equipCode": "92100400VWE44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "ONL_DrainOilValve_Open",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0,
"checkYesOrNo": ""
},
{
"stepCode": "6",
"stepName": "启动CAFS举高灭火机器人",
"stepStatus": "0",
"buttonCode": "START_TURBOFAN_ROBOT",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 6,
"checkYesOrNo": ""
},
{
"stepCode": "7",
"stepName": "申请调检修",
"stepStatus": "0",
"buttonCode": "APPLY_FOR_OVERHAUL",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 7,
"checkYesOrNo": ""
},
{
"stepCode": "8",
"stepName": "断开交、直流电源",
"stepStatus": "0",
"buttonCode": "OFF_POWER",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A",
"index": 8,
"checkYesOrNo": ""
},
{
"stepCode": "9",
"stepName": "执行转检修操作",
"stepStatus": "0",
"buttonCode": "FIRE_TRANSVERTER_TO_OVERHAUL",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 9,
"checkYesOrNo": ""
},
{
"stepCode": "10",
"stepName": "电缆沟封堵",
"stepStatus": "0",
"buttonCode": "PLUG_CABLETRENCH",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 10,
"checkYesOrNo": ""
},
{
"stepCode": "11",
"stepName": "政府消防队指挥权交接",
"stepStatus": "0",
"buttonCode": "HANDOVER_FIGTHHING",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 11,
"checkYesOrNo": ""
},
{
"stepCode": "12",
"stepName": "确认明火扑灭，确认着火设备温度降为环境温度",
"stepStatus": "0",
"buttonCode": "FIRE_EXTINCT",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 12,
"checkYesOrNo": ""
},
{
"stepCode": "13",
"stepName": "检查现场情况，汇报调度",
"stepStatus": "0",
"buttonCode": "ACCIDENT_REPORT",
"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-shaoshan.json 0 → 100644
View file @ aa932249
[
{
"stepCode": "0",
"stepName": "确认灾情",
"stepStatus": "0",
"buttonCode": "FIRE_CONFIRM",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A",
"index": 0,
"checkYesOrNo": ""
},
{
"stepCode": "1",
"stepName": "消防广播",
"stepStatus": "0",
"buttonCode": "ALL_STATION_PA",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A",
"index": 1,
"isAuto": 0,
"checkYesOrNo": ""
},
{
"stepCode": "2",
"stepName": "申请设备转检修，陪停",
"stepStatus": "0",
"buttonCode": "FIRE_TRANSVERTER_TO_OVERHAUL",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 2,
"checkYesOrNo": ""
},
{
"stepCode": "3",
"stepName": "停运换流阀",
"stepStatus": "0",
"buttonCode": "STOP_COMMUTATION",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 3,
"checkYesOrNo": "",
"condition": [
{
"equipName": "换流器",
"equipCode": "92261200S7944",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "DCCP_DCCPStreamTransformerCharged",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "4",
"stepName": "拨打报警电话",
"stepStatus": "0",
"buttonCode": "CALL_PHONE",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 4,
"checkYesOrNo": ""
},
{
"stepCode": "5",
"stepName": "开启油枕排油系统",
"stepStatus": "0",
"buttonCode": "DRAIN_OIL_CONFIRM",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 5,
"checkYesOrNo": "",
"condition": [
{
"equipName": "排油阀",
"equipCode": "92102700EBA44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "ONL_OilDischargeDeviceOilPillowDischargeOpen",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "6",
"stepName": "开启水喷雾系统",
"stepStatus": "0",
"buttonCode": "OPEN_WATERSYSTEM",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 6,
"checkYesOrNo": "",
"condition": [
{
"equipName": "雨淋阀",
"equipCode": "92130300BH644",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "WSS_DelugeValve_Start",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "7",
"stepName": "断开上级电源",
"stepStatus": "0",
"buttonCode": "OFF_POWER",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A",
"index": 7,
"checkYesOrNo": ""
},
{
"stepCode": "8",
"stepName": "停运空调水冷系统",
"stepStatus": "0",
"buttonCode": "STOP_AIRCON",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 8,
"checkYesOrNo": ""
},
{
"stepCode": "9",
"stepName": "一键开启消防炮",
"stepStatus": "0",
"buttonCode": "MONITOR_START",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A",
"index": 9,
"checkYesOrNo": "",
"condition": [
{
"equipName": "消防炮阀",
"equipCode": "92032200BUX44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "CAFS_CAFSFireGunEquipmentValveStatus",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "10",
"stepName": "驻站消防指挥权准备交接",
"stepStatus": "0",
"buttonCode": "HANDOVER_COMMAND",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 10,
"checkYesOrNo": ""
},
{
"stepCode": "11",
"stepName": "开启本体排油",
"stepStatus": "0",
"buttonCode": "OWNER_DRAIN_OIL",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 11,
"checkYesOrNo": "",
"condition": [
{
"equipName": "排油阀",
"equipCode": "92102700EBA44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "ONL_OilDischargeDeviceOilyPillowDischargeOpen",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0
},
{
"stepCode": "12",
"stepName": "待换流变油排尽，关闭排油系统",
"stepStatus": "0",
"buttonCode": "CLOSE_OIL_SYSTEM",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 12,
"checkYesOrNo": ""
},
{
"stepCode": "13",
"stepName": "油污检查",
"stepStatus": "0",
"buttonCode": "OIL_INSPECTION",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_B",
"index": 13,
"checkYesOrNo": ""
},
{
"stepCode": "14",
"stepName": "启动阀厅应急预案",
"stepStatus": "0",
"buttonCode": "START_VALVE_HALL_CONTINGENCY",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 14,
"checkYesOrNo": ""
},
{
"stepCode": "15",
"stepName": "电缆沟封堵",
"stepStatus": "0",
"buttonCode": "PLUG_CABLETRENCH",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 15,
"checkYesOrNo": ""
},
{
"stepCode": "16",
"stepName": "政府消防队指挥权交接",
"stepStatus": "0",
"buttonCode": "HANDOVER_FIGTHHING",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 16,
"checkYesOrNo": ""
},
{
"stepCode": "17",
"stepName": "确认明火扑灭",
"stepStatus": "0",
"buttonCode": "FIRE_EXTINCT",
"isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B",
"index": 17,
"checkYesOrNo": ""
},
{
"stepCode": "18",
"stepName": "应急处置结束",
"stepStatus": "0",
"buttonCode": "END_EMERGENCY",
"isParallel": "1",
"roleCode": "Digital_Responsing_Plan_B",
"index": 18,
"checkYesOrNo": ""
}
]
\ No newline at end of file
YeeAmosFireAutoSysStart/src/main/resources/json/plan-step.json
View file @ aa932249
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "CALL_PHONE", "buttonCode": "CALL_PHONE",
"isParallel": "1", "isParallel": "1",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_B",
"index": 1, "index": 1,
"checkYesOrNo": "" "checkYesOrNo": ""
}, },
...@@ -56,30 +56,17 @@ ...@@ -56,30 +56,17 @@
"stepCode": "4", "stepCode": "4",
"stepName": "启动应急排油", "stepName": "启动应急排油",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "DRAIN_OIL_CONFIRM", "buttonCode": "FIRE_TRANSVERTER_TO_OVERHAUL",
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_B",
"index": 4, "index": 4,
"condition": [
{
"equipName": "排油阀",
"equipCode": "92100400VWE44",
"equipSpeName": "",
"equipSpeCode": "",
"equipSpeIndexKey": "ONL_DrainOilValve_Open",
"standardValue": "true",
"inAndOr": "and"
}
],
"outAndOr": "and",
"isAuto": 0,
"checkYesOrNo": "" "checkYesOrNo": ""
}, },
{ {
"stepCode": "5", "stepCode": "5",
"stepName": "CAFS喷淋系统已开启", "stepName": "CAFS喷淋系统已开启",
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "OPEN_WATERSYSTEM", "buttonCode": "VERIFY_EQUIP_STATUS",
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_A", "roleCode": "Digital_Responsing_Plan_A",
"index": 5, "index": 5,
...@@ -135,7 +122,7 @@ ...@@ -135,7 +122,7 @@
"stepStatus": "0", "stepStatus": "0",
"buttonCode": "FIRE_TRANSVERTER_TO_OVERHAUL", "buttonCode": "FIRE_TRANSVERTER_TO_OVERHAUL",
"isParallel": "0", "isParallel": "0",
"roleCode": "Digital_Responsing_Plan_B", "roleCode": "Digital_Responsing_Plan_A",
"index": 9, "index": 9,
"checkYesOrNo": "" "checkYesOrNo": ""
}, },
......
pom.xml
View file @ aa932249
...@@ -233,12 +233,12 @@ ...@@ -233,12 +233,12 @@
<repository> <repository>
<id>Releases</id> <id>Releases</id>
<name>Releases</name> <name>Releases</name>
<url>http://36.46.149.14:8081/nexus/content/repositories/releases/</url> <url>http://113.142.68.105:8081/nexus/content/repositories/releases/</url>
</repository> </repository>
<repository> <repository>
<id>Snapshots</id> <id>Snapshots</id>
<name>Snapshots</name> <name>Snapshots</name>
<url>http://36.46.149.14:8081/nexus/content/repositories/snapshots/</url> <url>http://113.142.68.105:8081/nexus/content/repositories/snapshots/</url>
</repository> </repository>
<!-- <repository>--> <!-- <repository>-->
<!-- <id>maven-public-ty</id>--> <!-- <id>maven-public-ty</id>-->
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
<pluginRepository> <pluginRepository>
<id>public</id> <id>public</id>
<name>Public Repositories</name> <name>Public Repositories</name>
<url>http://36.46.149.14:8081/nexus/content/groups/public/</url> <url>http://113.142.68.105:8081/nexus/content/groups/public/</url>
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
......
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