diff --git a/src/main/java/com/hisense/monitormanage/controller/Controller.java b/src/main/java/com/hisense/monitormanage/controller/Controller.java index 30622c2..7ceef83 100644 --- a/src/main/java/com/hisense/monitormanage/controller/Controller.java +++ b/src/main/java/com/hisense/monitormanage/controller/Controller.java @@ -67,6 +67,17 @@ public class Controller { return success; } + /** + * + * @return + */ + @GetMapping("camera") + public Result camera(){ + List pictureDtos = channelPictureMapper.selectByPicture(); + Result success = Result.success(pictureDtos); + return success; + } + /** * 景区人流识别 * @return diff --git a/src/main/java/com/hisense/monitormanage/dto/PictureDto.java b/src/main/java/com/hisense/monitormanage/dto/PictureDto.java new file mode 100644 index 0000000..aa289fe --- /dev/null +++ b/src/main/java/com/hisense/monitormanage/dto/PictureDto.java @@ -0,0 +1,26 @@ +package com.hisense.monitormanage.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class PictureDto { + + private String ssqh; + private String xmmc; + private String xmdz; + private String channelCode; + private String name; + private String longitude; + private String latitude; + private String pic; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date captureTime; + + + + +} diff --git a/src/main/java/com/hisense/monitormanage/mapper/ChannelPictureMapper.java b/src/main/java/com/hisense/monitormanage/mapper/ChannelPictureMapper.java index cba266a..84c26e8 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/ChannelPictureMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/ChannelPictureMapper.java @@ -2,6 +2,7 @@ package com.hisense.monitormanage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hisense.monitormanage.dto.ChannelPictureDto; +import com.hisense.monitormanage.dto.PictureDto; import com.hisense.monitormanage.entity.ChannelPicture; import org.apache.ibatis.annotations.Select; @@ -12,4 +13,7 @@ public interface ChannelPictureMapper extends BaseMapper { @Select("select * from t_project p JOIN t_channel_picture cp JOIN t_project_mtm_camera pmc on p.id = pmc.project_id AND cp.channel_code = pmc.channel_code") List selectByProject(); + @Select("select * from t_project p JOIN t_camera cp JOIN t_project_mtm_camera pmc on p.id = pmc.project_id AND cp.code = pmc.channel_code") + List selectByPicture(); + }