From 6207311d7df3d47d27fdd78de33f49875550f52f Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 23 十二月 2020 09:51:22 +0800
Subject: [PATCH] 编码替换字典页面
---
src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
index 0ea9cfe..f21d74b 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)
@@ -1419,7 +1428,8 @@
content += "柜门未关";
}
//给daping系统发送信息
- if("1".equals(warningId) || "2".equals(warningId)|| "6".equals(warningId)) {
+
+ if(!"".equals(alarmUrl) && ("1".equals(warningId) || "2".equals(warningId)|| "6".equals(warningId)) ) {
JSONObject json = new JSONObject();
json.put("barCode", location.get("barCode"));
json.put("type", alarmType);
--
Gitblit v1.9.2