Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
customer-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QG
customer-service
Commits
d68a91af
Commit
d68a91af
authored
Feb 25, 2022
by
吴琼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除mockMutiFile
parent
26f1f661
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
18 deletions
+5
-18
pom.xml
pom.xml
+2
-2
TransactionReceiptRecordRest.java
...uantgroup/customer/rest/TransactionReceiptRecordRest.java
+3
-16
No files found.
pom.xml
View file @
d68a91af
...
@@ -273,10 +273,10 @@
...
@@ -273,10 +273,10 @@
<artifactId>
jsch
</artifactId>
<artifactId>
jsch
</artifactId>
<version>
0.1.54
</version>
<version>
0.1.54
</version>
</dependency>
</dependency>
<dependency>
<!--
<dependency>
<groupId>org.springframework</groupId>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<artifactId>spring-test</artifactId>
</dependency>
</dependency>
-->
</dependencies>
</dependencies>
</project>
</project>
src/main/java/cn/quantgroup/customer/rest/TransactionReceiptRecordRest.java
View file @
d68a91af
...
@@ -9,19 +9,10 @@ import com.alibaba.fastjson.JSONArray;
...
@@ -9,19 +9,10 @@ import com.alibaba.fastjson.JSONArray;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.google.common.collect.Maps
;
import
com.google.common.collect.Maps
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.http.entity.ContentType
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Page
;
import
org.springframework.mock.web.MockMultipartFile
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.commons.CommonsMultipartFile
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -62,13 +53,9 @@ public class TransactionReceiptRecordRest {
...
@@ -62,13 +53,9 @@ public class TransactionReceiptRecordRest {
*/
*/
@RequestMapping
(
"/orderQuery/importTransactionReceiptRecord"
)
@RequestMapping
(
"/orderQuery/importTransactionReceiptRecord"
)
@ResponseBody
@ResponseBody
public
JsonResult
importTransactionReceiptRecord
(
MultipartFile
multipartF
ile
)
{
public
JsonResult
importTransactionReceiptRecord
(
@RequestParam
(
"file"
)
MultipartFile
f
ile
)
{
try
{
try
{
/*File excelFile =new File("D://交易凭证.xlsx");
return
transactionReceiptRecordService
.
importTransactionReceiptRecord
(
file
);
FileInputStream inputStream =new FileInputStream(excelFile);
multipartFile = new MockMultipartFile(excelFile.getName(), excelFile.getName(),
ContentType.APPLICATION_OCTET_STREAM.toString(), inputStream);*/
return
transactionReceiptRecordService
.
importTransactionReceiptRecord
(
multipartFile
);
}
catch
(
IOException
e
){
}
catch
(
IOException
e
){
e
.
printStackTrace
();
e
.
printStackTrace
();
return
JsonResult
.
buildErrorStateResult
(
"上传文件出现错误"
);
return
JsonResult
.
buildErrorStateResult
(
"上传文件出现错误"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment