From b287924938add3000bf03c1d81ce938801652255 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 10 Dec 2024 10:58:55 +0800
Subject: [PATCH] nky预警新增字段
---
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/OpenApiServiceImpl.java | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/OpenApiServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/OpenApiServiceImpl.java
index 16d0726..e588176 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/OpenApiServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/OpenApiServiceImpl.java
@@ -316,6 +316,7 @@
damAlarmRecord.setResGuid(alarmRecordJSONObject.getString("RS_CODE"));
damAlarmRecord.setCollecTime(alarmRecordJSONObject.getDate("collecTime"));
damAlarmRecord.setPointValue(alarmRecordJSONObject.getString("ponitValue"));
+ damAlarmRecord.setValue(alarmRecordJSONObject.getString("value"));
JSONObject generalInfo = alarmRecordJSONObject.getJSONObject("generalInfo");
damAlarmRecord.setPointWarnLevel(generalInfo.getInteger("pointWarnLevel"));
damAlarmRecord.setPointWarnInfo(generalInfo.getString("pointWarnInfo"));
@@ -337,24 +338,26 @@
@Transactional(rollbackFor = Exception.class)
public boolean saveDamAlarmRecordDetail(JSONArray detailInfo,DamAlarmRecord damAlarmRecord) {
boolean flag = false;
- List<DamAlarmRecordDetail> list = new ArrayList<>();
- for (int i = 0; i < detailInfo.size(); i++) {
- DamAlarmRecordDetail damAlarmRecordDetail = new DamAlarmRecordDetail();
- JSONObject jsonObject = detailInfo.getJSONObject(i);
- damAlarmRecordDetail.setDamAlarmRecordId(damAlarmRecord.getId());
- damAlarmRecordDetail.setAlgorithmName(jsonObject.getString("algorithmName"));
- damAlarmRecordDetail.setAlgorithmWarnLevel(jsonObject.getInteger("algorithmWarnLevel"));
- damAlarmRecordDetail.setAlgorithmWarnInfo(jsonObject.getString("algorithmWarnInfo"));
- damAlarmRecordDetail.setAlgorithmWarnExplain(jsonObject.getString("algorithmWarnExplain"));
- damAlarmRecordDetail.setCreateTime(new Date());
- // 加入集合
- list.add(damAlarmRecordDetail);
- }
- // 保存
- if (list.size()>0) {
- flag = damAlarmRecordDetailService.saveBatch(list);
- }else {
- flag = true;
+ if (null!=detailInfo) {
+ List<DamAlarmRecordDetail> list = new ArrayList<>();
+ for (int i = 0; i < detailInfo.size(); i++) {
+ DamAlarmRecordDetail damAlarmRecordDetail = new DamAlarmRecordDetail();
+ JSONObject jsonObject = detailInfo.getJSONObject(i);
+ damAlarmRecordDetail.setDamAlarmRecordId(damAlarmRecord.getId());
+ damAlarmRecordDetail.setAlgorithmName(jsonObject.getString("algorithmName"));
+ damAlarmRecordDetail.setAlgorithmWarnLevel(jsonObject.getInteger("algorithmWarnLevel"));
+ damAlarmRecordDetail.setAlgorithmWarnInfo(jsonObject.getString("algorithmWarnInfo"));
+ damAlarmRecordDetail.setAlgorithmWarnExplain(jsonObject.getString("algorithmWarnExplain"));
+ damAlarmRecordDetail.setCreateTime(new Date());
+ // 加入集合
+ list.add(damAlarmRecordDetail);
+ }
+ // 保存
+ if (list.size() > 0) {
+ flag = damAlarmRecordDetailService.saveBatch(list);
+ } else {
+ flag = true;
+ }
}
return flag;
}
--
Gitblit v1.9.3