Merge branch 'master' of http://121.42.53.174:3000/jiapeng/bridge

src/main/java/com/ekexiu/project/bridge/servlet/AlarmDataServlet.java

@@ -139,7 +139,7 @@ public class AlarmDataServlet extends HttpServlet {
									}
									tmpObj = map.get("alarm_time");
									if (tmpObj != null && tmpObj instanceof String) {
										item.setStime((String) tmpObj);
										item.setAtime((String) tmpObj);
										if (msg.getAlarmTime() == null) {
											String at = (String) tmpObj;
											at = at.substring(0, 14);
@@ -186,9 +186,9 @@ public class AlarmDataServlet extends HttpServlet {
						CollectDevice device = this.collectDeviceDao.query(con, server.getId(), msg.getDevice());
						if (device != null) {
							String atime = items.get(0).getAtime();
							String cnt = "您负责管理维护的桥梁：【" + bridge.getShortName() + "】，于【" + atime.substring(0, 4) + "-" + atime.substring(4, 6) + "-"
							String cnt = "您负责管理维护的桥梁：" + bridge.getShortName() + "，于" + atime.substring(0, 4) + "-" + atime.substring(4, 6) + "-"
									+ atime.substring(6, 8) + " " + atime.substring(8, 10) + ":" + atime.substring(10, 12) + ":" + atime.substring(12, 14)
									+ "】，编号为【" + device.getCode() + "】的采集盒发生一起报警事件，请尽快登录平台查看详细的报警信息。";
									+ "，编号为" + device.getCode() + "的采集盒发生一起报警事件，请尽快登录平台查看详细的报警信息。";
							List<User> users = this.userDao.queryByBridgeId(con, bridge.getId(), true);
							if (users != null && users.size() > 0) {
								for (User u : users) {
@@ -224,14 +224,14 @@ public class AlarmDataServlet extends HttpServlet {
								String to = u.getEmail();
								try {
									if (to != null && to.length() > 0) {
										mailService.sendSimpleMail(to, "【" + u.getName() + "】您好：<br>" + entry.getValue(), null, "桥梁临控报警");
										mailService.sendSimpleMail(to,  u.getName() + "您好：" + entry.getValue(), null, "桥梁临控报警");
									}
								} catch (Throwable thr) {
								}
								to = u.getPhone();
								try {
									if (to != null && to.length() > 0) {
										phoneService.sendMessage(to, "【__USERNAME__】您好：" + entry.getValue(), "__USERNAME__", u.getName());
										phoneService.sendMessage(to, "【声脉】__USERNAME__您好：" + entry.getValue(), "__USERNAME__", u.getName());
									}
								} catch (Throwable thr) {
								}

src/main/java/com/ekexiu/project/bridge/system/dao/UserDao.java

@@ -90,6 +90,6 @@ public interface UserDao {
	@SelectList
	@From(User.class)
	List<User> queryByBridgeId(Connection con,
			@SqlColumn(value = "ID IN (SELECT UID FROM USER_BRIDGE WHERE BRIDGE=?", handlerClass = StringHandler.class) String bridge, @Nullable Boolean active)
			@SqlColumn(value = "ID IN (SELECT UID FROM USER_BRIDGE WHERE BRIDGE=?)", handlerClass = StringHandler.class) String bridge, @Nullable Boolean active)
			throws SQLException;
}