Skip to content

Y
YeeAmosFireAutoSysRoot
Commit bea1dac1 authored by 吴江's avatar 吴江
Browse files
Options

规则修改适配

parent 3b9a6400
Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 160 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java
View file @ bea1dac1
......@@ -33,7 +33,7 @@ import com.yeejoin.amos.fas.dao.entity.FireStrength;
public class ContingencyAction implements CustomerAction {
private static String PACKAGEURL = "com.yeejoin.amos.rule.map.action.result.message.";
private static String PACKAGEURL = "com.yeejoin.amos.fas.business.action.result.message.";
@Autowired
private IContingencyInstance iContingencyInstance;
......@@ -101,7 +101,7 @@ public class ContingencyAction implements CustomerAction {
}
public void sendcmd(String firstStr, String secondStr, String thirdStr, BubbleTipResult result) {
public static void sendcmd(String firstStr, String secondStr, String thirdStr, BubbleTipResult result) {
Constructor<?> constructor;
try {
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java
View file @ bea1dac1
package com.yeejoin.amos.fas.business.service.impl;
import com.yeejoin.amos.component.rule.RuleTrigger;
import com.yeejoin.amos.fas.business.action.ContingencyAction;
import com.yeejoin.amos.fas.business.action.result.BubbleTipResult;
import com.yeejoin.amos.fas.business.dao.mapper.ImpAndFireEquipMapper;
import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
import com.yeejoin.amos.fas.business.dao.repository.IContingencyPlanInstanceRepository;
......@@ -11,6 +14,7 @@ import com.yeejoin.amos.fas.business.service.model.OperateGroup;
import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
import com.yeejoin.amos.fas.dao.entity.Equipment;
import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -63,6 +67,8 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
private static Map<String, String> stepMap = new HashMap<>();
@Autowired
private RuleTrigger ruleTrigger;
/* public ContingencyInstanceImpl(IContingencyPlanInstanceRepository repository) {
super(repository);
......@@ -169,11 +175,16 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
Equipment equipment = impAndFireEquipMapper.queryImpEqumtByFireEquipmt(Long.parseLong(contingencyRo.getFireEquipmentId()));
Object result = remoteRuleServer.fireRuleFlow(contingencyRo, equipment.getReservePlan(),equipment.getName());
String url = remoteRuleUrl + "/urule/rule/refreshTimeline?batchNo=" + batchNo;
restTemplate.exchange(url, HttpMethod.GET, HttpEntity.EMPTY, Object.class);
//Object result = remoteRuleServer.fireRuleFlow(contingencyRo, equipment.getReservePlan(),equipment.getName());
ruleTrigger.publish(contingencyRo, equipment.getReservePlan());
BubbleTipResult result1 = new BubbleTipResult();
Map<String, Object> tempmap2 = new HashMap<>();
tempmap2.put("refresh","refresh");
tempmap2.put("batchNo",batchNo);
ContingencyAction.sendcmd("fromws","recordArea","refresh",result1);
// String url = remoteRuleUrl + "/urule/rule/refreshTimeline?batchNo=" + batchNo;
//restTemplate.exchange(url, HttpMethod.GET, HttpEntity.EMPTY, Object.class);
} else {
throw new Exception("数据异常,请联系管理员.");
}
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/ContingencyRo.java
View file @ bea1dac1
......@@ -3,13 +3,17 @@ package com.yeejoin.amos.fas.business.service.model;
public class ContingencyRo extends BasicsRo {
private String fireEquipmentName;//消防设备名称
/**
*
*/
private static final long serialVersionUID = 451541541451L;
private String fireEquipmentName;//消防设备名称
private String fireEquipmentId;//消防设备id
private int layer;//显示图层
private Integer layer=0;//显示图层
//当前探测器
private int fireEquipmentLayer;//当前探测器图层
private Integer fireEquipmentLayer=0;//当前探测器图层
private String fireEquipmentPosition;//消防设备位置
//重点设备信息
......@@ -26,7 +30,7 @@ public class ContingencyRo extends BasicsRo {
private String cameraIds;//摄像头id
private int fireCount = 1; //火情数量
private Integer fireCount = 1; //火情数量
private String confirm = "NONE";//是否确认火情，确认 CONFIRM,取消CANCEL,未操作 NONE
......@@ -37,7 +41,7 @@ public class ContingencyRo extends BasicsRo {
private String fireTruckRoute;
private boolean runstep; //是否已经执行流程
private Boolean runstep; //是否已经执行流程
private String step;//当前步骤
......@@ -46,201 +50,198 @@ public class ContingencyRo extends BasicsRo {
private String stepState;//步骤操作状态
public String getFireEquipmentName() {
return fireEquipmentName;
}
public String getEquipmentPosition3d() {
return equipmentPosition3d;
}
public void setFireEquipmentName(String fireEquipmentName) {
this.fireEquipmentName = fireEquipmentName;
}
public void setEquipmentPosition3d(String equipmentPosition3d) {
this.equipmentPosition3d = equipmentPosition3d;
}
public String getFireEquipmentId() {
return fireEquipmentId;
}
public String getButtonState() {
return buttonState;
}
public void setFireEquipmentId(String fireEquipmentId) {
this.fireEquipmentId = fireEquipmentId;
}
public void setButtonState(String buttonState) {
this.buttonState = buttonState;
}
public Integer getLayer() {
return layer;
}
public String getStepState() {
return stepState;
}
public void setLayer(Integer layer) {
this.layer = layer;
}
public void setStepState(String stepState) {
this.stepState = stepState;
}
public Integer getFireEquipmentLayer() {
return fireEquipmentLayer;
}
public String getButtonCode() {
return buttonCode;
}
public void setFireEquipmentLayer(Integer fireEquipmentLayer) {
this.fireEquipmentLayer = fireEquipmentLayer;
}
public void setButtonCode(String buttonCode) {
this.buttonCode = buttonCode;
}
public String getFireEquipmentPosition() {
return fireEquipmentPosition;
}
public String getStep() {
return step;
}
public void setFireEquipmentPosition(String fireEquipmentPosition) {
this.fireEquipmentPosition = fireEquipmentPosition;
}
public void setStep(String step) {
this.step = step;
}
public String getEquipmentId() {
return equipmentId;
}
public void setEquipmentId(String equipmentId) {
this.equipmentId = equipmentId;
}
public String getEquipmentName() {
return equipmentName;
}
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
}
public boolean getRunstep() {
return runstep;
}
public String getEquipmentPosition3d() {
return equipmentPosition3d;
}
public void setRunstep(boolean runstep) {
this.runstep = runstep;
}
public void setEquipmentPosition3d(String equipmentPosition3d) {
this.equipmentPosition3d = equipmentPosition3d;
}
public String getFireTruckRoute() {
return fireTruckRoute;
}
public String getMobile() {
return mobile;
}
public void setFireTruckRoute(String fireTruckRoute) {
this.fireTruckRoute = fireTruckRoute;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getPicture1() {
return picture1;
}
public String getAdminName() {
return adminName;
}
public void setPicture1(String picture1) {
this.picture1 = picture1;
}
public void setAdminName(String adminName) {
this.adminName = adminName;
}
public String getPicture2() {
return picture2;
}
public String getCameraCodes() {
return cameraCodes;
}
public void setPicture2(String picture2) {
this.picture2 = picture2;
}
public void setCameraCodes(String cameraCodes) {
this.cameraCodes = cameraCodes;
}
public String getPicture3() {
return picture3;
}
public String getCameraIds() {
return cameraIds;
}
public void setPicture3(String picture3) {
this.picture3 = picture3;
}
public void setCameraIds(String cameraIds) {
this.cameraIds = cameraIds;
}
public String getPicture4() {
return picture4;
}
public Integer getFireCount() {
return fireCount;
}
public void setPicture4(String picture4) {
this.picture4 = picture4;
}
public void setFireCount(Integer fireCount) {
this.fireCount = fireCount;
}
public String getCameraIds() {
return cameraIds;
}
public String getConfirm() {
return confirm;
}
public void setCameraIds(String cameraIds) {
this.cameraIds = cameraIds;
}
public void setConfirm(String confirm) {
this.confirm = confirm;
}
public String getFireEquipmentPosition() {
return fireEquipmentPosition;
}
public String getPicture1() {
return picture1;
}
public void setFireEquipmentPosition(String fireEquipmentPosition) {
this.fireEquipmentPosition = fireEquipmentPosition;
}
public void setPicture1(String picture1) {
this.picture1 = picture1;
}
public String getConfirm() {
return confirm;
}
public String getPicture2() {
return picture2;
}
public void setConfirm(String confirm) {
this.confirm = confirm;
}
public void setPicture2(String picture2) {
this.picture2 = picture2;
}
public int getFireCount() {
return fireCount;
}
public String getPicture3() {
return picture3;
}
public void setFireCount(int fireCount) {
this.fireCount = fireCount;
}
public void setPicture3(String picture3) {
this.picture3 = picture3;
}
public String getEquipmentName() {
return equipmentName;
}
public String getPicture4() {
return picture4;
}
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
}
public void setPicture4(String picture4) {
this.picture4 = picture4;
}
public String getFireEquipmentId() {
return fireEquipmentId;
}
public String getFireTruckRoute() {
return fireTruckRoute;
}
public void setFireEquipmentId(String fireEquipmentId) {
this.fireEquipmentId = fireEquipmentId;
}
public void setFireTruckRoute(String fireTruckRoute) {
this.fireTruckRoute = fireTruckRoute;
}
public Boolean getRunstep() {
return runstep;
}
public String getFireEquipmentName() {
return fireEquipmentName;
}
public void setRunstep(Boolean runstep) {
this.runstep = runstep;
}
public void setFireEquipmentName(String fireEquipmentName) {
this.fireEquipmentName = fireEquipmentName;
}
public String getStep() {
return step;
}
public int getLayer() {
return layer;
}
public void setStep(String step) {
this.step = step;
}
public void setLayer(int layer) {
this.layer = layer;
}
public String getButtonCode() {
return buttonCode;
}
public int getFireEquipmentLayer() {
return fireEquipmentLayer;
}
public void setButtonCode(String buttonCode) {
this.buttonCode = buttonCode;
}
public void setFireEquipmentLayer(int fireEquipmentLayer) {
this.fireEquipmentLayer = fireEquipmentLayer;
}
public String getButtonState() {
return buttonState;
}
public String getEquipmentId() {
return equipmentId;
}
public void setButtonState(String buttonState) {
this.buttonState = buttonState;
}
public void setEquipmentId(String equipmentId) {
this.equipmentId = equipmentId;
}
public String getStepState() {
return stepState;
}
public String getMobile() {
return mobile;
}
public void setStepState(String stepState) {
this.stepState = stepState;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getAdminName() {
return adminName;
}
public void setAdminName(String adminName) {
this.adminName = adminName;
}
public String getCameraCodes() {
return cameraCodes;
}
public void setCameraCodes(String cameraCodes) {
this.cameraCodes = cameraCodes;
}
}
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