jiapeng 6 ans auparavant
Parent
commit
f51ac67360

+ 4 - 4
src/main/java/com/ekexiu/project/bridge/servlet/AlarmDataServlet.java

@ -186,9 +186,9 @@ public class AlarmDataServlet extends HttpServlet {
186 186
						CollectDevice device = this.collectDeviceDao.query(con, server.getId(), msg.getDevice());
187 187
						if (device != null) {
188 188
							String atime = items.get(0).getAtime();
189
							String cnt = "您负责管理维护的桥梁:" + bridge.getShortName() + ",于" + atime.substring(0, 4) + "-" + atime.substring(4, 6) + "-"
189
							String cnt = "您负责管理维护的桥梁:" + bridge.getShortName() + ",于" + atime.substring(0, 4) + "-" + atime.substring(4, 6) + "-"
190 190
									+ atime.substring(6, 8) + " " + atime.substring(8, 10) + ":" + atime.substring(10, 12) + ":" + atime.substring(12, 14)
191
									+ ",编号为" + device.getCode() + "的采集盒发生一起报警事件,请尽快登录平台查看详细的报警信息。";
191
									+ ",编号为" + device.getCode() + "的采集盒发生一起报警事件,请尽快登录平台查看详细的报警信息。";
192 192
							List<User> users = this.userDao.queryByBridgeId(con, bridge.getId(), true);
193 193
							if (users != null && users.size() > 0) {
194 194
								for (User u : users) {
@ -224,14 +224,14 @@ public class AlarmDataServlet extends HttpServlet {
224 224
								String to = u.getEmail();
225 225
								try {
226 226
									if (to != null && to.length() > 0) {
227
										mailService.sendSimpleMail(to, "【" + u.getName() + "您好:<br>" + entry.getValue(), null, "桥梁临控报警");
227
										mailService.sendSimpleMail(to,  u.getName() + "您好:" + entry.getValue(), null, "桥梁临控报警");
228 228
									}
229 229
								} catch (Throwable thr) {
230 230
								}
231 231
								to = u.getPhone();
232 232
								try {
233 233
									if (to != null && to.length() > 0) {
234
										phoneService.sendMessage(to, "【__USERNAME__您好:" + entry.getValue(), "__USERNAME__", u.getName());
234
										phoneService.sendMessage(to, "【声脉】__USERNAME__您好:" + entry.getValue(), "__USERNAME__", u.getName());
235 235
									}
236 236
								} catch (Throwable thr) {
237 237
								}