Skip to content

Y
YeeAmosFireAutoSysRoot
Commit a2bc0e4d authored by 高东东's avatar 高东东
Browse files
Options

修改动态预案

parent c3903018
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 551 additions and 1045 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/BubbleTipAction.java
View file @ a2bc0e4d
...@@ -6,6 +6,8 @@ import java.util.Map; ...@@ -6,6 +6,8 @@ import java.util.Map;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.yeejoin.amos.component.rule.RuleActionBean;
import com.yeejoin.amos.component.rule.RuleMethod;
import com.yeejoin.amos.fas.business.action.result.ActionResult; import com.yeejoin.amos.fas.business.action.result.ActionResult;
import com.yeejoin.amos.fas.business.action.result.BubbleTipResult; import com.yeejoin.amos.fas.business.action.result.BubbleTipResult;
import com.yeejoin.amos.fas.business.action.result.message.ActionResultMessage; import com.yeejoin.amos.fas.business.action.result.message.ActionResultMessage;
...@@ -21,11 +23,14 @@ import com.yeejoin.amos.fas.business.service.model.ToipResponse; ...@@ -21,11 +23,14 @@ import com.yeejoin.amos.fas.business.service.model.ToipResponse;
* @version $Id: BubbleTipAction.java, v 0.1 2019年5月16日 上午10:42:32 amos Exp $ * @version $Id: BubbleTipAction.java, v 0.1 2019年5月16日 上午10:42:32 amos Exp $
*/ */
@Component @Component
@RuleActionBean(beanLabel = "气泡提示" )
public class BubbleTipAction implements CustomerAction public class BubbleTipAction implements CustomerAction
{ {
private static String PACKAGEURL = "com.yeejoin.amos.fas.business.action.result.message."; private static String PACKAGEURL = "com.yeejoin.amos.fas.business.action.result.message.";
//@ExposeAction("气泡提示") //@ExposeAction("气泡提示")
@RuleMethod(methodLabel = "气泡提示", project = "青海风险管控")
public void sendBubbleTip(Object bizobj, Boolean showInfo, Object title, String type) public void sendBubbleTip(Object bizobj, Boolean showInfo, Object title, String type)
{ {
BubbleTipResult result = new BubbleTipResult(); BubbleTipResult result = new BubbleTipResult();
...@@ -52,10 +57,8 @@ public class BubbleTipAction implements CustomerAction ...@@ -52,10 +57,8 @@ public class BubbleTipAction implements CustomerAction
PACKAGEURL + result.getClass().getSimpleName() + "Message") PACKAGEURL + result.getClass().getSimpleName() + "Message")
.getConstructor(ActionResult.class); .getConstructor(ActionResult.class);
ActionResultMessage<?> action = (ActionResultMessage<?>) constructor.newInstance(result); ActionResultMessage<?> action = (ActionResultMessage<?>) constructor.newInstance(result);
String firstStr = "fromws"; String msgType = "message";
String secondStr = "map"; Object obj = action.execute(msgType, null);
String thirdStr = "bubble";
Object obj = action.execute(firstStr, secondStr, thirdStr);
result.setToipResponse((ToipResponse) obj); result.setToipResponse((ToipResponse) obj);
} }
catch (Exception e) catch (Exception e)
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/RiskSituationAction.java
View file @ a2bc0e4d
...@@ -4,10 +4,17 @@ import java.lang.reflect.Constructor; ...@@ -4,10 +4,17 @@ import java.lang.reflect.Constructor;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.yeejoin.amos.component.rule.MethodParam;
import com.yeejoin.amos.component.rule.RuleActionBean;
import com.yeejoin.amos.component.rule.RuleMethod;
import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
import com.yeejoin.amos.fas.business.action.result.ActionResult; import com.yeejoin.amos.fas.business.action.result.ActionResult;
import com.yeejoin.amos.fas.business.action.result.BubbleTipResult; import com.yeejoin.amos.fas.business.action.result.BubbleTipResult;
import com.yeejoin.amos.fas.business.action.result.message.AbstractActionResultMessage;
import com.yeejoin.amos.fas.business.action.result.message.ActionResultMessage; import com.yeejoin.amos.fas.business.action.result.message.ActionResultMessage;
import com.yeejoin.amos.fas.business.service.model.ToipResponse; import com.yeejoin.amos.fas.business.service.model.ToipResponse;
/** /**
...@@ -20,12 +27,22 @@ import com.yeejoin.amos.fas.business.service.model.ToipResponse; ...@@ -20,12 +27,22 @@ import com.yeejoin.amos.fas.business.service.model.ToipResponse;
* @version $Id: RiskSituationAction.java, v 0.1 2019年5月16日 下午5:26:27 amos Exp $ * @version $Id: RiskSituationAction.java, v 0.1 2019年5月16日 下午5:26:27 amos Exp $
*/ */
@Component @Component
@RuleActionBean(beanLabel = "动态预案")
public class RiskSituationAction implements CustomerAction public class RiskSituationAction implements CustomerAction
{ {
private static String PACKAGEURL = "com.yeejoin.amos.fas.business.action.result.message."; private static String PACKAGEURL = "com.yeejoin.amos.fas.business.action.result.message.";
//@ExposeAction("气泡提示")
public void sendBubbleTip(Object bizobj, Boolean showInfo, String title) @Autowired
private WebMqttComponent webMqttComponent;
@Value("${auto-sys.push.type}")
private String pushType;
@RuleMethod(methodLabel = "气泡提示", project = "青海换流站消防预案")
public void sendBubbleTip(@MethodParam(paramLabel = "bizobj对象") Object bizobj,
@MethodParam(paramLabel = "是否显示名称") Boolean showInfo,
@MethodParam(paramLabel = "标题") String title)
{ {
BubbleTipResult result = new BubbleTipResult(); BubbleTipResult result = new BubbleTipResult();
Map<String, Object> tempmap1 = new HashMap<>(); Map<String, Object> tempmap1 = new HashMap<>();
...@@ -46,12 +63,15 @@ public class RiskSituationAction implements CustomerAction ...@@ -46,12 +63,15 @@ public class RiskSituationAction implements CustomerAction
constructor = Class.forName( constructor = Class.forName(
PACKAGEURL + result.getClass().getSimpleName() + "Message") PACKAGEURL + result.getClass().getSimpleName() + "Message")
.getConstructor(ActionResult.class); .getConstructor(ActionResult.class);
ActionResultMessage<?> action = (ActionResultMessage<?>) constructor.newInstance(result); AbstractActionResultMessage<?> action = (AbstractActionResultMessage<?>) constructor.newInstance(result);
String firstStr = "fromws"; String msgType = "message";
String secondStr = "riskSituation"; if ("mqtt".equals(pushType.toLowerCase())) {
String thirdStr = "bubble"; ToipResponse toipResponse = action.buildResponse(msgType, bizobj, result);
Object obj = action.execute(firstStr, secondStr, thirdStr); webMqttComponent.publish("", toipResponse.toJsonStr());
result.setToipResponse((ToipResponse) obj); } else {
Object obj = action.execute(msgType, null);
}
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -59,8 +79,8 @@ public class RiskSituationAction implements CustomerAction ...@@ -59,8 +79,8 @@ public class RiskSituationAction implements CustomerAction
} }
} }
//@ExposeAction("区域颜色改变") @RuleMethod(methodLabel = "区域颜色改变", project = "青海换流站消防预案")
public void regionChange(Object bizobj, String colour) public void regionChange(@MethodParam(paramLabel = "bizobj对象") Object bizobj, @MethodParam(paramLabel = "颜色") String colour)
{ {
BubbleTipResult result = new BubbleTipResult(); BubbleTipResult result = new BubbleTipResult();
Map<String, Object> tempmap1 = new HashMap<>(); Map<String, Object> tempmap1 = new HashMap<>();
...@@ -77,12 +97,15 @@ public class RiskSituationAction implements CustomerAction ...@@ -77,12 +97,15 @@ public class RiskSituationAction implements CustomerAction
constructor = Class.forName( constructor = Class.forName(
PACKAGEURL + result.getClass().getSimpleName() + "Message") PACKAGEURL + result.getClass().getSimpleName() + "Message")
.getConstructor(ActionResult.class); .getConstructor(ActionResult.class);
ActionResultMessage<?> action = (ActionResultMessage<?>) constructor.newInstance(result); AbstractActionResultMessage<?> action = (AbstractActionResultMessage<?>) constructor.newInstance(result);
String firstStr = "fromws"; String msgType = "message";
String secondStr = "riskSituation"; if ("mqtt".equals(pushType.toLowerCase())) {
String thirdStr = "colour"; ToipResponse toipResponse = action.buildResponse(msgType, bizobj, result);
Object obj = action.execute(firstStr, secondStr, thirdStr); webMqttComponent.publish("", toipResponse.toJsonStr());
result.setToipResponse((ToipResponse) obj); } else {
Object obj = action.execute(msgType, null);
}
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -92,7 +115,8 @@ public class RiskSituationAction implements CustomerAction ...@@ -92,7 +115,8 @@ public class RiskSituationAction implements CustomerAction
//@ExposeAction(value = "区域闪烁",snapshot = false) //@ExposeAction(value = "区域闪烁",snapshot = false)
public void regionFlicker(Object bizobj, Integer frequency) @RuleMethod(methodLabel = "区域闪烁", project = "青海换流站消防预案")
public void regionFlicker(@MethodParam(paramLabel = "bizobj对象") Object bizobj, @MethodParam(paramLabel = "闪烁频率") Integer frequency)
{ {
BubbleTipResult result = new BubbleTipResult(); BubbleTipResult result = new BubbleTipResult();
Map<String, Object> tempmap1 = new HashMap<>(); Map<String, Object> tempmap1 = new HashMap<>();
...@@ -109,12 +133,17 @@ public class RiskSituationAction implements CustomerAction ...@@ -109,12 +133,17 @@ public class RiskSituationAction implements CustomerAction
constructor = Class.forName( constructor = Class.forName(
PACKAGEURL + result.getClass().getSimpleName() + "Message") PACKAGEURL + result.getClass().getSimpleName() + "Message")
.getConstructor(ActionResult.class); .getConstructor(ActionResult.class);
ActionResultMessage<?> action = (ActionResultMessage<?>) constructor.newInstance(result); AbstractActionResultMessage<?> action = (AbstractActionResultMessage<?>) constructor.newInstance(result);
String firstStr = "fromws"; String msgType = "message";
String secondStr = "riskSituation"; if ("mqtt".equals(pushType.toLowerCase())) {
String thirdStr = "flicker"; ToipResponse toipResponse = action.buildResponse(msgType, bizobj, result);
Object obj = action.execute(firstStr, secondStr, thirdStr); webMqttComponent.publish("", toipResponse.toJsonStr());
result.setToipResponse((ToipResponse) obj); } else {
Object obj = action.execute(msgType, null);
}
} }
catch (Exception e) catch (Exception e)
{ {
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/SimpleTipAction.java
View file @ a2bc0e4d
...@@ -6,25 +6,26 @@ import java.util.List; ...@@ -6,25 +6,26 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import com.yeejoin.amos.fas.business.service.model.RiskSourceRuleRo;
import com.yeejoin.amos.fas.core.common.request.DateUtil;
import com.yeejoin.amos.fas.core.util.StringUtil;
import org.jsoup.helper.DataUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.yeejoin.amos.fas.business.action.el.ELEvaluationContext; import com.yeejoin.amos.fas.business.action.el.ELEvaluationContext;
import com.yeejoin.amos.fas.business.action.model.RiskSourceRuleRo;
import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
import com.yeejoin.amos.fas.business.action.result.AbstractActionResult; import com.yeejoin.amos.fas.business.action.result.AbstractActionResult;
import com.yeejoin.amos.fas.business.action.result.ActionResult; import com.yeejoin.amos.fas.business.action.result.ActionResult;
import com.yeejoin.amos.fas.business.action.result.TipResult; import com.yeejoin.amos.fas.business.action.result.TipResult;
import com.yeejoin.amos.fas.business.action.result.message.AbstractActionResultMessage;
import com.yeejoin.amos.fas.business.action.result.message.ActionResultMessage; import com.yeejoin.amos.fas.business.action.result.message.ActionResultMessage;
import com.yeejoin.amos.fas.business.action.util.DataItemUtil; import com.yeejoin.amos.fas.business.action.util.DataItemUtil;
import com.yeejoin.amos.fas.business.service.intfc.IMessageService; import com.yeejoin.amos.fas.business.service.intfc.IMessageService;
import com.yeejoin.amos.fas.business.service.model.ToipResponse; import com.yeejoin.amos.fas.business.service.model.ToipResponse;
import com.yeejoin.amos.fas.core.common.request.DateUtil;
import com.yeejoin.amos.fas.core.util.StringUtil;
import com.yeejoin.amos.fas.dao.entity.BusinessEntity; import com.yeejoin.amos.fas.dao.entity.BusinessEntity;
import com.yeejoin.amos.fas.dao.entity.Message; import com.yeejoin.amos.fas.dao.entity.Message;
import com.yeejoin.amos.fas.dao.entity.MessageRo; import com.yeejoin.amos.fas.dao.entity.MessageRo;
import org.springframework.util.unit.DataUnit;
/** /**
* *
...@@ -43,6 +44,12 @@ public class SimpleTipAction implements CustomerAction ...@@ -43,6 +44,12 @@ public class SimpleTipAction implements CustomerAction
@Autowired @Autowired
private IMessageService messageService; private IMessageService messageService;
@Autowired
private WebMqttComponent webMqttComponent;
@Value("${auto-sys.push.type}")
private String pushType;
//@ExposeAction("消息提示") //@ExposeAction("消息提示")
public void sendMessageTip(Object bizobj, String title, String content,String type) public void sendMessageTip(Object bizobj, String title, String content,String type)
{ {
...@@ -64,14 +71,16 @@ public class SimpleTipAction implements CustomerAction ...@@ -64,14 +71,16 @@ public class SimpleTipAction implements CustomerAction
constructor = Class.forName( constructor = Class.forName(
PACKAGEURL + result.getClass().getSimpleName() + "Message") PACKAGEURL + result.getClass().getSimpleName() + "Message")
.getConstructor(ActionResult.class); .getConstructor(ActionResult.class);
ActionResultMessage<?> action = (ActionResultMessage<?>) constructor.newInstance(result); AbstractActionResultMessage<?> action = (AbstractActionResultMessage<?>) constructor.newInstance(result);
String firstStr = "fromws"; String msgType = "message";
String secondStr = "global"; if ("mqtt".equals(pushType.toLowerCase())) {
String thirdStr = "msg"; ToipResponse toipResponse = action.buildResponse(msgType, bizobj, result);
result.setBizObj((BusinessEntity)bizobj); webMqttComponent.publish("", toipResponse.toJsonStr());
Object obj = action.execute(firstStr, secondStr, thirdStr); } else {
result.setToipResponse((ToipResponse) obj); Object obj = action.execute(msgType, null);
saveMessageAction(result,type);
}
// saveMessageAction(result,type);
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -79,37 +88,37 @@ public class SimpleTipAction implements CustomerAction ...@@ -79,37 +88,37 @@ public class SimpleTipAction implements CustomerAction
e.printStackTrace(); e.printStackTrace();
} }
} }
//
@SuppressWarnings("unchecked") // @SuppressWarnings("unchecked")
private void saveMessageAction(AbstractActionResult abstractActionResult,String type) // private void saveMessageAction(AbstractActionResult abstractActionResult,String type)
{ // {
Message message = new Message(); // Message message = new Message();
List<Map<String, Object>> list = (List<Map<String, Object>>) abstractActionResult.getData(); // List<Map<String, Object>> list = (List<Map<String, Object>>) abstractActionResult.getData();
for(Map<String, Object> map : list) { // for(Map<String, Object> map : list) {
for(String str: map.keySet()) { // for(String str: map.keySet()) {
if(str.equals("content")) { // if(str.equals("content")) {
message.setContent(map.get("content").toString()); // message.setContent(map.get("content").toString());
}else // }else
if (str.equals("title")) // if (str.equals("title"))
{ // {
message.setTitle(map.get("title").toString()); // message.setTitle(map.get("title").toString());
} // }
} // }
if (abstractActionResult.getToipResponse().getBizObj() instanceof MessageRo) { // if (abstractActionResult.getToipResponse().getBizObj() instanceof MessageRo) {
MessageRo messageRo = (MessageRo)abstractActionResult.getToipResponse().getBizObj(); // MessageRo messageRo = (MessageRo)abstractActionResult.getToipResponse().getBizObj();
message.setTime(messageRo.getDateTime()); // message.setTime(messageRo.getDateTime());
message.setBizId(messageRo.getId()); // message.setBizId(messageRo.getId());
} // }
if (abstractActionResult.getToipResponse().getBizObj() instanceof RiskSourceRuleRo) { // if (abstractActionResult.getToipResponse().getBizObj() instanceof RiskSourceRuleRo) {
RiskSourceRuleRo riskSourceRuleRo = (RiskSourceRuleRo) abstractActionResult.getToipResponse().getBizObj(); // RiskSourceRuleRo riskSourceRuleRo = (RiskSourceRuleRo) abstractActionResult.getToipResponse().getBizObj();
message.setTime(DateUtil.getNow()); // message.setTime(DateUtil.getNow());
message.setBizId(StringUtil.isNotEmpty(riskSourceRuleRo.getId()) ? // message.setBizId(StringUtil.isNotEmpty(riskSourceRuleRo.getId()) ?
String.valueOf(riskSourceRuleRo.getId()) : ""); // String.valueOf(riskSourceRuleRo.getId()) : "");
} // }
message.setBizclassName(abstractActionResult.getToipResponse().getBizObj().getClass().toString()); // message.setBizclassName(abstractActionResult.getToipResponse().getBizObj().getClass().toString());
message.setType(type); // message.setType(type);
message.setId(UUID.randomUUID().toString()); // message.setId(UUID.randomUUID().toString());
messageService.save(message); // messageService.save(message);
} // }
} // }
} }
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/BasicsRo.java → YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/BasicsRo.java
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.service.model; package com.yeejoin.amos.fas.business.action.model;
import com.yeejoin.amos.fas.dao.entity.BusinessEntity; import com.yeejoin.amos.fas.dao.entity.BusinessEntity;
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/CheckInputItemRo.java → YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/CheckInputItemRo.java
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.service.model; package com.yeejoin.amos.fas.business.action.model;
import java.io.Serializable; import java.io.Serializable;
import com.yeejoin.amos.component.rule.RuleFact;
import lombok.Data;
/** /**
* @author DELL * @author DELL
*/ */
@RuleFact(value = "检查项",project = "青海风险管控")
@Data
public class CheckInputItemRo implements Serializable { public class CheckInputItemRo implements Serializable {
/** /**
* 检查项id * 检查项id
...@@ -25,38 +31,4 @@ public class CheckInputItemRo implements Serializable { ...@@ -25,38 +31,4 @@ public class CheckInputItemRo implements Serializable {
* 检查项检查id * 检查项检查id
*/ */
private Long checkInputitemId; private Long checkInputitemId;
public long getPointInputitemId() {
return pointInputitemId;
}
public void setPointInputitemId(long pointInputitemId) {
this.pointInputitemId = pointInputitemId;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getPointInputitemName() {
return pointInputitemName;
}
public void setPointInputitemName(String pointInputitemName) {
this.pointInputitemName = pointInputitemName;
}
public Long getCheckInputitemId() {
return checkInputitemId;
}
public void setCheckInputitemId(Long checkInputitemId) {
this.checkInputitemId = checkInputitemId;
}
} }
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/ContingencyRo.java 0 → 100644
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.action.model;
import java.io.Serializable;
import java.util.Date;
import com.yeejoin.amos.component.rule.Label;
import com.yeejoin.amos.component.rule.RuleFact;
import lombok.Data;
@RuleFact(value = "动态预案",project = "青海换流站消防预案")
@Data
public class ContingencyRo implements Serializable {
@Label("批次号")
private String batchNo;
/**
*
*/
private static final long serialVersionUID = 49797517302816004L;
@Label("消防设备名称")
private String fireEquipmentName;//消防设备名称
@Label("消防设备id")
private String fireEquipmentId;//消防设备id
private Integer layer=0;//显示图层
//当前探测器
@Label("当前探测器图层")
private Integer fireEquipmentLayer=0;//当前探测器图层
@Label("消防设备位置")
private String fireEquipmentPosition;//消防设备位置
//重点设备信息
//负责人名称，手机号
@Label("重点设备id")
private String equipmentId;//重点设备id
@Label("重点设备名称")
private String equipmentName;
@Label("重点设备坐标")
private String equipmentPosition3d;
@Label("负责人手机号")
private String mobile; //负责人手机号
@Label("负责人名称")
private String adminName;//负责人名称
//摄像头
@Label("摄像头编号")
private String cameraCodes;//摄像头编号
@Label("摄像头id")
private String cameraIds;//摄像头id
@Label("火情数量")
private Integer fireCount = 1; //火情数量
@Label("操作状态")
private String confirm = "NONE";//是否确认火情，确认 CONFIRM,取消CANCEL,未操作 NONE
private String picture1;
private String picture2;
private String picture3;
private String picture4;
@Label("路线")
private String fireTruckRoute;
@Label("是否已执行到下一步")
private Boolean runstep; //是否已经执行流程
// @Label("步骤")
@Label("预案步骤")
private String step;//当前步骤
@Label("按钮编码")
private String buttonCode;
private String buttonState;
@Label("步骤状态")
private String stepState;//步骤操作状态
private Date createDate = new Date();
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/FireEquimentDataRo.java 0 → 100644
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.action.model;
import com.yeejoin.amos.component.rule.Label;
import com.yeejoin.amos.component.rule.RuleFact;
import lombok.Data;
@RuleFact(value = "消防设备",project = "青海风险管控")
@Data
public class FireEquimentDataRo extends BasicsRo
{
/**
*
*/
private static final long serialVersionUID = 5243181171363622140L;
private long fireEquimentId;
private String fireEqumentName;
@Label("设备id")
private long id;//监测点id
private String name;//名称
private String unit;//单位
private String value;//值 0 / 1
private String dataType;//值类型
/**
* 设备编号
*/
@Label("设备编码")
private String code;
/**
* 监测对象 名称
*/
@Label("监测对象")
private String monitor;
private String equimentId;
/**
* 状态
*/
@Label("设备状态")
private String nodeState;
private String alarmType;
@Label("当前时间")
private String currTime;
}
\ No newline at end of file
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/ProtalDataRo.java 0 → 100644
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.action.model;
import java.util.List;
import com.yeejoin.amos.component.rule.Label;
import com.yeejoin.amos.component.rule.RuleFact;
import lombok.Data;
@RuleFact(value = "巡检点",project = "青海风险管控")
@Data
public class ProtalDataRo extends BasicsRo {
private static final long serialVersionUID = -1029442967802232959L;
@Label("巡检点id")
private Long id;//巡检点id
@Label("巡检点名称")
private String name; //名称
@Label("状态")
private String nodeState;//实时状态
@Label("上一次状态")
private String originalNodeState;//记录状态状态
private String level;//巡检点级别
/**
* 巡检点编号
*/
@Label("巡检点编号")
private String pointNo;
/**
* 责任人
*/
@Label("责任人")
private String userName;
/**
* 巡检人员
*/
private String checkUser;
/**
* 任务编号，如果无任务，则填充0
*/
@Label("任务id")
private Long taskId=0l;
/**
* 任务状态
*/
@Label("任务状态")
private Integer taskState;
/**
* 上一次任务状态
*/
@Label("上一次任务状态")
private String originalTaskState;
private String taskName;//任务名称
private String content;//内容
private String pointName;//巡检点名称
@Label("当前时间")
private String currTime;//当前时间
private List<CheckInputItemRo> items;
private List<CheckInputItemRo> pointInputitems;
}
\ No newline at end of file
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/RiskSourceRo.java → YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/RiskSourceRo.java
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.service.model; package com.yeejoin.amos.fas.business.action.model;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import com.yeejoin.amos.component.rule.Label;
import com.yeejoin.amos.component.rule.RuleFact;
import lombok.Data;
@RuleFact(value = "风险点",project = "青海风险管控")
@Data
public class RiskSourceRo extends BasicsRo { public class RiskSourceRo extends BasicsRo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Label("风险点id")
private String id; private String id;
/** /**
* 风险点名称 * 风险点名称
*/ */
private String name; private String name;
/** /**
* 风险点编号 * 风险点编号
*/ */
@Label("风险点编号")
private String code; private String code;
/** /**
* 风险点来源（ProtalDataRo、FireEquimentDataRo、child） * 风险点来源（ProtalDataRo、FireEquimentDataRo、child）
*/ */
@Label("风险点来源")
private String from; private String from;
/** /**
* 状态 * 状态
*/ */
@Label("风险源状态（巡检点/设备）")
private String nodeState;//风险源状态 private String nodeState;//风险源状态
/** /**
* 上一次状态 * 上一次状态
...@@ -36,38 +45,44 @@ public class RiskSourceRo extends BasicsRo { ...@@ -36,38 +45,44 @@ public class RiskSourceRo extends BasicsRo {
/** /**
* 风险点级别 * 风险点级别
*/ */
@Label("级别")
private Integer riskLevel; private Integer riskLevel;
/** /**
* RPNr值 * RPNr值
*/ */
@Label("rpn")
private BigDecimal rpn; private BigDecimal rpn;
/** /**
* RPNi值 * RPNi值
*/ */
@Label("rpni")
private BigDecimal rpni; private BigDecimal rpni;
/** /**
* 风险因素，多条换行 * 风险因素，多条换行
*/ */
@Label("风险因素")
private String riskFactor; private String riskFactor;
/** /**
* 是否区域节点 * 是否区域节点
*/ */
@Label("是否区域节点")
private String isRegion; private String isRegion;
@Label("区域下已触发风险点最高级别")
private Integer regionMaxLevel; private Integer regionMaxLevel;
/** /**
* 计算RPNi值，保存所有风险因素得i值，key统一为：rpni * 计算RPNi值，保存所有风险因素得i值，key统一为：rpni
*/ */
@Label("RPNiSum")
private List<BigDecimal> RPNiSum; private List<BigDecimal> RPNiSum;
/** /**
* 计算RPNr值 * 计算RPNr值
*/ */
@Label("风险点状态")
private String riskState;//风险点状态 private String riskState;//风险点状态
private BigDecimal rg; private BigDecimal rg;
...@@ -75,119 +90,7 @@ public class RiskSourceRo extends BasicsRo { ...@@ -75,119 +90,7 @@ public class RiskSourceRo extends BasicsRo {
/** /**
* up、down、no * up、down、no
*/ */
@Label("等级变化类型")
private String levelChangeType; private String levelChangeType;
public String getRiskState() {
return riskState;
}
public void setRiskState(String riskState) {
this.riskState = riskState;
}
public Integer getRegionMaxLevel() {
return regionMaxLevel;
}
public void setRegionMaxLevel(Integer regionMaxLevel) {
this.regionMaxLevel = regionMaxLevel;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getFrom() {
return from;
}
public void setFrom(String from) {
this.from = from;
}
public String getNodeState() {
return nodeState;
}
public void setNodeState(String nodeState) {
this.nodeState = nodeState;
}
public String getOriginalNodeState() {
return originalNodeState;
}
public void setOriginalNodeState(String originalNodeState) {
this.originalNodeState = originalNodeState;
}
public Integer getRiskLevel() {
return riskLevel;
}
public void setRiskLevel(Integer riskLevel) {
this.riskLevel = riskLevel;
}
public BigDecimal getRpn() {
return rpn;
}
public void setRpn(BigDecimal rpn) {
this.rpn = rpn;
}
public BigDecimal getRpni() {
return rpni;
}
public void setRpni(BigDecimal rpni) {
this.rpni = rpni;
}
public String getRiskFactor() {
return riskFactor;
}
public void setRiskFactor(String riskFactor) {
this.riskFactor = riskFactor;
}
public String getIsRegion() {
return isRegion;
}
public void setIsRegion(String isRegion) {
this.isRegion = isRegion;
}
public List<BigDecimal> getRPNiSum() {
return RPNiSum;
}
public void setRPNiSum(List<BigDecimal> RPNiSum) {
this.RPNiSum = RPNiSum;
}
} }
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/RiskSourceRuleRo.java 0 → 100644
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.action.model;
import java.math.BigDecimal;
import com.yeejoin.amos.component.rule.Label;
import com.yeejoin.amos.component.rule.RuleFact;
import lombok.Data;
@RuleFact(value = "风险点-关联巡检点",project = "青海风险管控")
@Data
public class RiskSourceRuleRo extends BasicsRo {
private static final long serialVersionUID = -1029442967802232957L;
/**
* patrol、equipment、update、delete
*/
@Label("触发来源")
private String type;
@Label("序号")
private Long id;
@Label("rpnr")
private BigDecimal rpnr;
@Label("rpni")
private BigDecimal rpni;
/**
* 风险增益
*/
@Label("风险增益")
private String rg;
/**
* up、down、no
*/
@Label("等级变更类型")
private String levelChangeType;
/**
* 消息内容
*/
@Label("消息内容")
private String content;
/**
* 消息标题
*/
@Label("消息标题")
private String title;
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/SetpEnum.java 0 → 100644
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.action.model;
import com.yeejoin.amos.component.rule.Constants;
import com.yeejoin.amos.component.rule.model.RuleConstants;
//@Constants(value = SetpEnum.class)
public enum SetpEnum implements RuleConstants{
STEP0("0", ""),
STEP1("1", "停运换流阀、拨打报警电话"),
STEP2("2", "开启水喷雾系统"),
STEP3("3", "断开上级电源"),
STEP4("4", "停运空调和水冷系统"),
STEP5("5", "驻站消防指挥权准备交接"),
STEP6("6", "驻站消防指挥权交接"),
STEP7("7", "电缆沟封堵"),
STEP8("8", "灭火指挥权交接"),
STEP9("9", "应急处置结束");
private String stepCode;
private String stepName;
SetpEnum(String stepCode, String stepName) {
this.stepCode = stepCode;
this.stepName = stepName;
}
@Override
public String getValue() {
return stepCode;
}
@Override
public String getTitle() {
return stepName;
}
public static SetpEnum getStepByCode(String stepCode) {
return SetpEnum.valueOf(stepCode);
// return null;
}
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/mq/WebMqttComponent.java 0 → 100644
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.action.mq;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.eclipse.paho.client.mqttv3.MqttPersistenceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.typroject.tyboot.component.emq.EmqKeeper;
@Component
public class WebMqttComponent {
@Autowired
private EmqKeeper emqKeeper;
public void publish(String topic, String jsonStr) {
try {
this.emqKeeper.getMqttClient().publish(topic, jsonStr.getBytes(), 2, false);
} catch (MqttPersistenceException e) {
e.printStackTrace();
} catch (MqttException e) {
e.printStackTrace();
}
}
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/result/message/AbstractActionResultMessage.java
View file @ a2bc0e4d
...@@ -16,11 +16,10 @@ public abstract class AbstractActionResultMessage<R extends ToipResponse> ...@@ -16,11 +16,10 @@ public abstract class AbstractActionResultMessage<R extends ToipResponse>
protected ActionResult actionResult; protected ActionResult actionResult;
@Override @Override
public ToipResponse execute(String firstStr, String secondStr, public ToipResponse execute(String msgType,
String thirdStr) throws IOException, Exception Object contingency) throws IOException, Exception
{ {
ToipResponse response = buildResponse(firstStr, secondStr, thirdStr, ToipResponse response = buildResponse(msgType, contingency,
getActionResultByDataFormat() == null ? actionResult.getData(): getActionResultByDataFormat(),
actionResult); actionResult);
if (!actionResult.getData().isEmpty()) if (!actionResult.getData().isEmpty())
{ {
...@@ -41,21 +40,12 @@ public abstract class AbstractActionResultMessage<R extends ToipResponse> ...@@ -41,21 +40,12 @@ public abstract class AbstractActionResultMessage<R extends ToipResponse>
* @param obj * @param obj
* @return * @return
*/ */
public ToipResponse buildResponse(String firstIfDomain, public ToipResponse buildResponse(String msgType, Object contingency, ActionResult msgContext)
String secondIfDomain, String thirdIfDomain, Object obj,
ActionResult actionResult)
{ {
ToipResponse toipResponse = new ToipResponse(); ToipResponse toipResponse = new ToipResponse();
toipResponse.setIFDomain(firstIfDomain); toipResponse.setMsgType(msgType);
toipResponse.setTemplate(secondIfDomain + "_" + thirdIfDomain); toipResponse.setMsgContext(msgContext);
toipResponse.setGroup("");// group值暂填充至temolate中 toipResponse.setContingency(contingency);
// toipResponse.setActionId(ruleAction.getId());
// toipResponse.setBizId(
// ((AbstractActionResult) actionResult).getBizObj().getId());
toipResponse
.setBizObj(((AbstractActionResult) actionResult).getBizObj());
toipResponse.setResult(Constants.RESULT_SUCCESS);
toipResponse.setDataList(obj);
return toipResponse; return toipResponse;
} }
...@@ -69,7 +59,7 @@ public abstract class AbstractActionResultMessage<R extends ToipResponse> ...@@ -69,7 +59,7 @@ public abstract class AbstractActionResultMessage<R extends ToipResponse>
* @throws IOException * @throws IOException
* @throws Exception * @throws Exception
*/ */
protected void sendResponse(CommonResponse response) protected void sendResponse(ToipResponse response)
throws IOException, Exception throws IOException, Exception
{ {
RuleWebSocket.sendInfo(response.toJsonStr()); RuleWebSocket.sendInfo(response.toJsonStr());
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/result/message/ActionResultMessage.java
View file @ a2bc0e4d
...@@ -16,5 +16,5 @@ public interface ActionResultMessage<T> { ...@@ -16,5 +16,5 @@ public interface ActionResultMessage<T> {
* @throws IOException * @throws IOException
* @throws Exception * @throws Exception
*/ */
T execute(String firstStr, String secondStr, String thirdStr) throws IOException, Exception ; T execute(String msgType, Object contingency) throws IOException, Exception ;
} }
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/RiskSourceController.java
View file @ a2bc0e4d
...@@ -21,13 +21,13 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -21,13 +21,13 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.fas.business.action.model.FireEquimentDataRo;
import com.yeejoin.amos.fas.business.action.model.ProtalDataRo;
import com.yeejoin.amos.fas.business.param.AlarmParam; import com.yeejoin.amos.fas.business.param.AlarmParam;
import com.yeejoin.amos.fas.business.param.FmeaBindParam; import com.yeejoin.amos.fas.business.param.FmeaBindParam;
import com.yeejoin.amos.fas.business.service.intfc.IRiskFactorService; import com.yeejoin.amos.fas.business.service.intfc.IRiskFactorService;
import com.yeejoin.amos.fas.business.service.intfc.IRiskSourceService; import com.yeejoin.amos.fas.business.service.intfc.IRiskSourceService;
import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus; import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
import com.yeejoin.amos.fas.business.service.model.FireEquimentDataRo;
import com.yeejoin.amos.fas.business.service.model.ProtalDataRo;
import com.yeejoin.amos.fas.business.vo.ReginParams; import com.yeejoin.amos.fas.business.vo.ReginParams;
import com.yeejoin.amos.fas.config.Permission; import com.yeejoin.amos.fas.config.Permission;
import com.yeejoin.amos.fas.core.common.request.CommonPageable; import com.yeejoin.amos.fas.core.common.request.CommonPageable;
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/SafetyController.java
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.controller; package com.yeejoin.amos.fas.business.controller;
import org.apache.commons.lang3.ArrayUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import com.yeejoin.amos.component.rule.RuleTrigger;
import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
import com.yeejoin.amos.fas.business.vo.ReginParams; import com.yeejoin.amos.fas.business.vo.ReginParams;
import com.yeejoin.amos.fas.config.Permission; import com.yeejoin.amos.fas.config.Permission;
import com.yeejoin.amos.fas.core.util.CommonResponse; import com.yeejoin.amos.fas.core.util.CommonResponse;
...@@ -21,6 +28,11 @@ import io.swagger.annotations.ApiOperation; ...@@ -21,6 +28,11 @@ import io.swagger.annotations.ApiOperation;
public class SafetyController extends BaseController{ public class SafetyController extends BaseController{
private final Logger log = LoggerFactory.getLogger(SafetyController.class); private final Logger log = LoggerFactory.getLogger(SafetyController.class);
@Autowired
private RuleTrigger ruleTrigger;
/** /**
* 保存登陆用户选择公司信息 * 保存登陆用户选择公司信息
*/ */
...@@ -31,4 +43,26 @@ public class SafetyController extends BaseController{ ...@@ -31,4 +43,26 @@ public class SafetyController extends BaseController{
this.saveSelectedOrgInfo(reginParams); this.saveSelectedOrgInfo(reginParams);
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} }
@GetMapping(value = "/test")
public CommonResponse test() {
ContingencyRo newFact = new ContingencyRo();
newFact.setEquipmentId("0");;
try {
String token = (String) request.getHeader("token");
token = ObjectUtils.isEmpty(token) ? (String) request.getHeader("X-Access-Token") : token;
String product = (String) request.getHeader("product");
String appKey = (String) request.getHeader("appKey");
RequestContext.setToken(token);
RequestContext.setProduct(product);
RequestContext.setAppKey(appKey);
Object o = ruleTrigger.publish(newFact, "青海换流站消防预案/test", ArrayUtils.toArray());
return CommonResponseUtil.success(o);
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return CommonResponseUtil.failure();
}
} }
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/RemoteRuleServer.java
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.feign; package com.yeejoin.amos.fas.business.feign;
import com.yeejoin.amos.fas.business.service.model.BasicsRo; import com.yeejoin.amos.fas.business.action.model.BasicsRo;
import com.yeejoin.amos.fas.business.action.model.RiskSourceRuleRo;
import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus; import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
import com.yeejoin.amos.fas.business.service.model.RiskSourceRuleRo;
//import com.yeejoin.amos.op.core.util.ApplicationConfig; //import com.yeejoin.amos.op.core.util.ApplicationConfig;
//import com.yeejoin.amos.op.core.util.Constants; //import com.yeejoin.amos.op.core.util.Constants;
import com.yeejoin.amos.fas.business.util.Constants; import com.yeejoin.amos.fas.business.util.Constants;
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/param/AlarmParam.java
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.param; package com.yeejoin.amos.fas.business.param;
import com.yeejoin.amos.fas.business.service.model.BasicsRo; import com.yeejoin.amos.fas.business.action.model.BasicsRo;
public class AlarmParam extends BasicsRo{ public class AlarmParam extends BasicsRo{
private String informationAddress; //转发码 private String informationAddress; //转发码
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java
View file @ a2bc0e4d
...@@ -19,13 +19,14 @@ import org.springframework.web.client.RestTemplate; ...@@ -19,13 +19,14 @@ import org.springframework.web.client.RestTemplate;
import com.yeejoin.amos.component.rule.RuleTrigger; import com.yeejoin.amos.component.rule.RuleTrigger;
import com.yeejoin.amos.fas.business.action.ContingencyAction; import com.yeejoin.amos.fas.business.action.ContingencyAction;
import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
import com.yeejoin.amos.fas.business.action.model.SetpEnum;
import com.yeejoin.amos.fas.business.action.result.BubbleTipResult; 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.mapper.ImpAndFireEquipMapper;
import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao; import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
import com.yeejoin.amos.fas.business.dao.repository.IContingencyPlanInstanceRepository; import com.yeejoin.amos.fas.business.dao.repository.IContingencyPlanInstanceRepository;
import com.yeejoin.amos.fas.business.feign.RemoteRuleServer; import com.yeejoin.amos.fas.business.feign.RemoteRuleServer;
import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance; import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance;
import com.yeejoin.amos.fas.business.service.model.ContingencyRo;
import com.yeejoin.amos.fas.business.service.model.Operate; import com.yeejoin.amos.fas.business.service.model.Operate;
import com.yeejoin.amos.fas.business.service.model.OperateGroup; import com.yeejoin.amos.fas.business.service.model.OperateGroup;
import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData; import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
...@@ -69,8 +70,8 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla ...@@ -69,8 +70,8 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
super(repository); super(repository);
this.repository = repository; this.repository = repository;
}*/ }*/
@Autowired
ContingencyAction contingencyAction;
/** /**
* 创建预案执行记录 * 创建预案执行记录
* *
...@@ -164,7 +165,8 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla ...@@ -164,7 +165,8 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
contingencyRo.setButtonCode(buttonCode); contingencyRo.setButtonCode(buttonCode);
contingencyRo.setButtonState(buttonState); contingencyRo.setButtonState(buttonState);
BeanUtils.copyProperties(contingencyOriginalData, contingencyRo); BeanUtils.copyProperties(contingencyOriginalData, contingencyRo);
contingencyRo.setStep(stepCode); SetpEnum step = SetpEnum.getStepByCode(stepCode);
contingencyRo.setStep(step.getValue());
contingencyRo.setStepState(stepMap.get(stepKey)); contingencyRo.setStepState(stepMap.get(stepKey));
log.info("stepstate:" + contingencyRo.getStepState()); log.info("stepstate:" + contingencyRo.getStepState());
...@@ -177,7 +179,7 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla ...@@ -177,7 +179,7 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
Map<String, Object> tempmap2 = new HashMap<>(); Map<String, Object> tempmap2 = new HashMap<>();
tempmap2.put("refresh","refresh"); tempmap2.put("refresh","refresh");
tempmap2.put("batchNo",batchNo); tempmap2.put("batchNo",batchNo);
ContingencyAction.sendcmd("fromws","recordArea","refresh",result1); contingencyAction.sendcmd("recordarea", contingencyRo, result1);
} else { } else {
throw new Exception("数据异常,请联系管理员."); throw new Exception("数据异常,请联系管理员.");
} }
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FmeaServiceImpl.java
View file @ a2bc0e4d
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.fas.business.service.impl; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.fas.business.service.impl;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.fas.business.action.model.RiskSourceRo;
import com.yeejoin.amos.fas.business.dao.mapper.FmeaEquipmentPointMapper; import com.yeejoin.amos.fas.business.dao.mapper.FmeaEquipmentPointMapper;
import com.yeejoin.amos.fas.business.dao.mapper.FmeaMapper; import com.yeejoin.amos.fas.business.dao.mapper.FmeaMapper;
import com.yeejoin.amos.fas.business.dao.mapper.FmeaPointInputitemMapper; import com.yeejoin.amos.fas.business.dao.mapper.FmeaPointInputitemMapper;
...@@ -14,7 +15,6 @@ import com.yeejoin.amos.fas.business.feign.RemoteRuleServer; ...@@ -14,7 +15,6 @@ import com.yeejoin.amos.fas.business.feign.RemoteRuleServer;
import com.yeejoin.amos.fas.business.feign.RemoteSecurityService; import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
import com.yeejoin.amos.fas.business.param.CommonPageInfoParam; import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
import com.yeejoin.amos.fas.business.service.intfc.IFmeaService; import com.yeejoin.amos.fas.business.service.intfc.IFmeaService;
import com.yeejoin.amos.fas.business.service.model.RiskSourceRo;
import com.yeejoin.amos.fas.core.util.StringUtil; import com.yeejoin.amos.fas.core.util.StringUtil;
import com.yeejoin.amos.fas.dao.entity.Fmea; import com.yeejoin.amos.fas.dao.entity.Fmea;
import com.yeejoin.amos.fas.dao.entity.RiskFactor; import com.yeejoin.amos.fas.dao.entity.RiskFactor;
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
View file @ a2bc0e4d
...@@ -8,6 +8,12 @@ import com.google.common.collect.Lists; ...@@ -8,6 +8,12 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.yeejoin.amos.component.rule.RuleTrigger; import com.yeejoin.amos.component.rule.RuleTrigger;
import com.yeejoin.amos.fas.business.action.model.CheckInputItemRo;
import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
import com.yeejoin.amos.fas.business.action.model.FireEquimentDataRo;
import com.yeejoin.amos.fas.business.action.model.ProtalDataRo;
import com.yeejoin.amos.fas.business.action.model.RiskSourceRuleRo;
import com.yeejoin.amos.fas.business.action.model.SetpEnum;
import com.yeejoin.amos.fas.business.bo.*; import com.yeejoin.amos.fas.business.bo.*;
import com.yeejoin.amos.fas.business.constants.FasConstant; import com.yeejoin.amos.fas.business.constants.FasConstant;
import com.yeejoin.amos.fas.business.dao.mapper.*; import com.yeejoin.amos.fas.business.dao.mapper.*;
...@@ -461,7 +467,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService { ...@@ -461,7 +467,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
contingencyRo.setEquipmentName(equipment.getName()); contingencyRo.setEquipmentName(equipment.getName());
contingencyRo.setFireEquipmentId(String.valueOf(fireEquipment.getId())); contingencyRo.setFireEquipmentId(String.valueOf(fireEquipment.getId()));
contingencyRo.setFireEquipmentName(fireEquipment.getName()); contingencyRo.setFireEquipmentName(fireEquipment.getName());
contingencyRo.setStep("0");
contingencyRo.setStep(SetpEnum.STEP0.getValue());
//contingencyRo.setNodeState(deviceData.getNodeState()); //contingencyRo.setNodeState(deviceData.getNodeState());
contingencyRo.setConfirm("NONE"); contingencyRo.setConfirm("NONE");
contingencyRo.setFireTruckRoute(equipment.getFireTruckRoute()); contingencyRo.setFireTruckRoute(equipment.getFireTruckRoute());
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RuleRunigSnapshotServiceImpl.java
View file @ a2bc0e4d
...@@ -17,9 +17,9 @@ import org.typroject.tyboot.core.foundation.context.SpringContextHelper; ...@@ -17,9 +17,9 @@ import org.typroject.tyboot.core.foundation.context.SpringContextHelper;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.yeejoin.amos.fas.business.action.CustomerAction; import com.yeejoin.amos.fas.business.action.CustomerAction;
import com.yeejoin.amos.fas.business.action.model.BasicsRo;
import com.yeejoin.amos.fas.business.dao.mapper.RuleRuningSnapshotMapper; import com.yeejoin.amos.fas.business.dao.mapper.RuleRuningSnapshotMapper;
import com.yeejoin.amos.fas.business.service.intfc.IRuleRunningSnapshotService; import com.yeejoin.amos.fas.business.service.intfc.IRuleRunningSnapshotService;
import com.yeejoin.amos.fas.business.service.model.BasicsRo;
import com.yeejoin.amos.fas.business.service.model.RuleRuningSnapshot; import com.yeejoin.amos.fas.business.service.model.RuleRuningSnapshot;
/** /**
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IRiskSourceService.java
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.service.intfc; package com.yeejoin.amos.fas.business.service.intfc;
import com.yeejoin.amos.fas.business.action.model.FireEquimentDataRo;
import com.yeejoin.amos.fas.business.action.model.ProtalDataRo;
import com.yeejoin.amos.fas.business.bo.BindRegionBo; import com.yeejoin.amos.fas.business.bo.BindRegionBo;
import com.yeejoin.amos.fas.business.bo.JpushMsgBo; import com.yeejoin.amos.fas.business.bo.JpushMsgBo;
import com.yeejoin.amos.fas.business.param.AlarmParam; import com.yeejoin.amos.fas.business.param.AlarmParam;
import com.yeejoin.amos.fas.business.param.CommonPageInfoParam; import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
import com.yeejoin.amos.fas.business.param.FmeaBindParam; import com.yeejoin.amos.fas.business.param.FmeaBindParam;
import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus; import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
import com.yeejoin.amos.fas.business.service.model.FireEquimentDataRo;
import com.yeejoin.amos.fas.business.service.model.ProtalDataRo;
import com.yeejoin.amos.fas.core.common.request.CommonPageable; import com.yeejoin.amos.fas.core.common.request.CommonPageable;
import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse; import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse;
import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse; import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/ContingencyRo.java deleted 100644 → 0
View file @ c3903018
package com.yeejoin.amos.fas.business.service.model;
import java.io.Serializable;
import java.util.Date;
public class ContingencyRo implements Serializable {
private String batchNo;
public String getBatchNo() {
return batchNo;
}
public void setBatchNo(String batchNo) {
this.batchNo = batchNo;
}
/**
*
*/
private static final long serialVersionUID = 451541541451L;
private String fireEquipmentName;//消防设备名称
private String fireEquipmentId;//消防设备id
private Integer layer=0;//显示图层
//当前探测器
private Integer fireEquipmentLayer=0;//当前探测器图层
private String fireEquipmentPosition;//消防设备位置
//重点设备信息
//负责人名称，手机号
private String equipmentId;//重点设备id
private String equipmentName;
private String equipmentPosition3d;
private String mobile; //负责人手机号
private String adminName;//负责人名称
//摄像头
private String cameraCodes;//摄像头编号
private String cameraIds;//摄像头id
private Integer fireCount = 1; //火情数量
private String confirm = "NONE";//是否确认火情，确认 CONFIRM,取消CANCEL,未操作 NONE
private String picture1;
private String picture2;
private String picture3;
private String picture4;
private String fireTruckRoute;
private Boolean runstep; //是否已经执行流程
private String step;//当前步骤
private String buttonCode;
private String buttonState;
private String stepState;//步骤操作状态
private Date createDate = new Date();
public String getFireEquipmentName() {
return fireEquipmentName;
}
public void setFireEquipmentName(String fireEquipmentName) {
this.fireEquipmentName = fireEquipmentName;
}
public String getFireEquipmentId() {
return fireEquipmentId;
}
public void setFireEquipmentId(String fireEquipmentId) {
this.fireEquipmentId = fireEquipmentId;
}
public Integer getLayer() {
return layer;
}
public void setLayer(Integer layer) {
this.layer = layer;
}
public Integer getFireEquipmentLayer() {
return fireEquipmentLayer;
}
public void setFireEquipmentLayer(Integer fireEquipmentLayer) {
this.fireEquipmentLayer = fireEquipmentLayer;
}
public String getFireEquipmentPosition() {
return fireEquipmentPosition;
}
public void setFireEquipmentPosition(String fireEquipmentPosition) {
this.fireEquipmentPosition = fireEquipmentPosition;
}
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 String getEquipmentPosition3d() {
return equipmentPosition3d;
}
public void setEquipmentPosition3d(String equipmentPosition3d) {
this.equipmentPosition3d = equipmentPosition3d;
}
public String getMobile() {
return mobile;
}
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;
}
public String getCameraIds() {
return cameraIds;
}
public void setCameraIds(String cameraIds) {
this.cameraIds = cameraIds;
}
public Integer getFireCount() {
return fireCount;
}
public void setFireCount(Integer fireCount) {
this.fireCount = fireCount;
}
public String getConfirm() {
return confirm;
}
public void setConfirm(String confirm) {
this.confirm = confirm;
}
public String getPicture1() {
return picture1;
}
public void setPicture1(String picture1) {
this.picture1 = picture1;
}
public String getPicture2() {
return picture2;
}
public void setPicture2(String picture2) {
this.picture2 = picture2;
}
public String getPicture3() {
return picture3;
}
public void setPicture3(String picture3) {
this.picture3 = picture3;
}
public String getPicture4() {
return picture4;
}
public void setPicture4(String picture4) {
this.picture4 = picture4;
}
public String getFireTruckRoute() {
return fireTruckRoute;
}
public void setFireTruckRoute(String fireTruckRoute) {
this.fireTruckRoute = fireTruckRoute;
}
public Boolean getRunstep() {
return runstep;
}
public void setRunstep(Boolean runstep) {
this.runstep = runstep;
}
public String getStep() {
return step;
}
public void setStep(String step) {
this.step = step;
}
public String getButtonCode() {
return buttonCode;
}
public void setButtonCode(String buttonCode) {
this.buttonCode = buttonCode;
}
public String getButtonState() {
return buttonState;
}
public void setButtonState(String buttonState) {
this.buttonState = buttonState;
}
public String getStepState() {
return stepState;
}
public void setStepState(String stepState) {
this.stepState = stepState;
}
/**
* @return the createDate
*/
public Date getCreateDate() {
return createDate;
}
/**
* @param createDate the createDate to set
*/
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/FireEquimentDataRo.java deleted 100644 → 0
View file @ c3903018
package com.yeejoin.amos.fas.business.service.model;
public class FireEquimentDataRo extends BasicsRo
{
private long fireEquimentId;
private String fireEqumentName;
private long id;//监测点id
private String name;//名称
private String unit;//单位
private String value;//值 0 / 1
private String dataType;//值类型
/**
* 设备编号
*/
private String code;
/**
* 监测对象 名称
*/
private String monitor;
private String equimentId;
/**
* 状态
*/
private String nodeState;
private String alarmType;
public String getAlarmType() {
return alarmType;
}
public void setAlarmType(String alarmType) {
this.alarmType = alarmType;
}
public String getEquimentId() {
return equimentId;
}
public void setEquimentId(String equimentId) {
this.equimentId = equimentId;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getMonitor() {
return monitor;
}
public void setMonitor(String monitor) {
this.monitor = monitor;
}
public String getNodeState() {
return nodeState;
}
public void setNodeState(String nodeState) {
this.nodeState = nodeState;
}
public long getFireEquimentId() {
return fireEquimentId;
}
public void setFireEquimentId(long fireEquimentId) {
this.fireEquimentId = fireEquimentId;
}
public String getFireEqumentName() {
return fireEqumentName;
}
public void setFireEqumentName(String fireEqumentName) {
this.fireEqumentName = fireEqumentName;
}
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public String getDataType() {
return dataType;
}
public void setDataType(String dataType) {
this.dataType = dataType;
}
}
\ No newline at end of file
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/ProtalDataRo.java deleted 100644 → 0
View file @ c3903018
package com.yeejoin.amos.fas.business.service.model;
import java.util.Date;
import java.util.List;
import com.yeejoin.amos.fas.core.common.request.DateUtil;
public class ProtalDataRo extends BasicsRo {
private static final long serialVersionUID = -1029442967802232959L;
private Long id;//巡检点id
private String name; //名称
private String nodeState;//实时状态
private String originalNodeState;//记录状态状态
private String level;//巡检点级别
/**
* 巡检点编号
*/
private String pointNo;
/**
* 责任人
*/
private String userName;
/**
* 巡检人员
*/
private String checkUser;
/**
* 任务编号，如果无任务，则填充0
*/
private Long taskId=0l;
/**
* 任务状态
*/
private Integer taskState;
/**
* 上一次任务状态
*/
private String originalTaskState;
private String taskName;//任务名称
private String content;//内容
private String pointName;//巡检点名称
private String currTime;//当前时间
public String getCurrTime() {
if (currTime == null)
{
return DateUtil.getDateTimeFormat(DateUtil.getNow());
}
return currTime;
}
public void setCurrTime(String currTime) {
this.currTime = currTime;
}
private List<CheckInputItemRo> items;
private List<CheckInputItemRo> pointInputitems;
public List<CheckInputItemRo> getPointInputitems() {
return pointInputitems;
}
public void setPointInputitems(List<CheckInputItemRo> pointInputitems) {
this.pointInputitems = pointInputitems;
}
public List<CheckInputItemRo> getItems() {
return items;
}
public void setItems(List<CheckInputItemRo> items) {
this.items = items;
}
public String getPointNo() {
return pointNo;
}
public void setPointNo(String pointNo) {
this.pointNo = pointNo;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public long getTaskId() {
return taskId;
}
public void setTaskId(long taskId) {
this.taskId = taskId;
}
public Integer getTaskState() {
return taskState;
}
public void setTaskState(Integer taskState) {
this.taskState = taskState;
}
public String getOriginalTaskState() {
return originalTaskState;
}
public void setOriginalTaskState(String originalTaskState) {
this.originalTaskState = originalTaskState;
}
public String getCheckUser() {
return checkUser;
}
public void setCheckUser(String checkUser) {
this.checkUser = checkUser;
}
public String getTaskName() {
return taskName;
}
public void setTaskName(String taskName) {
this.taskName = taskName;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getPointName() {
return pointName;
}
public void setPointName(String pointName) {
this.pointName = pointName;
}
public String getLevel() {
return level;
}
public void setLevel(String level) {
this.level = level;
}
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getNodeState() {
return nodeState;
}
public void setNodeState(String nodeState) {
this.nodeState = nodeState;
}
public String getOriginalNodeState() {
return originalNodeState;
}
public void setOriginalNodeState(String originalNodeState) {
this.originalNodeState = originalNodeState;
}
}
\ No newline at end of file
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/RiskSourceRuleRo.java deleted 100644 → 0
View file @ c3903018
package com.yeejoin.amos.fas.business.service.model;
import java.math.BigDecimal;
public class RiskSourceRuleRo extends BasicsRo {
private static final long serialVersionUID = -1029442967802232957L;
/**
* patrol、equipment、update、delete
*/
private String type;
private Long id;
private BigDecimal rpnr;
private BigDecimal rpni;
/**
* 风险增益
*/
private String rg;
/**
* up、down、no
*/
private String levelChangeType;
/**
* 消息内容
*/
private String content;
/**
* 消息标题
*/
private String title;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public BigDecimal getRpnr() {
return rpnr;
}
public void setRpnr(BigDecimal rpnr) {
this.rpnr = rpnr;
}
public BigDecimal getRpni() {
return rpni;
}
public void setRpni(BigDecimal rpni) {
this.rpni = rpni;
}
public String getLevelChangeType() {
return levelChangeType;
}
public void setLevelChangeType(String levelChangeType) {
this.levelChangeType = levelChangeType;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getRg() {
return rg;
}
public void setRg(String rg) {
this.rg = rg;
}
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/ToipResponse.java
View file @ a2bc0e4d
package com.yeejoin.amos.fas.business.service.model; package com.yeejoin.amos.fas.business.service.model;
import java.io.Serializable;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.yeejoin.amos.fas.core.util.CommonResponse; import com.yeejoin.amos.fas.core.util.CommonResponse;
import com.yeejoin.amos.fas.dao.entity.BusinessEntity;
import lombok.Data;
/** /**
* *
...@@ -12,7 +17,8 @@ import com.yeejoin.amos.fas.dao.entity.BusinessEntity; ...@@ -12,7 +17,8 @@ import com.yeejoin.amos.fas.dao.entity.BusinessEntity;
* @author HK * @author HK
* @version $Id: ToipResponse.java, v 0.1 2018年1月26日 下午5:02:12 HK Exp $ * @version $Id: ToipResponse.java, v 0.1 2018年1月26日 下午5:02:12 HK Exp $
*/ */
public class ToipResponse extends CommonResponse @Data
public class ToipResponse implements Serializable
{ {
// 具体界面域由三部分组成: [IFDomain].[group].[template], 其中 group可选 [IFDomain].[template] // 具体界面域由三部分组成: [IFDomain].[group].[template], 其中 group可选 [IFDomain].[template]
// dispatch.map.marker.basic // dispatch.map.marker.basic
...@@ -22,102 +28,35 @@ public class ToipResponse extends CommonResponse ...@@ -22,102 +28,35 @@ public class ToipResponse extends CommonResponse
* *
* </pre> * </pre>
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = -7035041461377884452L;
/**
*
*/
/** /**
* 界面域 * 界面域
* 例如 * 例如
* dispatch.map * dispatch.map
*/ */
private String IFDomain; private String msgType;
/** /**
* 模板类型 * 模板类型
* 例如 * 例如
* basic * basic
*/ */
private String template; private Object msgContext;
/** /**
* 模板组 * 模板组
* 例如 * 例如
* marker * marker
*/ */
private String group; private Object contingency;
/**
* 智能体业务对象
*/
private BusinessEntity bizObj;
/**
* 动作ID
*/
private String actionId;
/**
* 火灾id
*/
private String fireId;
private String domainView; public String toJsonStr() {
return JSON.toJSONString(this,SerializerFeature.WriteMapNullValue,SerializerFeature.DisableCircularReferenceDetect,SerializerFeature.SkipTransientField);
public String getIFDomain()
{
return IFDomain;
}
public void setIFDomain(String iFDomain)
{
IFDomain = iFDomain;
}
public String getTemplate()
{
return template;
}
public void setTemplate(String template)
{
this.template = template;
}
public String getGroup()
{
return group;
}
public void setGroup(String group)
{
this.group = group;
}
public BusinessEntity getBizObj() {
return bizObj;
}
public void setBizObj(BusinessEntity bizObj) {
this.bizObj = bizObj;
}
public String getActionId() {
return actionId;
}
public void setActionId(String actionId) {
this.actionId = actionId;
}
public String getDomainView() {
return domainView;
}
public void setDomainView(String domainView) {
this.domainView = domainView;
}
public String getFireId() {
return fireId;
}
public void setFireId(String fireId) {
this.fireId = fireId;
} }
} }
YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties
View file @ a2bc0e4d
...@@ -60,6 +60,10 @@ DutyMode.dutyUrl=http://172.16.11.36:10005/ ...@@ -60,6 +60,10 @@ DutyMode.dutyUrl=http://172.16.11.36:10005/
##\u89C4\u5219\u5BF9\u8C61\u81EA\u52A8\u626B\u63CF ##\u89C4\u5219\u5BF9\u8C61\u81EA\u52A8\u626B\u63CF
rule.definition.load=true rule.definition.load=true
rule.definition.model-package=com.yeejoin.amos.fas.business.service.model rule.definition.model-package=com.yeejoin.amos.fas.business.action.model
rule.definition.default-agency=STATE_GRID
amos.feign.gennerator.use-gateway=true
\ No newline at end of file amos.feign.gennerator.use-gateway=true
autoSys.push.type=mqtt
\ 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