diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java index 1c5d24a..6197372 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/FsmModel.java @@ -69,7 +69,4 @@ public class FsmModel implements Serializable { @ApiParam("进入触发方法时默认不需要校验外部触发") private boolean checkTriggerTypeFalg = false; - @ApiParam("下个触发事件") - private String nextTriggerEvent; - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java new file mode 100644 index 0000000..bc8c717 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/ModuleResult.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.andon.model; + + +import io.swagger.annotations.Api; +import lombok.Data; + +@Data +@Api("组件返回信息") +public class ModuleResult { + + private boolean isCompleted; + + private String msg; + + private String nextTriggerEvent; + + public static ModuleResult getNonComplete() { + return new ModuleResult(false, ""); + } + + public static ModuleResult getNonComplete(String msg) { + return new ModuleResult(false, msg); + } + + public static ModuleResult getCustomNonComplete(String nextTriggerEvent) { + return new ModuleResult(false, "", nextTriggerEvent); + } + + public static ModuleResult getCustomNonComplete(String msg, String nextTriggerEvent) { + return new ModuleResult(false, msg, nextTriggerEvent); + } + + public static ModuleResult getSuccessComplete() { + return new ModuleResult(true, ""); + } + + public static ModuleResult getSuccessComplete(String msg) { + return new ModuleResult(true, msg); + } + + public static ModuleResult getCustomSuccessComplete(String nextTriggerEvent) { + return new ModuleResult(true, "", nextTriggerEvent); + } + + public static ModuleResult getCustomSuccessComplete(String msg, String nextTriggerEvent) { + return new ModuleResult(true, msg, nextTriggerEvent); + } + + private ModuleResult() { + } + + private ModuleResult(boolean isCompleted, String msg) { + this.isCompleted = isCompleted; + this.msg = msg; + } + + public ModuleResult(boolean isCompleted, String msg, String nextTriggerEvent) { + this.isCompleted = isCompleted; + this.msg = msg; + this.nextTriggerEvent = nextTriggerEvent; + } + +}