新增数据

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/AutoDataDto.java

@@ -88,7 +88,7 @@ public class AutoDataDto {
         @SerializedName("Code")
         @JsonProperty("Code")
         @ApiModelProperty("事件码")
-        private Integer code;
+        private String code;
 
         @SerializedName("Data")
         @JsonProperty("Data")

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<CsEventMapper, CsEventPO> im
     public void analysis(AppEventMessage appEventMessage) {
         List<CsEventPO> 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<AppEventMessage.DataArray> 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<CsEventMapper, CsEventPO> im
             }
         } catch (Exception e) {
             CsEventLogs csEventLogs = new CsEventLogs();
+            csEventLogs.setLineId(lineId);
             csEventLogs.setDeviceId(po.getId());
             csEventLogs.setStartTime(eventTime);
             csEventLogs.setTag(tag);