无人机事件修复bug

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/AlarmEventServiceImpl.java

@@ -718,6 +718,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         // 通过无人机id, 获取无人机信息和绑定的指挥中心
         alarmData.forEach(alarm->{
             Map<String, Object> data = (Map<String, Object>) SpringUtils.getBean(RemoteMonitorService.class).selectUavByUavId(alarm.getCopterId()).get("data");
+            String uavId = MapUtils.getString(data, "uavId");
             String eventName = MapUtils.getString(data, "uavName")+"上报火情事件事件";
             String eventDescription = "基站:"+MapUtils.getString(data, "baseStationName")+",无人机:"+MapUtils.getString(data, "uavName")+",经度:"+alarm.getLongitude()+",纬度:"+alarm.getLatitude()+",海拔:"+alarm.getAltitude();
 
@@ -727,7 +728,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
             centereventTEventcatalogue.setLatitude(alarm.getLatitude());
             centereventTEventcatalogue.setReportSource(REPORTING_SOURCE_6);
             CenterdataTCamera centerdataTCamera = new CenterdataTCamera();
-            centerdataTCamera.setId(alarm.getCopterId());
+            centerdataTCamera.setId(uavId);
             centerdataTCamera.setCameraName(MapUtils.getString(data, "uavName"));
             centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, alarm.getCreationTime());
 
@@ -747,7 +748,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
                 centereventTDeptEvent.setEventStatus("上报");
                 centereventTDeptEvent.setEventStatusValue(FOREST_EVENT_STATUS_1);
                 centereventTDeptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_2);
-                centereventTDeptEvent.setCreateBy(MapUtils.getString(data, "uavId"));
+                centereventTDeptEvent.setCreateBy(uavId);
                 centereventTDeptEvent.setCreateName(createName);
                 centereventTDeptEvent.setCreateTime(createTime);
                 centereventTDeptEventService.insertCentereventTDeptEvent(centereventTDeptEvent);
@@ -761,7 +762,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
             centereventTFireLog.setLogContent(centereventTEventcatalogue.getEventName() + System.getProperty("line.separator") + centereventTEventcatalogue.getEventDescription());
             centereventTFireLog.setOperation(BUS_OPER_TYPE_2);
             centereventTFireLog.setOperationType(LOG_OPER_TYPE_4);
-            centereventTFireLog.setCreateBy(MapUtils.getString(data, "uavId"));
+            centereventTFireLog.setCreateBy(uavId);
             centereventTFireLog.setCreateName(centereventTEventcatalogue.getCreateName());
             centereventTFireLog.setCreateTime(centereventTEventcatalogue.getCreateTime());
             if(StringUtils.isNotEmpty(centereventTEventcatalogue.getLongitude())){

src/main/resources/mapper/centereventteventcatalogue/AlarmEventMapper.xml

@@ -9,7 +9,24 @@
         (id, copter_id, time_stamp, altitude, alarm_type, create_time, photo_path, latitude, longitude, photo_id, photo_name, local_path, dispose_status, house_number, is_hidden, photo_type, source_type)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.id}, #{item.copterId}, #{item.timeStamp}, #{item.altitude}, #{item.alarmType}, #{item.creationTime}, #{item.photoPath}, #{item.latitude}, #{item.longitude}, #{item.photoId}, #{item.photoName}, #{item.localPath})
+            (#{item.id},
+             #{item.copterId},
+             #{item.timeStamp},
+             #{item.altitude},
+             #{item.alarmType},
+             #{item.creationTime},
+             #{item.photoPath},
+             #{item.latitude},
+             #{item.longitude},
+             #{item.photoId},
+             #{item.photoName},
+             #{item.localPath},
+             #{item.disposeStatus},
+             #{item.houseNumber},
+             #{item.isHidden},
+             #{item.photoType},
+             #{item.sourceType}
+             )
         </foreach>
     </insert>
 </mapper>