luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

通过告警类型生产告警短信通知

Browse Source
This commit is contained in:
wyw
2024-08-17 15:09:00 +08:00
parent 30d8dbbbb2
commit 5a9d6ae2f0
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/controller/UploadedPhotosController.java
View File

@ -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
);

2
fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/service/IUploadedPhotosService.java
View File

@ -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;

9
fastbee-open-api/src/main/java/com/fastbee/data/controller/anfang/service/impl/UploadedPhotosServiceImpl.java
View File

@ -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());