Merge remote-tracking branch 'origin/jtdev' into jtdev

aix

2024-08-22 d2cb8a20207a4b45a8fd1553bbf1ff1268e393cb

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java

@@ -827,10 +827,9 @@

                // 保存告警记录信息
                AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
//                if (null != alarmRecord) {
//                    list.add(alarmRecord.getId().toString());
                    list.add("445566544112");
//                }
                if (null != alarmRecord) {
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (!isTimeSend()) return map;
            map = smsService.sendSignMsg(smsRequestTemplate);

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java

@@ -662,12 +662,12 @@
            //删除测值
            list.remove(3);
            // 新增
//            boolean save = alarmRecordService.save(alarm);
            boolean save = alarmRecordService.save(alarm);
            // 删除测站编号
            list.remove(0);
//            if (save) {
//                return alarm;
//            }
            if (save) {
                return alarm;
            }
        }
        // 返回
        return null;