q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
Jerry Yan 2024-12-16 15:12:24 +08:00
parent dc874b7988
commit 3c99ff16c6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ycwl/basic/model/pc/device/resp/DeviceRespVO.java
View File

@ -37,4 +37,6 @@ public class DeviceRespVO {
private Date updateAt; private Date updateAt;
@ApiModelProperty("景区名称") @ApiModelProperty("景区名称")
private String scenicName; private String scenicName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date keepaliveAt;
} }

2
src/main/resources/mapper/DeviceMapper.xml
View File

@ -52,7 +52,7 @@
delete from device where id = #{id} delete from device where id = #{id}
</delete> </delete>
<select id="list" resultType="com.ycwl.basic.model.pc.device.resp.DeviceRespVO"> <select id="list" resultType="com.ycwl.basic.model.pc.device.resp.DeviceRespVO">
select d.id, scenic_id, d.name, no, d.longitude, d.latitude, d.status, create_at, d.update_at, s.name scenic_name select d.id, scenic_id, d.name, no, d.longitude, d.latitude, d.status, create_at, d.update_at, s.name scenic_name, d.keepalive_at
from device d from device d
left join scenic s on d.scenic_id = s.id left join scenic s on d.scenic_id = s.id
<where> <where>