故障信息显示

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

@@ -379,7 +379,7 @@ public Map<String, Object> gpsInfo() throws IOException {
     public RspAllAlarmInfo allAlarmInfo() {
         RspAllAlarmInfo rspAllAlarmInfo = new RspAllAlarmInfo();
 
-        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 t1.time > date_format(now(), '%Y-%m-%d')";
+        String sql = "t1.sn, t1.time, t2.errName, t2.errLevel, t2.errTrans from fault_info t1 left join fid_info t2 on t1.fault_code=t2.errCode where t1.time > date_format(now(), '%Y-%m-%d')";
         List<Map<String, Object>> faultData;
         try {
             faultData = qxcasJdbcTemplate.queryForList(sql);
@@ -390,7 +390,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.setTrans(p.get("errTrans") == null ? null : p.get("errTrans").toString());
             alarmMap.setSn(p.get("sn").toString());
+            alarmMap.setTime(p.get("time").toString());
             rspAllAlarmInfo.getAlarmList().add(alarmMap);
         });
         rspAllAlarmInfo.setCode(200);

src/main/java/com/lm/lib/dto/AlarmMapDto.java

@@ -30,4 +30,21 @@ public class AlarmMapDto {
             accessMode = ApiModelProperty.AccessMode.READ_ONLY
     )
     protected String info;
+
+    @ApiModelProperty(
+            value = "故障信息",
+            name = "time",
+            dataType = "java.lang.String",
+            accessMode = ApiModelProperty.AccessMode.READ_ONLY
+    )
+    protected String time;
+
+
+    @ApiModelProperty(
+            value = "故障信息",
+            name = "trans",
+            dataType = "java.lang.String",
+            accessMode = ApiModelProperty.AccessMode.READ_ONLY
+    )
+    protected String trans;
 }