diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsAlarmServiceImpl.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsAlarmServiceImpl.java index 1a979a6..04045d8 100644 --- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsAlarmServiceImpl.java +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsAlarmServiceImpl.java @@ -49,16 +49,18 @@ public class CsAlarmServiceImpl extends ServiceImpl im public void analysis(AppEventMessage appEventMessage) { List list1 = new ArrayList<>(); LocalDateTime eventTime = null; - String tag = null; + String tag = null, lineId = null; String id = IdUtil.fastSimpleUUID(); //获取装置id CsEquipmentDeliveryPO po = equipmentFeignClient.findDevByNDid(appEventMessage.getId()).getData(); try { + lineId = appEventMessage.getId() + appEventMessage.getMsg().getClDid(); List dataArray = appEventMessage.getMsg().getDataArray(); for (AppEventMessage.DataArray item : dataArray) { eventTime = eventService.timeFormat(item.getDataTimeSec(),item.getDataTimeUSec()); //事件入库 CsEventPO csEvent = new CsEventPO(); + csEvent.setLineId(lineId); csEvent.setId(id); csEvent.setDeviceId(po.getId()); csEvent.setProcess(po.getProcess()); @@ -91,6 +93,7 @@ public class CsAlarmServiceImpl extends ServiceImpl im } } catch (Exception e) { CsEventLogs csEventLogs = new CsEventLogs(); + csEventLogs.setLineId(lineId); csEventLogs.setDeviceId(po.getId()); csEventLogs.setStartTime(eventTime); csEventLogs.setTag(tag);