From 5a9d6ae2f090a1da23fc8bb00f55db916823cdc7 Mon Sep 17 00:00:00 2001
From: wyw <373811525@qq.com>
Date: Sat, 17 Aug 2024 15:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=91=8A=E8=AD=A6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=94=9F=E4=BA=A7=E5=91=8A=E8=AD=A6=E7=9F=AD=E4=BF=A1?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anfang/controller/UploadedPhotosController.java      | 4 ++--
 .../anfang/service/IUploadedPhotosService.java           | 2 +-
 .../anfang/service/impl/UploadedPhotosServiceImpl.java   | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/controller/UploadedPhotosController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/controller/UploadedPhotosController.java
index aa7aa15..7ca3ca7 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/controller/UploadedPhotosController.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/controller/UploadedPhotosController.java
@@ -109,7 +109,7 @@ public class UploadedPhotosController extends BaseController {
             //抓拍监控，并返回路径
             String monitorPath = uploadedPhotosService.captureMonitorPhoto(sn);
             //推送告警短信通知
-            uploadedPhotosService.sendAlarmMessage(sn, doorState, shakeState);
+            uploadedPhotosService.sendAlarmMessage(sn, doorState, shakeState,eventType);
             UploadedPhotos uploadedPhotos = new UploadedPhotos(
                     null, fileName, monitorPath, imei, sn, latitude, longitude, temperature, doorState, shakeState,cpuTemp,eventType, date
             );
@@ -154,7 +154,7 @@ public class UploadedPhotosController extends BaseController {
         //抓拍监控，并返回路径
         String monitorPath = uploadedPhotosService.captureMonitorPhoto(sn);
         //推送告警短信通知
-        uploadedPhotosService.sendAlarmMessage(sn, doorState, shakeState);
+        uploadedPhotosService.sendAlarmMessage(sn, doorState, shakeState,eventType);
         UploadedPhotos uploadedPhotos = new UploadedPhotos(
                 null, "", monitorPath, imei, sn, latitude, longitude, temperature, doorState, shakeState,cpuTemp,eventType, date
         );
diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/service/IUploadedPhotosService.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/service/IUploadedPhotosService.java
index 269a319..3355aec 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/service/IUploadedPhotosService.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/service/IUploadedPhotosService.java
@@ -74,7 +74,7 @@ public interface IUploadedPhotosService
      * @param doorState
      * @param shakeState
      */
-    void sendAlarmMessage(String sn, String doorState, String shakeState);
+    void sendAlarmMessage(String sn, String doorState, String shakeState,String eventType);
 
     String doorAlert(DoorAlertBto doorAlertBto) throws Exception;
 
diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/service/impl/UploadedPhotosServiceImpl.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/service/impl/UploadedPhotosServiceImpl.java
index 74c3e6f..daaad3d 100644
--- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/service/impl/UploadedPhotosServiceImpl.java
+++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/service/impl/UploadedPhotosServiceImpl.java
@@ -213,7 +213,7 @@ public class UploadedPhotosServiceImpl implements IUploadedPhotosService {
 
 
     @Override
-    public void sendAlarmMessage(String sn, String doorState, String shakeState) {
+    public void sendAlarmMessage(String sn, String doorState, String shakeState,String eventType) {
         //
         boolean notify = false;
         SendParams sendParams = new SendParams();
@@ -235,11 +235,11 @@ public class UploadedPhotosServiceImpl implements IUploadedPhotosService {
         } else {
             return;
         }
-        if (Integer.parseInt(doorState) == 1) {
+        if (Integer.parseInt(eventType) == 2) {
             temp.put("warnInfo", "箱门打开");
             notify = true;
         } else {
-            if (Integer.parseInt(shakeState) == 1) {
+            if (Integer.parseInt(eventType) == 1) {
                 temp.put("warnInfo", "箱门振动");
                 notify = true;
             }
@@ -277,6 +277,7 @@ public class UploadedPhotosServiceImpl implements IUploadedPhotosService {
         }
         int doorState = 0;
         int shakeState = 0;
+        int eventType = doorAlertBto.getEventType();
         if (doorAlertBto.getEventType() > 0) {
             if (doorAlertBto.getEventType() == 1) {
                 shakeState = doorAlertBto.getEventType();
@@ -285,7 +286,7 @@ public class UploadedPhotosServiceImpl implements IUploadedPhotosService {
                 doorState = 1;
                 shakeState = 0;
             }
-            sendAlarmMessage(device.getSerialNumber(), doorState + "", shakeState + "");
+            sendAlarmMessage(device.getSerialNumber(), doorState + "", shakeState + "",eventType+"");
         }
         //抓拍监控，并返回路径
         String monitorPath = captureMonitorPhoto(device.getSerialNumber());