hbwri/skjcmanager.git

			@@ -1137,6 +1137,11 @@
			// 拼接后面内容
			if (smsRequestTemplate.getPersonVOList().size() > 0) {
			for (List<String> list : smsRequestTemplate.getTemplateContent()) {

			String remark = StringUtil.format("渗压水位：{}\n管底高程：{}\n",
			list.get(3), String.format("%.2f", Double.valueOf(list.get(11)) + Double.valueOf(list.get(12)))
			);
			// System.out.println(remark);
			// 保存告警记录信息
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
			if (null != alarmRecord) {
			@@ -1170,6 +1175,11 @@
			// 拼接后面内容
			if (smsRequestTemplate.getPersonVOList().size() > 0) {
			for (List<String> list : smsRequestTemplate.getTemplateContent()) {

			String remark = StringUtil.format("渗压水位：{}\n管底高程：{}\n",
			list.get(3), String.format("%.2f", Double.valueOf(list.get(11)) + Double.valueOf(list.get(12)))
			);
			// System.out.println(remark);
			// 保存告警记录信息
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
			if (null != alarmRecord) {
			@@ -1204,14 +1214,18 @@
			// 拼接后面内容
			if (smsRequestTemplate.getPersonVOList().size() > 0) {
			for (List<String> list : smsRequestTemplate.getTemplateContent()) {

			String remark = StringUtil.format("渗压水位：{}\n管口高程：{}\n",
			list.get(11), list.get(12)
			);
			// 保存告警记录信息
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
			if (null != alarmRecord) {
			list.add(alarmRecord.getId().toString());
			}
			}
			if (isDay.equals("day")) return map;
			map = smsService.sendSignMsg(smsRequestTemplate);
			// map = smsService.sendSignMsg(smsRequestTemplate);
			// 调用短信服务
			return map;
			}
			@@ -1237,8 +1251,12 @@
			// 拼接后面内容
			if (smsRequestTemplate.getPersonVOList().size() > 0) {
			for (List<String> list : smsRequestTemplate.getTemplateContent()) {

			String remark = StringUtil.format("渗压水位：{}\n管口高程：{}\n",
			list.get(11), list.get(12)
			);
			// 保存告警记录信息
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
			if (null != alarmRecord) {
			list.add(alarmRecord.getId().toString());
			}
			@@ -1304,8 +1322,14 @@
			// 拼接后面内容
			if (smsRequestTemplate.getPersonVOList().size() > 0) {
			for (List<String> list : smsRequestTemplate.getTemplateContent()) {

			String remark = StringUtil.format("渗压水位：{}\n坝顶高程：{}\n",
			list.get(11), list.get(13)
			);
			list.remove(13);

			// 保存告警记录信息
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
			if (null != alarmRecord) {
			list.add(alarmRecord.getId().toString());
			}
			@@ -1372,8 +1396,12 @@
			// 拼接后面内容
			if (smsRequestTemplate.getPersonVOList().size() > 0) {
			for (List<String> list : smsRequestTemplate.getTemplateContent()) {

			String remark = StringUtil.format("渗压水位：{}\n库水位：{}\n",
			list.get(11), list.get(12)
			);
			// 保存告警记录信息
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
			if (null != alarmRecord) {
			list.add(alarmRecord.getId().toString());
			}
			@@ -1800,10 +1828,19 @@
			for (List<String> list : smsRequestTemplate.getTemplateContent()) {
			// 依次添加行巡查责任人,技术责任人信息(姓名)
			noticeHandle.addPatrolTechnologyInfo(list, false);

			// 拼接市县水利部人员姓名及联系方式
			noticeHandle.addCityCountyBusinessPersonInfo(list);

			String remark = StringUtil.format("de_val：{}\ndn_val：{}\ndu_value：{}\n",
			list.get(13), list.get(14), list.get(15)
			);
			list.remove(13);
			list.remove(14);
			list.remove(15);

			// 保存告警记录信息
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
			if (null != alarmRecord) {
			list.add(alarmRecord.getId().toString());
			}
			@@ -1878,8 +1915,16 @@
			noticeHandle.addPatrolTechnologyInfo(list, false);
			// 拼接市县水利部人员姓名及联系方式
			noticeHandle.addCityCountyBusinessPersonInfo(list);

			String remark = StringUtil.format("de_val：{}\ndn_val：{}\ndu_value：{}\n",
			list.get(13), list.get(14), list.get(15)
			);
			list.remove(13);
			list.remove(14);
			list.remove(15);

			// 保存告警记录信息
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
			if (null != alarmRecord) {
			list.add(alarmRecord.getId().toString());
			}
			@@ -2113,8 +2158,14 @@
			noticeHandle.addPatrolTechnologyInfo(list, false);
			// 拼接市县水利部人员姓名及联系方式
			noticeHandle.addCityCountyBusinessPersonInfo(list);

			String remark = StringUtil.format("当前：{}\n一日：{}\n二日：{}\n",
			list.get(11), list.get(12), list.get(13)
			);
			list.remove(12);
			list.remove(13);
			// 保存告警记录信息
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
			AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
			if (null != alarmRecord) {
			list.add(alarmRecord.getId().toString());
			}

	skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java	9 ●●●●● patch \| view \| raw \| blame \| history
	skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java	67 ●●●●● patch \| view \| raw \| blame \| history

			@@ -298,6 +298,7 @@
			add("cd_nm");
			add("max_value");
			add("diff_val");
			add("dam_top_elevation");
			}};

			/**
			@@ -407,6 +408,9 @@
			add("cd_nm");
			add("direction");
			add("val");
			add("de_val");
			add("dn_val");
			add("du_value");
			}};

			/**
			@@ -420,6 +424,9 @@
			add("cd_nm");
			add("direction");
			add("val");
			add("de_val");
			add("dn_val");
			add("du_value");
			}};

			/**
			@@ -458,6 +465,8 @@
			add("res_nm");
			add("cd_nm");
			add("value");
			add("lead_val");
			add("lead2_val");
			}};