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/service/InterfaceServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
index 081911c..34928bf 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
@@ -1025,6 +1025,15 @@
return list;
}
+ @Override
+ public List<SysUser> getUserListByContainerCodeNew(String containerCode, String startTime, String endTime) throws ApiException{
+ if (containerCode==null||containerCode.isEmpty()) {
+ throw new ApiException(ApiStatus.PARAM_NO_EXIST, ApiStatus.PARAM_NO_EXIST.getRetMsg() + "[containerCode]");
+ }
+
+ return sysUserDao.getUserListByContainerCodeNew(containerCode, startTime, endTime);
+ }
+
@Override
@Transactional(propagation = Propagation.REQUIRED)
@@ -1451,7 +1460,7 @@
logger.info(resData2);
}
}
- sysAlarmPersonDao.insertSysAlarmPerson(sysAlarmPerson);
+
if(enable && "2".equals(warningId) ) {
List<Map> personsInCharge = sysLaboratoryContainer.getContainerPersonInCharge(containerCode);
Map param = new HashMap();
@@ -1481,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();
@@ -1492,6 +1504,7 @@
logger.info(resData);
}
+ sysAlarmPersonDao.insertSysAlarmPerson(sysAlarmPerson);
}
// 将人员扣分更新到人员表
if (warningPoint == null) {
--
Gitblit v1.9.2