Merge remote-tracking branch 'origin/master'

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

@@ -31,6 +31,9 @@ public class DeviceErrorsRecord implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty(value = "商户ID")
+    private Long mercId;
+
     @ApiModelProperty(value = "设备编号")
     private Long deviceId;
 

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

@@ -34,6 +34,9 @@ public class DeviceNetRecord implements Serializable {
     @ApiModelProperty(value = "机器编号")
     private Long deviceId;
 
+    @ApiModelProperty(value = "商户ID")
+    private Long mercId;
+
     @ApiModelProperty(value = "状态")
     private Integer netStatus;
 

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

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 import static com.xy.utils.Beans.copy;
@@ -38,7 +39,7 @@ public class DeviceStatusServiceImpl extends ServiceImpl<DeviceStatusMapper, Dev
         if (deviceStatusInfo == null) {
             return R.ok();
         }
-        DeviceStatus deviceStatus = copy(DeviceStatus.class, up);
+        DeviceStatus deviceStatus = copy(DeviceStatus.class, up).setUpdateTime(LocalDateTime.now());
         updateById(deviceStatus);
         return R.ok();
     }

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

@@ -64,6 +64,9 @@ public class DeviceErrorsRecordDto {
         @ApiModelProperty(value = "设备编号")
         private Long deviceId;
 
+        @ApiModelProperty(value = "商户ID")
+        private Long mercId;
+
         @ApiModelProperty(value = "故障类型")
         private Integer errorType;
 

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

@@ -64,6 +64,9 @@ public class DeviceNetRecordDto {
         @ApiModelProperty(value = "机器编号")
         private Long deviceId;
 
+        @ApiModelProperty(value = "商户ID")
+        private Long mercId;
+
         @ApiModelProperty(value = "状态")
         private Integer netStatus;