Browse Source

故障信息显示

lmstack 3 years ago
parent
commit
57da85681d

+ 2 - 2
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, 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')";
+        String sql = "select t1.sn, t1.time, t2.errName, t2.errLevel, t2.treatment 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,7 @@ 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.setTreatment(p.get("treatment") == null ? null : p.get("treatment").toString());
             alarmMap.setSn(p.get("sn").toString());
             alarmMap.setTime(p.get("time").toString());
             rspAllAlarmInfo.getAlarmList().add(alarmMap);

+ 2 - 2
src/main/java/com/lm/lib/dto/AlarmMapDto.java

@@ -42,9 +42,9 @@ public class AlarmMapDto {
 
     @ApiModelProperty(
             value = "故障信息",
-            name = "trans",
+            name = "treatment",
             dataType = "java.lang.String",
             accessMode = ApiModelProperty.AccessMode.READ_ONLY
     )
-    protected String trans;
+    protected String treatment;
 }