From d75df3633742564296e8dae307ba59b96c701cd8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 28 Apr 2021 17:36:02 +0800
Subject: [PATCH] 包裹报表导出超时问题解决，feign调用的时间设置是5s，可以单独对当前接口设置超时时间，修改每次获取第三方接口数据数量，由100条修改为1000条
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
index 10d60be..1221324 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
@@ -253,7 +253,7 @@
String substring = addr.substring(addr.length() - 4, addr.length());
if (substring.equals(".mp4")) {
arlistm.add(addr);
- } else if (substring.equals(".jpg")) {
+ } else if (substring.equals(".jpg") || substring.equals("JPEG")) {
arlistj.add(addr);
}
}
@@ -287,7 +287,7 @@
feedbackService.save(feedback);
Wj wj = new Wj();
- if (feedback.getSpaddress().equals("")&&feedback.getSpaddress().equals(null)) {
+ if (feedback.getSpaddress().equals("")&&feedback.getSpaddress()!=null) {
} else {
//获取视频地址
@@ -298,7 +298,7 @@
iWjService.insertfeed(wj);
}
}
- if (feedback.getTpaddress().equals("")&&feedback.getTpaddress().equals(null)){
+ if (feedback.getTpaddress().equals("")&&feedback.getTpaddress()!=null){
}
else {
--
Gitblit v1.9.3