From 66e71e5d4cb5bb3706f7c3662bbf7859f690ba84 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 09 May 2021 11:59:38 +0800
Subject: [PATCH] 新增查询当前设备未处理和处理中的警情数量接口，当前设备一个警情处理完成后，如果当前设备还有其他预警未处理完成的，当前设备状态不会修改回正常状态
---
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