diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/elise/EliseStatesClient.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/elise/EliseStatesClient.java index 6bb6386..0c19005 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/elise/EliseStatesClient.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/elise/EliseStatesClient.java @@ -26,4 +26,6 @@ public interface EliseStatesClient { */ EliseGetWhetherPushResp getWhetherPush(EliseGetWhetherPushReq req); + + } diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/EventHubActionClient.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/EventHubActionClient.java new file mode 100644 index 0000000..4a77300 --- /dev/null +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/EventHubActionClient.java @@ -0,0 +1,9 @@ +package cn.axzo.orgmanax.infra.client.eventhub; + +import org.springframework.web.bind.annotation.RequestBody; + +import javax.validation.Valid; + +public interface EventHubActionClient { + +} diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/dto/EventHubPerformActionReq.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/dto/EventHubPerformActionReq.java new file mode 100644 index 0000000..9498a54 --- /dev/null +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/dto/EventHubPerformActionReq.java @@ -0,0 +1,48 @@ +//package cn.axzo.orgmanax.infra.client.eventhub.dto; +// +//import com.alibaba.fastjson.JSON; +//import lombok.Data; +// +//import javax.validation.constraints.NotBlank; +// +//@Data +//public class EventHubPerformActionReq { +// +// +// /** +// * 事件编码 +// */ +// @NotBlank(message = "eventCode不能为空") +// private String eventCode; +// +// /** +// * 发送待办和IM消息的参数 +// */ +// private MessageSendRequestV4 messageSendRequest; +// +// /** +// * 生成标签的参数 +// */ +// private GenTagRequest genTagRequest; +// +// /** +// * 终止待办 +// */ +// private EventTodoTerminateRequest todoTerminateRequest; +// +// /** +// * 转交待办 +// */ +// private EventTodoHandoverRequest todoHandoverRequest; +// +// /** +// * 操作人id +// */ +// private Long operatePersonId; +// +// @Override +// public String toString() { +// return JSON.toJSONString(this); +// } +// +//} diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/dto/MessageSendBasicInfoV4.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/dto/MessageSendBasicInfoV4.java new file mode 100644 index 0000000..b944d14 --- /dev/null +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/dto/MessageSendBasicInfoV4.java @@ -0,0 +1,66 @@ +//package cn.axzo.orgmanax.infra.client.eventhub.dto; +// +//import com.alibaba.fastjson.JSONObject; +//import lombok.Data; +// +//import javax.validation.constraints.NotNull; +//import java.util.List; +// +//@Data +//public class MessageSendBasicInfoV4 { +// +// /** +// * 发起者 +// *

如果是平台,则发起人为空 +// */ +// private PersonV3DTO sender; +// +// /** +// * 接收者列表 +// */ +// @NotNull(message = "接收者列表不能为空") +// private List receivers; +// +// /** +// * 关联业务唯一标识 +// * 例如: 请假申请的编号 +// */ +// private String bizCode; +// +// /** +// * 业务扩展参数-JSON字符串格式 +// */ +// private JSONObject bizExtParams; +// +// /** +// * 路由参数-JSON字符串格式 +// */ +// private JSONObject routerParams; +// +// /** +// * 发送者项目部ID +// */ +// private Long senderWorkspaceId; +// +// /** +// * 发送者企业ID +// */ +// private Long senderOuId; +// +// /** +// * 接收者项目部ID +// */ +// private Long receiversWorkspaceId; +// +// /** +// * 接收者企业ID +// *

如果是工人,则所在企业可以为空;其它均必传 +// */ +// private Long receiversOuId; +// +// /** +// * 接收者(消息)所属组织类型 +// */ +// private OrganizationTypeEnum receiversOrgType; +// +//} diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/dto/MessageSendRequestV4.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/dto/MessageSendRequestV4.java new file mode 100644 index 0000000..85c3a86 --- /dev/null +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/dto/MessageSendRequestV4.java @@ -0,0 +1,28 @@ +//package cn.axzo.orgmanax.infra.client.eventhub.dto; +// +//import lombok.Data; +// +//import javax.validation.constraints.NotNull; +// +//@Data +//public class MessageSendRequestV4 { +// +// /** +// * 发送IM和待办的基本信息, 必传 +// */ +// @NotNull +// private MessageSendBasicInfoV4 sendBasicInfo; +// +// /** +// * 发送待办时必传 +// */ +// private PendingSendInfo pendingSendInfo; +// +// // !! internal fields +// +// /** +// * 事件映射code +// */ +// private String eventMappingCode; +// +//} diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/dto/OrganizationTypeEnum.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/dto/OrganizationTypeEnum.java new file mode 100644 index 0000000..974dee8 --- /dev/null +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/eventhub/dto/OrganizationTypeEnum.java @@ -0,0 +1,22 @@ +package cn.axzo.orgmanax.infra.client.eventhub.dto; + +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor(access = AccessLevel.PRIVATE) +public enum OrganizationTypeEnum { + + ENT(2, "企业"), + PROJECT(1, "项目"), + UNKNOWN(0, "未知"); + + private final Integer code; + private final String message; + + public String stringCode() { + return String.valueOf(code); + } + +} diff --git a/orgmanax-integration/pom.xml b/orgmanax-integration/pom.xml index 65a9fe1..3840b98 100644 --- a/orgmanax-integration/pom.xml +++ b/orgmanax-integration/pom.xml @@ -41,6 +41,11 @@ orgmanax-server ${revision} + + cn.axzo.event-hub + event-hub-api + 1.0.0-SNAPSHOT + \ No newline at end of file