diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index cec2722..0e02a6b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -1010,7 +1010,7 @@ List devcodeStrs = alarmRecordsList.stream().map(AlarmRecords::getDevcode).distinct().collect(Collectors.toList()); iBusDeviceService.updateBusDeviceStatus(devcodeStrs); //更新点位表 - List ledgerCodes = ledgers.stream().filter(offDeviceDTO -> "1".equals(offDeviceDTO.getType())).map(OffDeviceDTO::getLedgerCode).distinct().collect(Collectors.toList()); + List ledgerCodes = ledgers.stream().filter(offDeviceDTO -> ("1".equals(offDeviceDTO.getType())||"2".equals(offDeviceDTO.getType()))).map(OffDeviceDTO::getLedgerCode).distinct().collect(Collectors.toList()); if (ledgerCodes != null && ledgerCodes.size() > 0) iBusLedgerService.updateLedgerStatus(ledgerCodes); List ledgerPipeCodes = ledgers.stream().filter(offDeviceDTO -> "3".equals(offDeviceDTO.getType())).map(OffDeviceDTO::getTagNumber).distinct().collect(Collectors.toList()); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index cec2722..0e02a6b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -1010,7 +1010,7 @@ List devcodeStrs = alarmRecordsList.stream().map(AlarmRecords::getDevcode).distinct().collect(Collectors.toList()); iBusDeviceService.updateBusDeviceStatus(devcodeStrs); //更新点位表 - List ledgerCodes = ledgers.stream().filter(offDeviceDTO -> "1".equals(offDeviceDTO.getType())).map(OffDeviceDTO::getLedgerCode).distinct().collect(Collectors.toList()); + List ledgerCodes = ledgers.stream().filter(offDeviceDTO -> ("1".equals(offDeviceDTO.getType())||"2".equals(offDeviceDTO.getType()))).map(OffDeviceDTO::getLedgerCode).distinct().collect(Collectors.toList()); if (ledgerCodes != null && ledgerCodes.size() > 0) iBusLedgerService.updateLedgerStatus(ledgerCodes); List ledgerPipeCodes = ledgers.stream().filter(offDeviceDTO -> "3".equals(offDeviceDTO.getType())).map(OffDeviceDTO::getTagNumber).distinct().collect(Collectors.toList()); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/entity/DataGas.java b/casic-data/src/main/java/com/casic/missiles/modular/data/entity/DataGas.java index 702e329..ed9c3ef 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/entity/DataGas.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/entity/DataGas.java @@ -73,5 +73,15 @@ @TableField("SNR") private String snr; + @ApiModelProperty("sig信号强度,1表示信号弱,2表示信号中等,3表示信号强") + @TableField("SIG") + private String sig; + @ApiModelProperty("温度,扩大100倍传输") + @TableField("TEMP") + private String temp; + + @ApiModelProperty("设备电池电压值(毫伏)") + @TableField("VBAT") + private String vbat; } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java index cec2722..0e02a6b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmRecordsServiceImpl.java @@ -1010,7 +1010,7 @@ List devcodeStrs = alarmRecordsList.stream().map(AlarmRecords::getDevcode).distinct().collect(Collectors.toList()); iBusDeviceService.updateBusDeviceStatus(devcodeStrs); //更新点位表 - List ledgerCodes = ledgers.stream().filter(offDeviceDTO -> "1".equals(offDeviceDTO.getType())).map(OffDeviceDTO::getLedgerCode).distinct().collect(Collectors.toList()); + List ledgerCodes = ledgers.stream().filter(offDeviceDTO -> ("1".equals(offDeviceDTO.getType())||"2".equals(offDeviceDTO.getType()))).map(OffDeviceDTO::getLedgerCode).distinct().collect(Collectors.toList()); if (ledgerCodes != null && ledgerCodes.size() > 0) iBusLedgerService.updateLedgerStatus(ledgerCodes); List ledgerPipeCodes = ledgers.stream().filter(offDeviceDTO -> "3".equals(offDeviceDTO.getType())).map(OffDeviceDTO::getTagNumber).distinct().collect(Collectors.toList()); diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/entity/DataGas.java b/casic-data/src/main/java/com/casic/missiles/modular/data/entity/DataGas.java index 702e329..ed9c3ef 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/entity/DataGas.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/entity/DataGas.java @@ -73,5 +73,15 @@ @TableField("SNR") private String snr; + @ApiModelProperty("sig信号强度,1表示信号弱,2表示信号中等,3表示信号强") + @TableField("SIG") + private String sig; + @ApiModelProperty("温度,扩大100倍传输") + @TableField("TEMP") + private String temp; + + @ApiModelProperty("设备电池电压值(毫伏)") + @TableField("VBAT") + private String vbat; } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java index a911950..31655b0 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java @@ -178,6 +178,9 @@ .pci(pci) .rsrp(rsrp) .snr(snr) + .temp(((JSONObject) jsonArray.get(i)).getString("temp")) + .vbat(((JSONObject) jsonArray.get(i)).getString("vbat")) + .sig(((JSONObject) jsonArray.get(i)).getString("sig")) .build());//存储采集数据 //2.有无超限处理流程(判断最后一条数据) if (i < jsonArray.size() - 1) continue;