新增队列api模块

applications/sale/sale-server/pom.xml

@@ -101,6 +101,11 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>purchase-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>transfers-api</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

applications/transfers/pom.xml

@@ -16,6 +16,7 @@
         <module>transfers-api</module>
         <module>transfers-server</module>
         <module>mall-api</module>
+        <module>transfers-dto</module>
     </modules>
 
 </project>

applications/transfers/transfers-api/pom.xml

@@ -21,6 +21,10 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>transfers-dto</artifactId>
+        </dependency>
         <!-- test -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

applications/transfers/transfers-api/src/main/java/com/usoftchina/saas/transfers/api/SendApi.java

@@ -0,0 +1,15 @@
+package com.usoftchina.saas.transfers.api;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchna.saas.transfers.dto.MessageInfo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(name = "transfers-server" , fallback = SendApiFallBack.class)
+public interface SendApi {
+
+    @PostMapping("/send/Message")
+    public Result sendMsg(@RequestBody MessageInfo info);
+
+}

applications/transfers/transfers-api/src/main/java/com/usoftchina/saas/transfers/api/SendApiFallBack.java

@@ -0,0 +1,19 @@
+package com.usoftchina.saas.transfers.api;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchna.saas.transfers.dto.MessageInfo;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author: guq
+ * @create: 2019-01-09 13:50
+ **/
+@Component
+public class SendApiFallBack implements SendApi{
+
+    @Override
+    public Result sendMsg(@RequestBody MessageInfo info) {
+        return Result.error("网络异常,请稍后重试!");
+    }
+}

applications/transfers/transfers-dto/pom.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>transfers</artifactId>
+        <groupId>com.usoftchina.saas</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>transfers-dto</artifactId>
+
+
+</project>

applications/transfers/transfers-dto/src/main/java/com/usoftchna/saas/transfers/dto/MessageInfo.java

@@ -0,0 +1,110 @@
+package com.usoftchna.saas.transfers.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author: guq
+ * @create: 2019-01-09 11:33
+ **/
+public class MessageInfo implements Serializable{
+        /**
+         * 消息ID
+         */
+        private String msgId;
+        /**
+         * 用户ID
+         */
+        private String userId;
+        /**
+         * 应用ID
+         */
+        private String appId;
+        /**
+         * 业务类型
+         */
+        private String bizType;
+
+        /**
+         * 业务单据ID
+         */
+
+        private String bizId;
+        /**
+         * 公司id
+         * @return
+         */
+        private Long companyId;
+
+        /**
+         * 时间戳
+         */
+        private long timestamp;
+
+        public long getTimestamp() {
+            return timestamp;
+        }
+
+        public void setTimestamp(long timestamp) {
+            this.timestamp = timestamp;
+        }
+
+        public String getMsgId() {
+            return msgId;
+        }
+
+        public void setMsgId(String msgId) {
+            this.msgId = msgId;
+        }
+
+        public String getUserId() {
+            return userId;
+        }
+
+        public void setUserId(String userId) {
+            this.userId = userId;
+        }
+
+        public String getAppId() {
+            return appId;
+        }
+
+        public void setAppId(String appId) {
+            this.appId = appId;
+        }
+
+        public String getBizType() {
+            return bizType;
+        }
+
+        public void setBizType(String bizType) {
+            this.bizType = bizType;
+        }
+
+        public String getBizId() {
+            return bizId;
+        }
+
+        public void setBizId(String bizId) {
+            this.bizId = bizId;
+        }
+
+        public MessageInfo(String userId, String appId, String bizType, String bizId) {
+            this.userId = userId;
+            this.appId = appId;
+            this.bizType = bizType;
+            this.bizId = bizId;
+            this.timestamp = new Date().getTime();
+        }
+
+        public MessageInfo() {
+
+        }
+        public Long getCompanyId() {
+            return companyId;
+        }
+
+        public void setCompanyId(Long companyId) {
+            this.companyId = companyId;
+        }
+}

applications/transfers/transfers-server/pom.xml

@@ -52,6 +52,10 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>commons-dto</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>transfers-dto</artifactId>
+        </dependency>
         <!-- db -->
         <dependency>
             <groupId>mysql</groupId>

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/controller/TransfersController.java

@@ -1,9 +1,9 @@
 package com.usoftchina.saas.transfers.controller;
 
 import com.usoftchina.saas.base.Result;
-import com.usoftchina.saas.transfers.po.MessageInfo;
 import com.usoftchina.saas.transfers.service.SendService;
 import com.usoftchina.saas.utils.StringUtils;
+import com.usoftchna.saas.transfers.dto.MessageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/po/MessageInfo.java

@@ -1,114 +0,0 @@
-package com.usoftchina.saas.transfers.po;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.UUID;
-
-/**
- * @Description 消息内容
- * @Author chenwei
- * @Date 2018/12/27
- */
-public class MessageInfo implements Serializable {
-    /**
-     * 消息ID
-     */
-    private String msgId;
-    /**
-     * 用户ID
-     */
-    private String userId;
-    /**
-     * 应用ID
-     */
-    private String appId;
-    /**
-     * 业务类型
-     */
-    private String bizType;
-
-    /**
-     * 业务单据ID
-     */
-
-    private String bizId;
-    /**
-     * 公司id
-     * @return
-     */
-    private Long companyId;
-
-    /**
-     * 时间戳
-     */
-    private long timestamp;
-
-    public long getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(long timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public String getMsgId() {
-        return msgId;
-    }
-
-    public void setMsgId(String msgId) {
-        this.msgId = msgId;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public String getBizType() {
-        return bizType;
-    }
-
-    public void setBizType(String bizType) {
-        this.bizType = bizType;
-    }
-
-    public String getBizId() {
-        return bizId;
-    }
-
-    public void setBizId(String bizId) {
-        this.bizId = bizId;
-    }
-
-    public MessageInfo(String userId, String bizType, String bizId, Long companyId) {
-        this.msgId = UUID.randomUUID().toString();
-        this.userId = userId;
-        this.appId = "trade";
-        this.bizType = bizType;
-        this.bizId = bizId;
-        this.companyId = companyId;
-        this.timestamp = new Date().getTime();
-    }
-
-    public MessageInfo() {
-
-    }
-    public Long getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Long companyId) {
-        this.companyId = companyId;
-    }
-}

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/service/ReceiveService.java

@@ -5,10 +5,10 @@ import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.transfers.config.RabbitConfig;
 import com.usoftchina.saas.transfers.mapper.BrokerMessageLogMapper;
 import com.usoftchina.saas.transfers.po.BrokerMessagelog;
-import com.usoftchina.saas.transfers.po.MessageInfo;
 import com.usoftchina.saas.transfers.task.*;
 import com.usoftchina.saas.utils.JsonUtils;
 import com.usoftchina.saas.utils.StringUtils;
+import com.usoftchna.saas.transfers.dto.MessageInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.rabbit.annotation.*;

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/service/SendService.java

@@ -4,10 +4,10 @@ import com.usoftchina.saas.transfers.config.ExpirationMessagePostProcessor;
 import com.usoftchina.saas.transfers.config.RabbitConfig;
 import com.usoftchina.saas.transfers.mapper.BrokerMessageLogMapper;
 import com.usoftchina.saas.transfers.po.BrokerMessagelog;
-import com.usoftchina.saas.transfers.po.MessageInfo;
 import com.usoftchina.saas.transfers.po.Status;
 import com.usoftchina.saas.utils.JsonUtils;
 import com.usoftchina.saas.utils.StringUtils;
+import com.usoftchna.saas.transfers.dto.MessageInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;

applications/transfers/transfers-server/src/test/java/com/usoftchina/saas/transfers/service/RabbitSendServiceTest.java

@@ -1,6 +1,6 @@
 package com.usoftchina.saas.transfers.service;
 
-import com.usoftchina.saas.transfers.po.MessageInfo;
+import com.usoftchna.saas.transfers.dto.MessageInfo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

pom.xml

@@ -221,6 +221,11 @@
                 <artifactId>mail-dto</artifactId>
                 <version>${project.release.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.usoftchina.saas</groupId>
+                <artifactId>transfers-dto</artifactId>
+                <version>${project.release.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.usoftchina.saas</groupId>
                 <artifactId>mail-api</artifactId>