故障监控

device-api-service/src/main/java/com/xy/entity/DeviceFaultInfo.java

@@ -40,7 +40,7 @@ public class DeviceFaultInfo implements Serializable {
     private Long deviceId;
 
     @ApiModelProperty(value = "故障描述")
-    private String describe;
+    private String describes;
 
     @ApiModelProperty(value = "事件编码")
     private String eventCode;

device-api-service/src/main/java/com/xy/entity/DeviceFaultLog.java

@@ -37,7 +37,7 @@ public class DeviceFaultLog implements Serializable {
     private Long deviceId;
 
     @ApiModelProperty(value = "故障描述")
-    private String describe;
+    private String describes;
 
     @ApiModelProperty(value = "事件编码")
     private String eventCode;

device-api-service/src/main/java/com/xy/mapper/mapper/DeviceFaultInfoMapper.xml

@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xy.mapper.DeviceFaultInfoMapper">
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.xy.entity.DeviceFaultInfo">
-        <id column="fault_id" property="faultId" />
-        <result column="merc_id" property="mercId" />
-        <result column="device_id" property="deviceId" />
-        <result column="describe" property="describe" />
-        <result column="event_code" property="eventCode" />
-        <result column="state" property="state" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="resolve_time" property="resolveTime" />
-        <result column="event_num" property="eventNum" />
-        <result column="fault_level" property="faultLevel" />
+        <id column="fault_id" property="faultId"/>
+        <result column="merc_id" property="mercId"/>
+        <result column="device_id" property="deviceId"/>
+        <result column="describes" property="describes"/>
+        <result column="event_code" property="eventCode"/>
+        <result column="state" property="state"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="resolve_time" property="resolveTime"/>
+        <result column="event_num" property="eventNum"/>
+        <result column="fault_level" property="faultLevel"/>
     </resultMap>
-
 </mapper>

device-api-service/src/main/java/com/xy/mapper/mapper/DeviceFaultLogMapper.xml

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xy.mapper.DeviceFaultLogMapper">
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.xy.entity.DeviceFaultLog">
-        <id column="log_id" property="logId" />
-        <result column="merc_id" property="mercId" />
-        <result column="device_id" property="deviceId" />
-        <result column="describe" property="describe" />
-        <result column="event_code" property="eventCode" />
-        <result column="event_time" property="eventTime" />
-        <result column="create_time" property="createTime" />
+        <id column="log_id" property="logId"/>
+        <result column="merc_id" property="mercId"/>
+        <result column="device_id" property="deviceId"/>
+        <result column="describes" property="describes"/>
+        <result column="event_code" property="eventCode"/>
+        <result column="event_time" property="eventTime"/>
+        <result column="create_time" property="createTime"/>
     </resultMap>
-
 </mapper>

device-api-service/src/main/java/com/xy/service/DeviceMqttConsumerImpl.java

@@ -216,7 +216,7 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
             //加入故障日志
             DeviceFaultLog log = new DeviceFaultLog()
                     .setMercId(mercId)
-                    .setDescribe(msg)
+                    .setDescribes(msg)
                     .setEventCode(code)
                     .setEventTime(deviceEventMsg.getCreateTime())
                     .setDeviceId(deviceId);
@@ -271,7 +271,7 @@ public class DeviceMqttConsumerImpl implements DeviceMqttConsumer {
                         deviceFaultInfoService.save(new DeviceFaultInfo()
                                 .setMercId(mercId)
                                 .setDeviceId(deviceId)
-                                .setDescribe(msg)
+                                .setDescribes(msg)
                                 .setFaultLevel(faultLevel)
                                 .setEventCode(code)
                                 .setEventNum(count.intValue())

device-api/src/main/java/com/xy/dto/DeviceFaultInfoDto.java

@@ -70,7 +70,7 @@ public class DeviceFaultInfoDto {
         private Long deviceId;
 
         @ApiModelProperty(value = "故障描述")
-        private String describe;
+        private String describes;
 
         @ApiModelProperty(value = "事件编码")
         private String eventCode;

device-api/src/main/java/com/xy/dto/DeviceFaultLogDto.java

@@ -60,7 +60,7 @@ public class DeviceFaultLogDto {
         private Long deviceId;
 
         @ApiModelProperty(value = "故障描述")
-        private String describe;
+        private String describes;
 
         @ApiModelProperty(value = "事件编码")
         private String eventCode;