Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 49c52f4a authored by KeYong's avatar KeYong
Browse files
Options

Merge branch 'eqintegration' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into eqintegration

# Conflicts: # YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/config/PermissionAspect.java # YeeAmosFireAutoSysStart/src/main/resources/application.properties
parents 79838267 206934cc
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 24 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java
View file @ 49c52f4a
......@@ -210,7 +210,7 @@ public class ContingencyAction implements CustomerAction {
* @param stepType 步骤类型，总览步骤、详细步骤
* @param paramObj 预案对象
*/
@RuleMethod(methodLabel = "步骤更新", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "步骤更新", project = "换流站消防专项预案")
public void stepInfo(@MethodParam(paramLabel = "当前编号") String stepCode,
// @MethodParam(paramLabel = "步骤类型") String stepType,
@MethodParam(paramLabel = "对象") Object paramObj) {
......@@ -255,7 +255,7 @@ public class ContingencyAction implements CustomerAction {
* @param stepCode 当前步骤编号
* @param paramObj 预案对象
*/
@RuleMethod(methodLabel = "步骤更新保存", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "步骤更新保存", project = "换流站消防专项预案")
public void saveStepInfo(@MethodParam(paramLabel = "当前编号") String stepCode, @MethodParam(paramLabel = "对象") Object paramObj) {
ContingencyRo contingencyRo = (ContingencyRo) paramObj;
iContingencyInstance.updateStep(stepCode, contingencyRo.getBatchNo());
......@@ -266,7 +266,7 @@ public class ContingencyAction implements CustomerAction {
* @param content 消息内容
* @param paramObj 预案对象
*/
@RuleMethod(methodLabel = "执行记录", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "执行记录", project = "换流站消防专项预案")
public void messageRecord(@MethodParam(paramLabel = "消息内容") String content, @MethodParam(paramLabel = "对象") Object paramObj) {
ContingencyRo contingencyRo = (ContingencyRo) paramObj;
stopSnapshop(contingencyRo);
......@@ -311,7 +311,7 @@ public class ContingencyAction implements CustomerAction {
* @param content 内容
* @param paramObj 预案对象
*/
@RuleMethod(methodLabel = "智能辅助", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "智能辅助", project = "换流站消防专项预案")
public void help(@MethodParam(paramLabel = "当前步骤") String step,
@MethodParam(paramLabel = "图标")String icon,
@MethodParam(paramLabel = "标题")String title,
......@@ -393,7 +393,7 @@ public class ContingencyAction implements CustomerAction {
* @param buttonJson 按钮json字符串
* @param paramObj 预案对象
*/
@RuleMethod(methodLabel = "交互动作", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "交互动作", project = "换流站消防专项预案")
public void operation(@MethodParam(paramLabel = "动作名称") String actionName,
@MethodParam(paramLabel = "图标") String icon,
@MethodParam(paramLabel = "提示信息") String tips,
......@@ -468,7 +468,7 @@ public class ContingencyAction implements CustomerAction {
* @param buttonJson 按钮json字符串
* @param paramObj 预案对象
*/
@RuleMethod(methodLabel = "保存交互动作", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "保存交互动作", project = "换流站消防专项预案")
public void saveOperation(@MethodParam(paramLabel = "动作名称") String actionName,
@MethodParam(paramLabel = "图标") String icon,
@MethodParam(paramLabel = "提示信息") String tips,
......@@ -526,7 +526,7 @@ public class ContingencyAction implements CustomerAction {
* @param actionName 动作名称标识
* @param paramObj 预案对象
*/
@RuleMethod(methodLabel = "地图动作", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "地图动作", project = "换流站消防专项预案")
public void mapAction(@MethodParam(paramLabel = "动作名称标识") String actionName, @MethodParam(paramLabel = "参数") String paramJSON, @MethodParam(paramLabel = "对象") Object paramObj) {
ContingencyRo contingencyRo = (ContingencyRo) paramObj;
......@@ -542,7 +542,7 @@ public class ContingencyAction implements CustomerAction {
this.sendcmd("maparea", paramObj, result);
}
@RuleMethod(methodLabel = "地图动画", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "地图动画", project = "换流站消防专项预案")
public void mapCartoonAction(
@MethodParam(paramLabel = "动作名称标识") String actionName,
@MethodParam(paramLabel = "动作类型") String actionType,
......@@ -571,7 +571,7 @@ public class ContingencyAction implements CustomerAction {
* @param messageType 消息类型 messageType 黑色框消息类型CONTINGENCY,，滚动消息：CURRENTMESSAGE
* @param paramObj 预案对象
*/
@RuleMethod(methodLabel = "消息提示", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "消息提示", project = "换流站消防专项预案")
public void topMessage(
@MethodParam(paramLabel = "标题") String title,
@MethodParam(paramLabel = "内容") String content,
......@@ -600,7 +600,7 @@ public class ContingencyAction implements CustomerAction {
*
* @param paramObj 预案对象
*/
@RuleMethod(methodLabel = "启动预案", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "启动预案", project = "换流站消防专项预案")
public void startPlan(@MethodParam(paramLabel = "对象") Object paramObj) {
ContingencyRo contingencyRo = (ContingencyRo) paramObj;
stopSnapshop(contingencyRo);
......@@ -623,7 +623,7 @@ public class ContingencyAction implements CustomerAction {
*
* @param paramObj 预案对象
*/
@RuleMethod(methodLabel = "结束预案", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "结束预案", project = "换流站消防专项预案")
public void stopPlan(@MethodParam(paramLabel = "对象") Object paramObj) {
ContingencyRo contingencyRo = (ContingencyRo) paramObj;
stopSnapshop(contingencyRo);
......@@ -641,7 +641,7 @@ public class ContingencyAction implements CustomerAction {
}
@RuleMethod(methodLabel = "自动执行步骤", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "自动执行步骤", project = "换流站消防专项预案")
public void autoExecute(
@MethodParam(paramLabel = "动作名称") String actionName,
@MethodParam(paramLabel = "步骤编号") String stepCode,
......@@ -668,7 +668,7 @@ public class ContingencyAction implements CustomerAction {
}
}
@RuleMethod(methodLabel = "添加步骤执行", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "添加步骤执行", project = "换流站消防专项预案")
public void addExecute(
@MethodParam(paramLabel = "步骤编号") String stepCode,
@MethodParam(paramLabel = "按钮编码") String buttonCode,
......@@ -692,7 +692,7 @@ public class ContingencyAction implements CustomerAction {
this.sendcmd("message", ro, result);
}
@RuleMethod(methodLabel = "清除步骤执行", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "清除步骤执行", project = "换流站消防专项预案")
public void clearExecute(
@MethodParam(paramLabel = "步骤编号") String stepCode,
@MethodParam(paramLabel = "按钮编码") String buttonCode,
......@@ -721,7 +721,7 @@ public class ContingencyAction implements CustomerAction {
this.sendcmd("message", ro, result);
}
@RuleMethod(methodLabel = "同步自动执行步骤", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "同步自动执行步骤", project = "换流站消防专项预案")
public void sendExecute(@MethodParam(paramLabel = "预案对象") Object paramObj) {
SafteyPlanResult result = new SafteyPlanResult();
Map<String, Object> tempmap1 = new HashMap<>();
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/RiskSituationAction.java
View file @ 49c52f4a
......@@ -42,7 +42,7 @@ public class RiskSituationAction implements CustomerAction
@Value("${spring.application.name}")
private String serviceName;
@RuleMethod(methodLabel = "气泡提示", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "气泡提示", project = "换流站消防专项预案")
public void sendBubbleTip(@MethodParam(paramLabel = "bizobj对象") Object bizobj,
@MethodParam(paramLabel = "是否显示名称") Boolean showInfo,
@MethodParam(paramLabel = "标题") String title)
......@@ -82,7 +82,7 @@ public class RiskSituationAction implements CustomerAction
}
}
@RuleMethod(methodLabel = "区域颜色改变", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "区域颜色改变", project = "换流站消防专项预案")
public void regionChange(@MethodParam(paramLabel = "bizobj对象") Object bizobj, @MethodParam(paramLabel = "颜色") String colour)
{
BubbleTipResult result = new BubbleTipResult();
......@@ -117,12 +117,11 @@ public class RiskSituationAction implements CustomerAction
//@ExposeAction(value = "区域闪烁",snapshot = false)
@RuleMethod(methodLabel = "区域闪烁", project = "青海换流站消防预案")
@RuleMethod(methodLabel = "区域闪烁", project = "换流站消防专项预案")
public void regionFlicker(@MethodParam(paramLabel = "bizobj对象") Object bizobj, @MethodParam(paramLabel = "闪烁频率") Integer frequency)
{
BubbleTipResult result = new BubbleTipResult();
Map<String, Object> tempmap1 = new HashMap<>();
tempmap1.put("bizobj", bizobj);
result.add(tempmap1);
//更改颜色
Map<String, Object> tempmap2 = new HashMap<>();
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/ContingencyRo.java
View file @ 49c52f4a
......@@ -9,7 +9,7 @@ import com.yeejoin.amos.component.rule.RuleFact;
import lombok.Data;
@RuleFact(value = "动态预案",project = "青海换流站消防预案")
@RuleFact(value = "动态预案",project = "换流站消防专项预案")
@Data
public class ContingencyRo implements Serializable {
@Label("批次号")
......@@ -17,7 +17,7 @@ public class ContingencyRo implements Serializable {
/**
*
*/
private static final long serialVersionUID = -8687517896814257800L;
private static final long serialVersionUID = 1863437780244849215L;
@Label("消防设备名称")
private String fireEquipmentName;//消防设备名称
@Label("消防设备id")
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/DeviceRo.java
View file @ 49c52f4a
......@@ -7,7 +7,7 @@ import com.yeejoin.amos.component.rule.RuleFact;
import lombok.Data;
@RuleFact(value = "设备数据",project = "青海换流站消防预案")
@RuleFact(value = "设备数据",project = "换流站消防专项预案")
@Data
public class DeviceRo implements Serializable{
/**
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/SafetyController.java
View file @ 49c52f4a
......@@ -61,7 +61,7 @@ public class SafetyController extends BaseController{
RequestContext.setToken(token);
RequestContext.setProduct(product);
RequestContext.setAppKey(appKey);
Object o = ruleTrigger.publish(newFact, "青海换流站消防预案/test", ArrayUtils.toArray());
Object o = ruleTrigger.publish(newFact, "换流站消防专项预案/test", ArrayUtils.toArray());
return CommonResponseUtil.success(o);
} catch (Exception e) {
e.printStackTrace();
......
YeeAmosFireAutoSysStart/src/main/resources/application.properties
View file @ 49c52f4a
spring.application.name = Amos-autosys
spring.application.name = AMOS-AUTOSYS
server.port = 8083
......
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