|
@@ -425,18 +425,17 @@ public Map<String, Object> gpsInfo() throws IOException {
|
|
|
alarmMap.setTime(p.get("time").toString());
|
|
|
rspAlarmInfo.getAlarmList().add(alarmMap);
|
|
|
});
|
|
|
-
|
|
|
- sql = "select t1.u_id, t1.u_status, t2.username, t2.mobile from py_battery t1 left join py_users t2 on t1.u_id=t2.user_id where qrcode = '" + sn + "'";
|
|
|
- Map<String, Object> userInfo;
|
|
|
- try {
|
|
|
- userInfo = moyuJdbcTemplate.queryForMap(sql);
|
|
|
- } catch (EmptyResultDataAccessException e) {
|
|
|
- userInfo = null;
|
|
|
- }
|
|
|
- if (userInfo != null && !userInfo.get("u_status").toString().equals("0")) {
|
|
|
- rspAlarmInfo.setUserName(userInfo.get("username").toString());
|
|
|
- rspAlarmInfo.setUserPhone(userInfo.get("mobile").toString());
|
|
|
- }
|
|
|
+ }
|
|
|
+ sql = "select t1.u_id, t1.u_status, t2.username, t2.mobile from py_battery t1 left join py_users t2 on t1.u_id=t2.user_id where qrcode = '" + sn + "'";
|
|
|
+ Map<String, Object> userInfo;
|
|
|
+ try {
|
|
|
+ userInfo = moyuJdbcTemplate.queryForMap(sql);
|
|
|
+ } catch (EmptyResultDataAccessException e) {
|
|
|
+ userInfo = null;
|
|
|
+ }
|
|
|
+ if (userInfo != null && !userInfo.get("u_status").toString().equals("0")) {
|
|
|
+ rspAlarmInfo.setUserName(userInfo.get("username").toString());
|
|
|
+ rspAlarmInfo.setUserPhone(userInfo.get("mobile").toString());
|
|
|
}
|
|
|
rspAlarmInfo.setCode(200);
|
|
|
rspAlarmInfo.setMessage("获取成功");
|