From ee7238bdbac74ecfac00325ec3edbbc0f910db34 Mon Sep 17 00:00:00 2001
From: wupeng <finkywu@163.com>
Date: Mon, 14 Aug 2023 15:38:20 +0800
Subject: [PATCH] fixbug

---
 .../vo/request/DownLoadInboundFileReq.java    | 13 ++++
 .../com/ils/oms/vo/response/FileInfoResp.java | 57 +++++++++++++++++
 .../java/com/ils/oms/RabbitMqHelloTest.java   | 62 +++++++++----------
 .../java/com/ils/oms/RestTemplateTest.java    |  6 +-
 4 files changed, 104 insertions(+), 34 deletions(-)
 create mode 100644 src/main/java/com/ils/oms/vo/request/DownLoadInboundFileReq.java
 create mode 100644 src/main/java/com/ils/oms/vo/response/FileInfoResp.java

diff --git a/src/main/java/com/ils/oms/vo/request/DownLoadInboundFileReq.java b/src/main/java/com/ils/oms/vo/request/DownLoadInboundFileReq.java
new file mode 100644
index 0000000..116ffcb
--- /dev/null
+++ b/src/main/java/com/ils/oms/vo/request/DownLoadInboundFileReq.java
@@ -0,0 +1,13 @@
+package org.ils.order.vo.request;
+
+import lombok.Data;
+
+/**
+ * 下载入仓单请求对象
+ */
+@Data
+public class DownLoadInboundFileReq {
+    private String createdDate;
+    private String type;
+    private String userName;
+}
diff --git a/src/main/java/com/ils/oms/vo/response/FileInfoResp.java b/src/main/java/com/ils/oms/vo/response/FileInfoResp.java
new file mode 100644
index 0000000..91f5fd3
--- /dev/null
+++ b/src/main/java/com/ils/oms/vo/response/FileInfoResp.java
@@ -0,0 +1,57 @@
+package com.ils.oms.vo.response;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 文件上传返回格式
+ */
+@Data
+public class FileInfoResp implements Serializable {
+
+    private String id;
+
+    private String url;
+
+
+    private Long size;
+
+
+    private String filename;
+
+
+    private String originalFilename;
+
+
+    private String basePath;
+
+    private String path;
+
+    private String ext;
+
+    private String contentType;
+
+    private String platform;
+
+    private String thUrl;
+
+
+    private String thFilename;
+
+    private Long thSize;
+
+    private String thContentType;
+
+    private String objectId;
+    private String objectType;
+
+    private String attr;
+
+    private String fileAcl;
+
+    private String thFileAcl;
+
+    private Date createTime;
+}
diff --git a/src/test/java/com/ils/oms/RabbitMqHelloTest.java b/src/test/java/com/ils/oms/RabbitMqHelloTest.java
index 0b9b7ab..4679da1 100644
--- a/src/test/java/com/ils/oms/RabbitMqHelloTest.java
+++ b/src/test/java/com/ils/oms/RabbitMqHelloTest.java
@@ -1,31 +1,31 @@
-package com.ils.oms;
-
-import cn.hutool.json.JSONObject;
-import com.alibaba.fastjson.JSON;
-import lombok.extern.slf4j.Slf4j;
-import com.ils.oms.properties.BaseConfigProperties;
-import com.ils.oms.listener.rabbitmq.RabbitSender;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@Slf4j
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public  class RabbitMqHelloTest{
-    @Autowired
-    private BaseConfigProperties baseConfig;
-
-    @Autowired
-    private RabbitSender rabbitSender;
-    @Test
-    public void test(){
-        JSONObject json = new JSONObject();
-        json.put("userName","test123");
-        json.put("passWord","123456");
-        rabbitSender.sendOrderQueue( baseConfig.getOrderQueue(), JSON.toJSONString(json));
-        log.info( "send: {}", true);
-    }
-}
\ No newline at end of file
+//package com.ils.oms;
+//
+//import cn.hutool.json.JSONObject;
+//import com.alibaba.fastjson.JSON;
+//import lombok.extern.slf4j.Slf4j;
+//import com.ils.oms.properties.BaseConfigProperties;
+//import com.ils.oms.listener.rabbitmq.RabbitSender;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//@Slf4j
+//@RunWith(SpringRunner.class)
+//@SpringBootTest
+//public  class RabbitMqHelloTest{
+//    @Autowired
+//    private BaseConfigProperties baseConfig;
+//
+//    @Autowired
+//    private RabbitSender rabbitSender;
+//    @Test
+//    public void test(){
+//        JSONObject json = new JSONObject();
+//        json.put("userName","test123");
+//        json.put("passWord","123456");
+//        rabbitSender.sendOrderQueue( baseConfig.getOrderQueue(), JSON.toJSONString(json));
+//        log.info( "send: {}", true);
+//    }
+//}
\ No newline at end of file
diff --git a/src/test/java/com/ils/oms/RestTemplateTest.java b/src/test/java/com/ils/oms/RestTemplateTest.java
index 23c4212..a571bcb 100644
--- a/src/test/java/com/ils/oms/RestTemplateTest.java
+++ b/src/test/java/com/ils/oms/RestTemplateTest.java
@@ -2,7 +2,7 @@ package com.ils.oms;
 
 import lombok.extern.slf4j.Slf4j;
 import com.ils.oms.dto.MainLinePageDto;
-import com.ils.oms.properties.BaseConfigProperties;
+//import com.ils.oms.properties.BaseConfigProperties;
 import com.ils.oms.result.Result;
 import com.ils.oms.service.impl.MainLineServiceImpl;
 import org.junit.Test;
@@ -17,8 +17,8 @@ import org.springframework.test.context.junit4.SpringRunner;
 @SpringBootTest
 public  class RestTemplateTest {
 
-    @Autowired
-    private BaseConfigProperties baseConfig;
+//    @Autowired
+//    private BaseConfigProperties baseConfig;
 
     @Autowired
     private MainLineServiceImpl mainLineServiceImpl;