218工程车、222区域入侵自动研判

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

@@ -195,8 +195,8 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         centereventTEventcatalogue.setIsUrged(SYS_ISURGE_2);//sys_isurge_2
         centereventTEventcatalogue.setEventStatus("上报");
         centereventTEventcatalogue.setEventStatusValue(FOREST_EVENT_STATUS_1);//forest_event_status_1
-        // 自动研判误报
-        if ("1".equals(centereventTEventcatalogue.getEventType())) {
+        // 自动研判误报，218工程车、222区域入侵
+        if ("218".equals(centereventTEventcatalogue.getEventTypeXl()) || "222".equals(centereventTEventcatalogue.getEventTypeXl())) {
             test(centereventTEventcatalogue);
         }
         centereventTEventcatalogue.setCreateBy(centerdataTCamera.getId());
@@ -234,7 +234,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
             logger.error(e.getMessage());
         }
         // {"features":[],"featureUriList":[],"datasetInfos":[],"totalCount":0,"featureCount":0}
-        if (result.getLong("totalCount") == 0 && result.getLong("featureCount") == 0) {
+        if (result.getLong("totalCount") != 0 && result.getLong("featureCount") != 0) {
             centereventTEventcatalogue.setEventStatus("误报");
             centereventTEventcatalogue.setEventStatusValue("forest_event_status_3");
         }