From 0ece929cad95dbe0bb4c8be5e03ddccacec5a935 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Tue, 22 Dec 2020 12:17:25 +0800
Subject: [PATCH] 修改危化品编码
---
src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java | 11 ++++++++++-
1 files changed, 10 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 73db711..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)
@@ -1420,7 +1429,7 @@
}
//给daping系统发送信息
- if("".equals(alarmUrl) && ("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