diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgFlowDeviceData.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgFlowDeviceData.java index 8a7f79a..0f46d21 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgFlowDeviceData.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgFlowDeviceData.java @@ -43,7 +43,7 @@ private static final long serialVersionUID = 1L; /** 实时时间 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("实时时间") private Date realTime; @@ -54,7 +54,7 @@ private static final long serialVersionUID = 1L; /** 保存时间 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("保存时间") private Date saveTime; diff --git a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml index 6b1ff76..31fe8d0 100644 --- a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml +++ b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml @@ -112,6 +112,9 @@ type, longitude, latitude, + on_line, + area_code, + dept_id, #{imei}, @@ -140,6 +143,9 @@ #{type}, #{longitude}, #{latitude}, + #{onLine}, + #{areaCode}, + #{deptId}, @@ -172,6 +178,9 @@ type = #{type}, longitude = #{longitude}, latitude = #{latitude}, + on_line = #{onLine}, + area_code = #{areaCode}, + dept_id = #{deptId}, where id = #{id}