1

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

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.system.api.RemoteDeptService;
 import com.ruoyi.system.api.RemoteFileService;
 import com.ruoyi.system.api.domain.SysDept;
@@ -302,8 +303,10 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         // 313：烟雾，5122：热感
         if (type == 313 || type == 5122) {
             return insertFireEvent(daHuaFireEventVO);
-        } else if (type == 302 || type == 303 || type == 962 || type == 963 || type == 964 || type == 965) {
+        } else if (type == 302 || type == 303 || type == 962 || type == 963 || type == 964 || type == 965
+                || type == 987654321 || type == 987654322 || type == 987654333 || type == 987654334) {
             // 302：绊线入侵，303：区域入侵 ，962：人穿越警戒线，963：机动车穿越警戒线，964：人穿越区域，965：机动车穿越区域
+            //鄂前大华新事件类型 987654321:违法畜牧，987654322：违章建筑，987654333：河岸垃圾倾倒，987654334：耕地保护
             return insertBayonetEvent(daHuaFireEventVO);
         }
         return "";
@@ -720,35 +723,38 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         });
         // 通过无人机id, 获取无人机信息和绑定的指挥中心
         alarmData.forEach(alarm->{
-            CentermonitorTUav data = SpringUtils.getBean(RemoteMonitorService.class).selectUavByUavId(alarm.getCopterId()).getData();
+//            CentermonitorTUav data = SpringUtils.getBean(RemoteMonitorService.class).selectUavByUavId(alarm.getCopterId()).getData();
+            Map<String, Object> data = (Map<String, Object>) SpringUtils.getBean(RemoteMonitorService.class).selectUavByUavId(alarm.getCopterId()).get("data");
             /**
              * 牛羊 Sheep:222
              * 车辆 Car: 218
              */
 
-            String eventName = data.getUavName()+"上报"+MapUtils.getString(eventLabel, alarm.getAlarmType())+"事件";
-            String eventDescription = "基站:"+data.getBaseStationName()+",无人机:"+data.getUavName()+",经度:"+alarm.getLongitude()+",纬度:"+alarm.getLatitude()+",海拔:"+alarm.getAltitude();
+            String eventName = MapUtils.getString(data, "uavName")+"上报"+MapUtils.getString(eventLabel, alarm.getAlarmType())+"事件";
+            String eventDescription = "基站:"+MapUtils.getString(data, "baseStationName")+",无人机:"+MapUtils.getString(data, "uavName")+",经度:"+alarm.getLongitude()+",纬度:"+alarm.getLatitude()+",海拔:"+alarm.getAltitude();
 
             //创建事件主体, 写入事件表.
-            CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("2", MapUtils.getString(eventType, alarm.getAlarmType()), eventName, eventDescription, alarm.getLongitude(), alarm.getLatitude(), data.getUavName(), alarm.getCreationTime(), "");
+            CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("2", MapUtils.getString(eventType, alarm.getAlarmType()), eventName, eventDescription, alarm.getLongitude(), alarm.getLatitude(), MapUtils.getString(data, "uavName"), alarm.getCreationTime(), "");
             centereventTEventcatalogue.setLongitude(alarm.getLongitude());
             centereventTEventcatalogue.setLatitude(alarm.getLatitude());
             centereventTEventcatalogue.setReportSource(REPORTING_SOURCE_6);
             CenterdataTCamera centerdataTCamera = new CenterdataTCamera();
             centerdataTCamera.setId(alarm.getCopterId());
-            centerdataTCamera.setCameraName(data.getUavName());
+            centerdataTCamera.setCameraName(MapUtils.getString(data, "uavName"));
             centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, alarm.getCreationTime());
 
             String eventCode = centereventTEventcatalogue.getEventCode();
             String createName = centereventTEventcatalogue.getCreateName();
             Date createTime = centereventTEventcatalogue.getCreateTime();
+
+            List<Map<String, Object>> deptList = (List<Map<String, Object>>) data.get("deptList");
             // 事件部门
-            data.getDeptList().forEach(item -> {
+            deptList.forEach(item -> {
                 CentereventDeptEvent centereventTDeptEvent = new CentereventDeptEvent();
                 centereventTDeptEvent.setId(IdUtils.fastSimpleUUID());
                 centereventTDeptEvent.setEventCode(eventCode);
-                centereventTDeptEvent.setDeptId(item.getDeptId());
-                centereventTDeptEvent.setDeptName(item.getDeptName());
+                centereventTDeptEvent.setDeptId(MapUtils.getLong(item, "deptId"));
+                centereventTDeptEvent.setDeptName(MapUtils.getString(item,"deptName"));
                 centereventTDeptEvent.setIsUrged(SYS_ISURGE_2);
                 centereventTDeptEvent.setEventStatus("上报");
                 centereventTDeptEvent.setEventStatusValue(FOREST_EVENT_STATUS_1);