修改危化品编码

李宇

2020-12-22 0ece929cad95dbe0bb4c8be5e03ddccacec5a935

 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);