故障信息显示

src/main/java/com/lm/lib/controller/ShowDataController.java

@@ -407,7 +407,7 @@ public Map<String, Object> gpsInfo() throws IOException {
         RspAlarmInfo rspAlarmInfo = new RspAlarmInfo();
 
         if (StringUtils.hasLength(sn)) {
-            String sql = "select t1.sn, t2.errName, t2.errLevel from fault_info t1 left join fid_info t2 on t1.fault_code=t2.errCode where " +
+            String sql = "select t1.sn, t1.time, t2.treatment, t2.errName, t2.errLevel from fault_info t1 left join fid_info t2 on t1.fault_code=t2.errCode where " +
                     "t1.sn='" + sn + "'";
             List<Map<String, Object>> faultData;
             try {
@@ -420,7 +420,9 @@ public Map<String, Object> gpsInfo() throws IOException {
                     AlarmMapDto alarmMap = new AlarmMapDto();
                     alarmMap.setInfo(p.get("errName") == null ? null : p.get("errName").toString());
                     alarmMap.setLevel(p.get("errLevel") == null ? null : p.get("errLevel").toString());
+                    alarmMap.setTreatment(p.get(",") == null ? null : p.get(",").toString());
                     alarmMap.setSn(p.get("sn").toString());
+                    alarmMap.setTime(p.get("time").toString());
                     rspAlarmInfo.getAlarmList().add(alarmMap);
                 });