From d37ea253722849fbd23a5f617d9204af9246d38d Mon Sep 17 00:00:00 2001
From: wuyw <373811525@qq.com>
Date: Sun, 18 Aug 2024 00:06:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E9=98=B2=E5=A2=9E=E5=8A=A0=E5=AE=89?=
=?UTF-8?q?=E9=98=B2=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/UploadedPhotosController.java | 6 +++--
.../impl/UploadedPhotosServiceImpl.java | 23 ++++++++++++++++---
.../iot/model/anfang/UploadedPhotos.java | 4 +++-
.../mapper/iot/UploadedPhotosMapper.xml | 6 +++++
4 files changed, 33 insertions(+), 6 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 7ca3ca7..c8ab1c0 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
@@ -87,6 +87,7 @@ public class UploadedPhotosController extends BaseController {
@RequestParam("cpuTemp") Double cpuTemp,
@RequestParam("eventType") String eventType,
@RequestParam("doorState") String doorState,
+ @RequestParam("anFangStatus") String anFangStatus,
@RequestParam("time") String time) {
if (photo.isEmpty()) {
@@ -111,7 +112,7 @@ public class UploadedPhotosController extends BaseController {
//推送告警短信通知
uploadedPhotosService.sendAlarmMessage(sn, doorState, shakeState,eventType);
UploadedPhotos uploadedPhotos = new UploadedPhotos(
- null, fileName, monitorPath, imei, sn, latitude, longitude, temperature, doorState, shakeState,cpuTemp,eventType, date
+ null, fileName, monitorPath, imei, sn, latitude, longitude, temperature, doorState, shakeState,cpuTemp,eventType,anFangStatus, date
);
return toAjax(uploadedPhotosService.insertUploadedPhotos(uploadedPhotos));
} catch (IOException e) {
@@ -142,6 +143,7 @@ public class UploadedPhotosController extends BaseController {
@RequestParam("doorState") String doorState,
@RequestParam("cpuTemp") Double cpuTemp,
@RequestParam("eventType") String eventType,
+ @RequestParam("anFangStatus") String anFangStatus,
@RequestParam("time") String time) {
// 处理可能为空的字段
Double latitude = isEmpty(lat) ? 0.0 : Double.valueOf(lat);
@@ -156,7 +158,7 @@ public class UploadedPhotosController extends BaseController {
//推送告警短信通知
uploadedPhotosService.sendAlarmMessage(sn, doorState, shakeState,eventType);
UploadedPhotos uploadedPhotos = new UploadedPhotos(
- null, "", monitorPath, imei, sn, latitude, longitude, temperature, doorState, shakeState,cpuTemp,eventType, date
+ null, "", monitorPath, imei, sn, latitude, longitude, temperature, doorState, shakeState,cpuTemp,eventType,anFangStatus, date
);
return toAjax(uploadedPhotosService.insertUploadedPhotos(uploadedPhotos));
}
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 13ec8b8..ccf7dac 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
@@ -244,6 +244,12 @@ public class UploadedPhotosServiceImpl implements IUploadedPhotosService {
} else if (Integer.parseInt(eventType) == 3) {
temp.put("warnInfo", "箱门持续打开");
notify = true;
+ }else if(Integer.parseInt(eventType) == 4){
+ temp.put("warnInfo", "开启布放");
+ notify = true;
+ }else if(Integer.parseInt(eventType) == 5){
+ temp.put("warnInfo", "撤防");
+ notify = true;
}
if (notify) {
DeviceAlertUser deviceAlertUser = new DeviceAlertUser();
@@ -278,14 +284,25 @@ public class UploadedPhotosServiceImpl implements IUploadedPhotosService {
}
int doorState = 0;
int shakeState = 0;
+ int anFangStatus = 0;
int eventType = doorAlertBto.getEventType();
if (doorAlertBto.getEventType() > 0) {
- if (doorAlertBto.getEventType() == 1) {
+ if (eventType == 1) {
shakeState = doorAlertBto.getEventType();
doorState = 0;
- } else if (doorAlertBto.getEventType() >= 2) {
+ anFangStatus = 1;
+ } else if (eventType == 2 || eventType == 3) {
doorState = 1;
shakeState = 0;
+ anFangStatus = 1;
+ }else if(eventType == 4 ){
+ anFangStatus = 1;
+ doorState = 0;
+ shakeState = 0;
+ }else if(eventType == 5){
+ anFangStatus = 0;
+ doorState = 0;
+ shakeState = 0;
}
sendAlarmMessage(device.getSerialNumber(), doorState + "", shakeState + "", eventType + "");
}
@@ -295,7 +312,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 + "", 32.3, doorAlertBto.getEventType().toString(), new Date()
+ 18.23d, doorState + "", shakeState + "", 32.3, doorAlertBto.getEventType().toString(),anFangStatus + "", new Date()
);
int count = insertUploadedPhotos(uploadedPhotos);
if (count > 0) {
diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/anfang/UploadedPhotos.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/anfang/UploadedPhotos.java
index 8e4e42c..54e497e 100644
--- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/anfang/UploadedPhotos.java
+++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/anfang/UploadedPhotos.java
@@ -61,9 +61,11 @@ public class UploadedPhotos extends BaseEntity
/** CPU温度 */
@Excel(name = "CPU温度")
private Double cpuTemp;
- /** 事件类型：1=振动，2=箱门打开,3=人员入侵 */
+ /** 事件类型：1=振动，2=箱门打开,3=箱门持续打开 */
@Excel(name = "事件类型")
private String eventType;
+ @Excel(name = "安防状态:1=布防, 0=撤防")
+ private String anFangStatus;
/** 上传时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/UploadedPhotosMapper.xml b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/UploadedPhotosMapper.xml
index 0a02eb2..01b2120 100644
--- a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/UploadedPhotosMapper.xml
+++ b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/UploadedPhotosMapper.xml
@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and event_type = #{eventType}
and cpu_temp = #{cpuTemp}
and shake_state = #{shakeState}
+ and an_fang_status = #{anFangStatus}
and upload_time between #{params.beginUploadTime} and #{params.endUploadTime}
order by id desc
@@ -63,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
upload_time,
event_type,
cpu_temp,
+ an_fang_status,
#{photoPath},
@@ -77,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{uploadTime},
#{eventType},
#{cpuTemp},
+ #{anFangStatus},
@@ -95,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
upload_time = #{uploadTime},
event_type = #{eventType},
cpu_temp = #{cpuTemp},
+ an_fang_status = #{anFangStatus},
where id = #{id}
@@ -114,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
upload_time = #{uploadTime},
event_type = #{eventType},
cpu_temp = #{cpuTemp},
+ an_fang_status = #{anFangStatus},
where sn = #{sn} and upload_time = #{uploadTime}