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

安防告警增加类型和cpu温度告警

Browse Source
This commit is contained in:
wyw
2024-08-17 15:04:17 +08:00
parent 1e8a56c36a
commit 30d8dbbbb2
5 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,8 +84,9 @@ public class UploadedPhotosController extends BaseController {
@RequestParam("lat") String lat,
@RequestParam("lng") String lng,
@RequestParam("temp") String temp,
@RequestParam("cpuTemp") Double cpuTemp,
@RequestParam("eventType") String eventType,
@RequestParam("doorState") String doorState,
@RequestParam("shakeState") String shakeState,
@RequestParam("time") String time) {
if (photo.isEmpty()) {
@ -101,9 +102,7 @@ public class UploadedPhotosController extends BaseController {
Double latitude = isEmpty(lat) ? 0.0 : Double.valueOf(lat);
Double longitude = isEmpty(lng) ? 0.0 : Double.valueOf(lng);
Double temperature = isEmpty(temp) ? 0.0 : convertAndRoundTemperature(temp);
if (doorState.equals("0")) {
shakeState = "1";
}
String shakeState = "0";
// 处理时间戳
long timestamp = Long.parseLong(time + "000");
Date date = new Date(timestamp);
@ -112,7 +111,7 @@ public class UploadedPhotosController extends BaseController {
//推送告警短信通知
uploadedPhotosService.sendAlarmMessage(sn, doorState, shakeState);
UploadedPhotos uploadedPhotos = new UploadedPhotos(
null, fileName, monitorPath, imei, sn, latitude, longitude, temperature, doorState, shakeState, date
null, fileName, monitorPath, imei, sn, latitude, longitude, temperature, doorState, shakeState,cpuTemp,eventType, date
);
return toAjax(uploadedPhotosService.insertUploadedPhotos(uploadedPhotos));
} catch (IOException e) {
@ -141,15 +140,14 @@ public class UploadedPhotosController extends BaseController {
@RequestParam("lng") String lng,
@RequestParam("temp") String temp,
@RequestParam("doorState") String doorState,
@RequestParam("shakeState") String shakeState,
@RequestParam("cpuTemp") Double cpuTemp,
@RequestParam("eventType") String eventType,
@RequestParam("time") String time) {
// 处理可能为空的字段
Double latitude = isEmpty(lat) ? 0.0 : Double.valueOf(lat);
Double longitude = isEmpty(lng) ? 0.0 : Double.valueOf(lng);
Double temperature = isEmpty(temp) ? 0.0 : convertAndRoundTemperature(temp);
if (doorState.equals("0")) {
shakeState = "1";
}
String shakeState = "0";
// 处理时间戳
long timestamp = Long.parseLong(time + "000");
Date date = new Date(timestamp);
@ -158,7 +156,7 @@ public class UploadedPhotosController extends BaseController {
//推送告警短信通知
uploadedPhotosService.sendAlarmMessage(sn, doorState, shakeState);
UploadedPhotos uploadedPhotos = new UploadedPhotos(
null, "", monitorPath, imei, sn, latitude, longitude, temperature, doorState, shakeState, date
null, "", monitorPath, imei, sn, latitude, longitude, temperature, doorState, shakeState,cpuTemp,eventType, date
);
return toAjax(uploadedPhotosService.insertUploadedPhotos(uploadedPhotos));
}

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

@ -277,12 +277,12 @@ public class UploadedPhotosServiceImpl implements IUploadedPhotosService {
}
int doorState = 0;
int shakeState = 0;
if (doorAlertBto.getDoorState() > 0) {
if (doorAlertBto.getDoorState() == 1) {
shakeState = doorAlertBto.getDoorState();
if (doorAlertBto.getEventType() > 0) {
if (doorAlertBto.getEventType() == 1) {
shakeState = doorAlertBto.getEventType();
doorState = 0;
} else if (doorAlertBto.getDoorState() == 2) {
doorState = doorAlertBto.getDoorState();
} else if (doorAlertBto.getEventType() == 2) {
doorState = 1;
shakeState = 0;
}
sendAlarmMessage(device.getSerialNumber(), doorState + "", shakeState + "");
@ -293,7 +293,7 @@ public class UploadedPhotosServiceImpl implements IUploadedPhotosService {
null, "", monitorPath, "", device.getSerialNumber(),
device.getLatitude()!= null ? device.getLatitude().doubleValue():0d,
device.getLongitude()!= null ? device.getLatitude().doubleValue():0d,
18.23d, doorState + "", shakeState + "", new Date()
18.23d, doorState + "", shakeState + "",32.3,doorAlertBto.getEventType().toString(), new Date()
);
int count = insertUploadedPhotos(uploadedPhotos);
if (count > 0) {