From 2b2d6f4148a1abd632cb42742554f613868fb0b2 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 24 十二月 2020 10:49:00 +0800
Subject: [PATCH] 短信发送 Memo
---
src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java | 12 +++++++++++-
src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml | 4 ++--
src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java | 8 ++++++--
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml
index 34b6b9e..711355f 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysAlarmPersonDao.xml
@@ -12,8 +12,8 @@
</resultMap>
<insert id="insertSysAlarmPerson" parameterType="com.nanometer.smartlab.entity.SysAlarmPerson">
- insert into sys_warning(container_code, warning_id, warning_time, warning_level, user_id, warning_point,daping_alarm_id)
- values (#{containerCode}, #{warningId}, #{warningTime}, #{warningLevel}, #{userId}, #{warningPoint},#{refId} )
+ insert into sys_warning(container_code, warning_id, warning_time, warning_level, user_id, warning_point,daping_alarm_id,memo)
+ values (#{containerCode}, #{warningId}, #{warningTime}, #{warningLevel}, #{userId}, #{warningPoint},#{refId},#{memo} )
</insert>
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java b/src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java
index 399d601..a2711a8 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java
@@ -21,6 +21,8 @@
private int warningPoint;
+ private String memo;
+
private String refId;
public String getRefId() {
@@ -89,7 +91,15 @@
this.warningPoint = warningPoint;
}
- @Override
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+ @Override
public String toString() {
return "SysAlarm{" +
"id=" + id +
diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
index f21d74b..34928bf 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
@@ -1460,7 +1460,7 @@
logger.info(resData2);
}
}
- sysAlarmPersonDao.insertSysAlarmPerson(sysAlarmPerson);
+
if(enable && "2".equals(warningId) ) {
List<Map> personsInCharge = sysLaboratoryContainer.getContainerPersonInCharge(containerCode);
Map param = new HashMap();
@@ -1490,7 +1490,10 @@
});
}
if (phones.length() >0){
- phones.deleteCharAt(phones.length() - 1);}
+ phones.deleteCharAt(phones.length() - 1);
+ String memo = String.format("短信已发送[%s]", phones);
+ sysAlarmPerson.setMemo(memo);
+ }
String suffix = String.format("?head=%s&signature=%s&content=%s&telnumber=%s", head, signature, content, phones.toString().replace(" ", ""));
CloseableHttpClient client = HttpClients.createDefault();
@@ -1501,6 +1504,7 @@
logger.info(resData);
}
+ sysAlarmPersonDao.insertSysAlarmPerson(sysAlarmPerson);
}
// 将人员扣分更新到人员表
if (warningPoint == null) {
--
Gitblit v1.9.2