From 21db6e4c4c11099eb053c837a0a207a537bb6453 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期一, 18 一月 2021 16:31:12 +0800
Subject: [PATCH] 添加危废全年统计接口
---
src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
index 34928bf..ddf7301 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
@@ -1030,8 +1030,16 @@
if (containerCode==null||containerCode.isEmpty()) {
throw new ApiException(ApiStatus.PARAM_NO_EXIST, ApiStatus.PARAM_NO_EXIST.getRetMsg() + "[containerCode]");
}
-
- return sysUserDao.getUserListByContainerCodeNew(containerCode, startTime, endTime);
+ List<String> projects = sysLaboratoryContainer.selectProjectsByContainerCode(containerCode);
+ List<SysUser> userList = null;
+ if (projects != null) {
+ userList = new ArrayList<>();
+ for (String project : projects) {
+ List<SysUser> dataList = sysUserDao.getUserListByProject(project, startTime, endTime);
+ userList.addAll(dataList);
+ }
+ }
+ return userList;
}
@@ -1261,6 +1269,10 @@
logger.error("The containerCode has not been exists!");
}
}
+ //-1 状态
+ if (status.equals(-1)){
+ continue;
+ }
opeReagentStatusDao.syncOpeReagentStatus(params);
}
@@ -1347,7 +1359,7 @@
// 人员违规预警接口
@Override
- public void alarmperson(JSONObject jsonObject) throws ApiException, IOException {
+ public void alarmperson(JSONObject jsonObject) throws Exception {
JSONArray dataArr = jsonObject.getJSONArray("data");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1406,12 +1418,19 @@
Timestamp warnTime;
try {
Date warningTime = sdf.parse(warningTimeStr);
+ //不接收时间超过现在的数据
+ if (warningTime.after(new Date())) {
+ throw new Exception("柜子时间发生错误");
+ }
warnTime = new Timestamp(warningTime.getTime());
sysAlarmPerson.setWarningTime(warnTime);
} catch (ParseException e) {
throw new ApiException(ApiStatus.PARAM_ERR);
- }
- // 将人员违规预警记录保存到数据库表
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new Exception(e.getMessage());
+ }
+ // 将人员违规预警记录保存到数据库表
int count = sysAlarmPersonDao.repeatedJudgment(containerCode, warningLevelInt, warnTime);
if (count<1){
//获取实验室条码和具体地点
@@ -1490,9 +1509,8 @@
});
}
if (phones.length() >0){
- phones.deleteCharAt(phones.length() - 1);
- String memo = String.format("短信已发送[%s]", phones);
- sysAlarmPerson.setMemo(memo);
+ phones.deleteCharAt(phones.length() - 1);
+
}
String suffix = String.format("?head=%s&signature=%s&content=%s&telnumber=%s", head, signature, content, phones.toString().replace(" ", ""));
@@ -1501,6 +1519,12 @@
post.setHeader("Content-Type", "application/json;charset=UTF-8");
CloseableHttpResponse response = client.execute(post);
String resData = EntityUtils.toString(response.getEntity(),"UTF-8");
+ client.close();
+ JSONObject res = JSONObject.parseObject(resData);
+ if ("200".equals(res.getString("code")) && phones.length() >0){
+ String memo = String.format("短信已发送[%s]", phones);
+ sysAlarmPerson.setMemo(memo);
+ }
logger.info(resData);
}
--
Gitblit v1.9.2