hbwri/skjcmanager.git

			@@ -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;
			}

	skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/DamAlarmRecord.java	6 ●●●●● patch \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/OpenApiServiceImpl.java	39 ●●●●● patch \| view \| raw \| blame \| history

			@@ -74,4 +74,10 @@
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date createTime;

			/**
			* 算法值
			*/
			@ApiModelProperty(value = "算法值")
			private String value;

			}