访客&&大屏
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run

This commit is contained in:
2025-08-05 09:58:20 +08:00
parent 290780379d
commit 8093e1cfd7

View File

@@ -26,8 +26,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
@Autowired @Autowired
private AlarmTaskOperatorService taskOperatorService; private AlarmTaskOperatorService taskOperatorService;
@Autowired
private PrecautionaryMapper precautionaryMapper;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
@@ -48,20 +47,10 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
List<AlarmRecord> newRecords = new ArrayList<>(); List<AlarmRecord> newRecords = new ArrayList<>();
List<AlarmRecord> updateRecords = new ArrayList<>(); List<AlarmRecord> updateRecords = new ArrayList<>();
List<Precautionary> newList=new ArrayList<>();
// 分类处理记录 // 分类处理记录
for (AlarmRecord record : records) { for (AlarmRecord record : records) {
if (existingRecordMap.containsKey(record.getId())) { if (existingRecordMap.containsKey(record.getId())) {
Precautionary precautionary = new Precautionary();
precautionary.setType(1L);
precautionary.setTime(record.getCallTime());
precautionary.setAddress(record.getDeviceName());
precautionary.setMsg("SOS终端接警");
precautionary.setStatus(0L);
precautionary.setTaskId(record.getId());
newList.add(precautionary);
// 如果记录已存在,检查是否需要更新 // 如果记录已存在,检查是否需要更新
AlarmRecord existing = existingRecordMap.get(record.getId()); AlarmRecord existing = existingRecordMap.get(record.getId());
if (hasRecordChanges(existing, record)) { if (hasRecordChanges(existing, record)) {
@@ -83,11 +72,6 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
// 保存关联的操作记录 // 保存关联的操作记录
} }
} }
// 批量插入主表记录
if (!newList.isEmpty()) {
precautionaryMapper.insertOrUpdateBatch(newList);
}
// 批量更新修改过的记录 // 批量更新修改过的记录
if (!updateRecords.isEmpty()) { if (!updateRecords.isEmpty()) {
if (this.updateBatchById(updateRecords)) { if (this.updateBatchById(updateRecords)) {