From 30d8dbbbb26c374c173df640eedd9b601aebb969 Mon Sep 17 00:00:00 2001
From: wyw <373811525@qq.com>
Date: Sat, 17 Aug 2024 15:04:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E9=98=B2=E5=91=8A=E8=AD=A6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=92=8Ccpu=E6=B8=A9=E5=BA=A6?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fastbee/common/model/bto/DoorAlertBto.java |  2 +-
 .../controller/UploadedPhotosController.java   | 18 ++++++++----------
 .../impl/UploadedPhotosServiceImpl.java        | 12 ++++++------
 .../iot/model/anfang/UploadedPhotos.java       |  6 ++++++
 .../mapper/iot/UploadedPhotosMapper.xml        | 16 ++++++++++++++--
 5 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/fastbee-common/src/main/java/com/fastbee/common/model/bto/DoorAlertBto.java b/fastbee-common/src/main/java/com/fastbee/common/model/bto/DoorAlertBto.java
index de7e8dc..58c1824 100644
--- a/fastbee-common/src/main/java/com/fastbee/common/model/bto/DoorAlertBto.java
+++ b/fastbee-common/src/main/java/com/fastbee/common/model/bto/DoorAlertBto.java
@@ -10,6 +10,6 @@ public class DoorAlertBto {
 
     private Long deviceId;
     //箱门状态:2=箱门打开,1=箱门振动
-    private Integer doorState;
+    private Integer eventType;
 
 }
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 6c228db..aa7aa15 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
@@ -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));
     }
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 9ad762f..74c3e6f 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
@@ -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) {
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 0d0f516..8e4e42c 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
@@ -58,6 +58,12 @@ public class UploadedPhotos extends BaseEntity
     /** 震动状态信息 */
     @Excel(name = "震动状态信息")
     private String shakeState;
+    /** CPU温度 */
+    @Excel(name = "CPU温度")
+    private Double cpuTemp;
+    /** 事件类型：1=振动，2=箱门打开,3=人员入侵 */
+    @Excel(name = "事件类型")
+    private String eventType;
 
     /** 上传时间 */
     @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 f526b72..0a02eb2 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
@@ -16,10 +16,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="doorState"    column="door_state"    />
         <result property="shakeState"    column="shake_state"    />
         <result property="uploadTime"    column="upload_time"    />
+        <result property="eventType"    column="event_type"    />
+        <result property="cpuTemp"    column="cpu_temp"    />
     </resultMap>
 
     <sql id="selectUploadedPhotosVo">
-        select id, photo_path,monitor_path, imei, sn, lat, lng, temp, door_state, shake_state, upload_time from uploaded_photos
+        select * from uploaded_photos
     </sql>
 
     <select id="selectUploadedPhotosList" parameterType="com.fastbee.iot.model.anfang.UploadedPhotos"
@@ -33,10 +35,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lng != null "> and lng = #{lng}</if>
             <if test="params.beginTemp != null and params.beginTemp != '' and params.endTemp != null and params.endTemp != ''"> and temp between #{params.beginTemp} and #{params.endTemp}</if>
             <if test="doorState != null  and doorState != ''"> and door_state = #{doorState}</if>
+            <if test="eventType != null  and eventType != ''"> and event_type = #{eventType}</if>
+            <if test="cpuTemp != null  and cpuTemp != ''"> and cpu_temp = #{cpuTemp}</if>
             <if test="shakeState != null  and shakeState != ''"> and shake_state = #{shakeState}</if>
             <if test="params.beginUploadTime != null and params.beginUploadTime != '' and params.endUploadTime != null and params.endUploadTime != ''"> and upload_time between #{params.beginUploadTime} and #{params.endUploadTime}</if>
         </where>
-					order by id desc
+		order by id desc
     </select>
     
     <select id="selectUploadedPhotosById" parameterType="Long" resultMap="UploadedPhotosResult">
@@ -57,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="doorState != null">door_state,</if>
             <if test="shakeState != null">shake_state,</if>
             <if test="uploadTime != null">upload_time,</if>
+            <if test="eventType != null">event_type,</if>
+            <if test="cpuTemp != null">cpu_temp,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="photoPath != null and photoPath != ''">#{photoPath},</if>
@@ -69,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="doorState != null">#{doorState},</if>
             <if test="shakeState != null">#{shakeState},</if>
             <if test="uploadTime != null">#{uploadTime},</if>
+            <if test="eventType != null">#{eventType},</if>
+            <if test="cpuTemp != null">#{cpuTemp},</if>
          </trim>
     </insert>
 
@@ -85,6 +93,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="doorState != null">door_state = #{doorState},</if>
             <if test="shakeState != null">shake_state = #{shakeState},</if>
             <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+            <if test="eventType != null">event_type = #{eventType},</if>
+            <if test="cpuTemp != null">cpu_temp = #{cpuTemp},</if>
         </trim>
         where id = #{id}
     </update>
@@ -102,6 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="doorState != null">door_state = #{doorState},</if>
             <if test="shakeState != null">shake_state = #{shakeState},</if>
             <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+            <if test="eventType != null">event_type = #{eventType},</if>
+            <if test="cpuTemp != null">cpu_temp = #{cpuTemp},</if>
         </trim>
         where sn = #{sn} and upload_time = #{uploadTime}
     </update>