修复bug

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

@@ -333,27 +333,34 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         }
 
         // 验证事件类型是否配置对应报文码值--只能从数据库配
-        CentereventTEventtype centereventTEventtype = centereventTEventtypeService.selectCentereventTEventtypeByCode(infoVO.getAlarmType());
+        /*CentereventTEventtype centereventTEventtype = centereventTEventtypeService.selectCentereventTEventtypeByCode(infoVO.getAlarmType());
         if (StringUtils.isNull(centereventTEventtype)) {
             logger.info("无法匹配相关事件！报文码值为：{}", infoVO.getAlarmType());
             return "";
-        }
+        }*/
 
         ExtendVO extendVO = JSONObject.parseObject(infoVO.getExtend(), ExtendVO.class);
         // 事件目录
         //四平市双辽市卧虎镇贺家村热感应 + 2024-01-05 10:32:54 + 火情报警
-        String eventName = infoVO.getChannelName() + infoVO.getAlarmDateStr() + centereventTEventtype.getEventTypeName();
+//        String eventName = infoVO.getChannelName() + infoVO.getAlarmDateStr() + centereventTEventtype.getEventTypeName();
+        String eventName = infoVO.getChannelName() + infoVO.getAlarmDateStr() + infoVO.getAlarmTypeName();
 //        String longitude = StringUtils.isEmpty(infoVO.getFirePoint()) ? centerdataTCamera.getLongitude() : infoVO.getFirePoint()[0].getGpsX();
 //        String latitude = StringUtils.isEmpty(infoVO.getFirePoint()) ? centerdataTCamera.getLatitude() : infoVO.getFirePoint()[0].getGpsY();
 
-        String longitude = StringUtils.isEmpty(String.valueOf(extendVO.getGpsxy().getGpsX()))? centerdataTCamera.getLongitude() : String.valueOf(extendVO.getGpsxy().getGpsX());
-        String latitude = StringUtils.isEmpty(String.valueOf(extendVO.getGpsxy().getGpsY()))? centerdataTCamera.getLatitude() : String.valueOf(extendVO.getGpsxy().getGpsY());
+        String longitude = null == extendVO.getGpsxy() ? centerdataTCamera.getLongitude(): StringUtils.isEmpty(String.valueOf(extendVO.getGpsxy().getGpsX())) ? centerdataTCamera.getLongitude(): String.valueOf(extendVO.getGpsxy().getGpsX());
+        String latitude = null == extendVO.getGpsxy() ? centerdataTCamera.getLatitude(): StringUtils.isEmpty(String.valueOf(extendVO.getGpsxy().getGpsY())) ? centerdataTCamera.getLatitude(): String.valueOf(extendVO.getGpsxy().getGpsY());
+
+
+//        String longitude = StringUtils.isEmpty(String.valueOf(extendVO.getGpsxy().getGpsX()))? centerdataTCamera.getLongitude() : String.valueOf(extendVO.getGpsxy().getGpsX());
+//        String latitude = StringUtils.isEmpty(String.valueOf(extendVO.getGpsxy().getGpsY()))? centerdataTCamera.getLatitude() : String.valueOf(extendVO.getGpsxy().getGpsY());
         String eventDescription = infoVO.toString(longitude, latitude);
         String reportor = infoVO.getDeviceName();
         Date reportTime = DateUtils.timestampToTime(infoVO.getAlarmDate());
         String address = centerdataTCamera.getCameraRegion();
         String alarmCode = infoVO.getAlarmCode().replace("{", "").replace("}", "");
-        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(centereventTEventtype.getParentId(), centereventTEventtype.getId(), eventName, eventDescription, longitude, latitude, reportor, reportTime, address, alarmCode, infoVO.getNodeCode());
+//        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address);
+
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address, alarmCode, infoVO.getNodeCode());
         this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, daHuaFireEventVO.getCreateTime());
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
@@ -401,8 +408,12 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String eventTypeXl = centereventTEventtype.getId();
         String eventName = infoVO.getChannelName() + infoVO.getAlarmDateStr() + centereventTEventtype.getEventTypeName();
         StringBuilder eventDescription = new StringBuilder();
-        String longitude = StringUtils.isEmpty(String.valueOf(extendVO.getGpsxy().getGpsX()))? centerdataTCamera.getLongitude() : String.valueOf(extendVO.getGpsxy().getGpsX());
-        String latitude = StringUtils.isEmpty(String.valueOf(extendVO.getGpsxy().getGpsY()))? centerdataTCamera.getLatitude() : String.valueOf(extendVO.getGpsxy().getGpsY());
+
+        String longitude = null == extendVO.getGpsxy() ? centerdataTCamera.getLongitude(): StringUtils.isEmpty(String.valueOf(extendVO.getGpsxy().getGpsX())) ? centerdataTCamera.getLongitude(): String.valueOf(extendVO.getGpsxy().getGpsX());
+        String latitude = null == extendVO.getGpsxy() ? centerdataTCamera.getLatitude(): StringUtils.isEmpty(String.valueOf(extendVO.getGpsxy().getGpsY())) ? centerdataTCamera.getLatitude(): String.valueOf(extendVO.getGpsxy().getGpsY());
+
+//        String longitude = empty? centerdataTCamera.getLongitude() : String.valueOf(extendVO.getGpsxy().getGpsX());
+//        String latitude = StringUtils.isEmpty(String.valueOf(extendVO.getGpsxy().getGpsY()))? centerdataTCamera.getLatitude() : String.valueOf(extendVO.getGpsxy().getGpsY());
         if("987654321".equals(infoVO.getAlarmType())){
 //            eventDescription.append(infoVO.toString(centerdataTCamera)).append(",").append(extendVO.getImageDescription());
             eventDescription.append(infoVO.toString(longitude, latitude)).append(",").append(extendVO.getImageDescription());